This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge pull request #1158 from javaee/jaxb-modularization-2

Progress on JAXB RI modularization.
  • Loading branch information...
bravehorsie committed Dec 7, 2017
2 parents 1110744 + 10697ac commit e74717f0f8d79c0c27650c99596f36423d8faa21
@@ -63,7 +63,7 @@
</description>
<properties>
<dtd-parser.version>1.2</dtd-parser.version>
<dtd-parser.version>1.3-SNAPSHOT</dtd-parser.version>
<ant.version>1.9.7</ant.version>
<msv.version>2013.6.1</msv.version>
<!-- don't forget to check if isorelax.version is valid -> used in osgi -->
View
@@ -62,9 +62,9 @@
<properties>
<jaxb-api.version>2.3.1-b171012.0343</jaxb-api.version>
<jaxb-api-osgi.version>2.3</jaxb-api-osgi.version>
<istack.version>3.0.5</istack.version>
<fastinfoset.version>1.2.13</fastinfoset.version>
<stax-ex.version>1.7.8</stax-ex.version>
<istack.version>3.0.6-SNAPSHOT</istack.version>
<fastinfoset.version>1.2.14-SNAPSHOT</fastinfoset.version>
<stax-ex.version>1.7.9-SNAPSHOT</stax-ex.version>
</properties>
<dependencyManagement>
View
@@ -65,20 +65,72 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>codemodel</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>xsom</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.xml.bind.external</groupId>
<artifactId>rngom</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-tools</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.xml.dtd-parser</groupId>
<artifactId>dtd-parser</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>relaxngDatatype</groupId>
<artifactId>relaxngDatatype</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-release-documentation</artifactId>
@@ -97,11 +97,20 @@
<fileMode>0644</fileMode>
<includes>
<include>javax.xml.bind:jaxb-api</include>
<include>com.sun.xml.bind:jaxb-core</include>
<include>com.sun.xml.bind:jaxb-xjc</include>
<include>com.sun.xml.bind:jaxb-impl</include>
<include>com.sun.xml.bind:jaxb-jxc</include>
<include>org.glassfish.jaxb:jaxb-xjc</include>
<include>org.glassfish.jaxb:jaxb-runtime</include>
<include>org.glassfish.jaxb:jaxb-jxc</include>
<include>com.sun.xml.bind:jaxb-mod</include>
<include>org.glassfish.jaxb:codemodel</include>
<include>org.glassfish.jaxb:xsom</include>
<include>com.sun.xml.bind.external:rngom</include>
<include>com.sun.istack:istack-commons-runtime</include>
<include>com.sun.istack:istack-commons-tools</include>
<include>com.sun.xml.dtd-parser:dtd-parser</include>
<include>relaxngDatatype:relaxngDatatype</include>
<include>org.jvnet.staxex:stax-ex</include>
<include>com.sun.xml.fastinfoset:FastInfoset</include>
<include>org.glassfish.jaxb:txw2</include>
</includes>
</dependencySet>
<dependencySet>
@@ -70,4 +70,51 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>jdk9-setup</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<jdkToolchain>
<version>9</version>
</jdkToolchain>
<source>9</source>
<target>9</target>
<includes>
<include>module-info.java</include>
</includes>
</configuration>
</execution>
<execution>
<id>base-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>1.7</source>
<target>1.7</target>
<jdkToolchain>
<version>1.7</version>
</jdkToolchain>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
@@ -0,0 +1,52 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
* and Distribution License("CDDL") (collectively, the "License"). You
* may not use this file except in compliance with the License. You can
* obtain a copy of the License at
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
* or LICENSE.txt. See the License for the specific
* language governing permissions and limitations under the License.
*
* When distributing the software, include this License Header Notice in each
* file and include the License file at LICENSE.txt.
*
* GPL Classpath Exception:
* Oracle designates this particular file as subject to the "Classpath"
* exception as provided by Oracle in the GPL Version 2 section of the License
* file that accompanied this code.
*
* Modifications:
* If applicable, add the following below the License Header, with the fields
* enclosed by brackets [] replaced by your own identifying information:
* "Portions Copyright [year] [name of copyright owner]"
*
* Contributor(s):
* If you wish your version of this file to be governed by only the CDDL or
* only the GPL Version 2, indicate your decision by adding "[Contributor]
* elects to include this software in this distribution under the [CDDL or GPL
* Version 2] license." If you don't indicate a single choice of license, a
* recipient has the option to distribute your version of this file under
* either the CDDL, the GPL Version 2 or to extend the choice of license to
* its licensees as provided above. However, if you add GPL Version 2 code
* and therefore, elected the GPL Version 2 license, then the option applies
* only if the new code is made subject to such option by the copyright
* holder.
*/
/**
* JAXB Library for code generation.
*
* @since 9
*/
module com.sun.codemodel {
exports com.sun.codemodel;
exports com.sun.codemodel.util;
exports com.sun.codemodel.writer;
exports com.sun.codemodel.fmt;
}
@@ -99,5 +99,56 @@
</dependency>
</dependencies>
<profiles>
<profile>
<id>jdk9-setup</id>
<activation>
<jdk>9</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<jdkToolchain>
<version>9</version>
</jdkToolchain>
<source>9</source>
<target>9</target>
<includes>
<include>module-info.java</include>
</includes>
<compilerArgs>
<arg>--add-reads</arg>
<arg>com.sun.tools.rngom=relaxngDatatype</arg>
</compilerArgs>
</configuration>
</execution>
<execution>
<id>base-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>1.7</source>
<target>1.7</target>
<jdkToolchain>
<version>1.7</version>
</jdkToolchain>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
@@ -0,0 +1,58 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
* and Distribution License("CDDL") (collectively, the "License"). You
* may not use this file except in compliance with the License. You can
* obtain a copy of the License at
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
* or LICENSE.txt. See the License for the specific
* language governing permissions and limitations under the License.
*
* When distributing the software, include this License Header Notice in each
* file and include the License file at LICENSE.txt.
*
* GPL Classpath Exception:
* Oracle designates this particular file as subject to the "Classpath"
* exception as provided by Oracle in the GPL Version 2 section of the License
* file that accompanied this code.
*
* Modifications:
* If applicable, add the following below the License Header, with the fields
* enclosed by brackets [] replaced by your own identifying information:
* "Portions Copyright [year] [name of copyright owner]"
*
* Contributor(s):
* If you wish your version of this file to be governed by only the CDDL or
* only the GPL Version 2, indicate your decision by adding "[Contributor]
* elects to include this software in this distribution under the [CDDL or GPL
* Version 2] license." If you don't indicate a single choice of license, a
* recipient has the option to distribute your version of this file under
* either the CDDL, the GPL Version 2 or to extend the choice of license to
* its licensees as provided above. However, if you add GPL Version 2 code
* and therefore, elected the GPL Version 2 license, then the option applies
* only if the new code is made subject to such option by the copyright
* holder.
*/
/**
* RNGOM is a RelaxNG Object model library (XSOM for RelaxNG).
*/
module com.sun.tools.rngom {
requires java.xml;
requires java.logging;
exports org.kohsuke.rngom.parse;
exports org.kohsuke.rngom.parse.compact;
exports org.kohsuke.rngom.parse.xml;
exports org.kohsuke.rngom.digested;
exports org.kohsuke.rngom.nc;
exports org.kohsuke.rngom.xml.sax;
exports org.kohsuke.rngom.xml.util;
exports org.kohsuke.rngom.ast.builder;
exports org.kohsuke.rngom.ast.util;
}
View
@@ -221,13 +221,30 @@
<execution>
<id>default-compile</id>
<configuration>
<compilerArgs>
<arg>--add-modules</arg>
<arg>java.xml.bind</arg>
<arg>--upgrade-module-path</arg>
<arg>${endorsed.dir}</arg>
</compilerArgs>
<verbose>true</verbose>
<jdkToolchain>
<version>9</version>
</jdkToolchain>
<source>9</source>
<target>9</target>
<includes>
<include>module-info.java</include>
</includes>
</configuration>
</execution>
<execution>
<id>base-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>1.7</source>
<target>1.7</target>
<jdkToolchain>
<version>1.7</version>
</jdkToolchain>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
@@ -239,8 +256,6 @@
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<argLine>
--add-reads java.base=java.desktop
--add-modules java.xml.bind
--upgrade-module-path ${endorsed.dir}
-Djdk.attach.allowAttachSelf
</argLine>
Oops, something went wrong.

0 comments on commit e74717f

Please sign in to comment.