Permalink
Browse files

Make the build runnable and testable on JDK7/JDK9

Signed-off-by:Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information...
lukasj committed Jan 7, 2017
1 parent b820664 commit 0e09f0ac21c0ae5d4c35996abeb847204535d2ac
View
@@ -52,3 +52,5 @@
/jaxb-ri/external/target/
/jaxb-ri/tools/osgi_tests/target/
/jaxb-ri/xsom/target/
/jaxb-ri/jaxb-xjc-jdk9/target/
/jaxb-ri/jaxb-jxc-jdk9/target/
View
@@ -3,7 +3,7 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013-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
@@ -48,8 +48,7 @@
<parent>
<groupId>net.java</groupId>
<artifactId>jvnet-parent</artifactId>
<version>4</version>
<relativePath/>
<version>5</version>
</parent>
<groupId>org.glassfish.jaxb</groupId>
@@ -62,7 +61,7 @@
<properties>
<jaxb-api.version>2.3.0-SNAPSHOT</jaxb-api.version>
<istack.version>3.0.2-SNAPSHOT</istack.version>
<istack.version>3.0.4</istack.version>
<fastinfoset.version>1.2.13</fastinfoset.version>
<stax-ex.version>1.7.8</stax-ex.version>
</properties>
@@ -3,7 +3,7 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013-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
@@ -48,6 +48,7 @@ holder.
<groupId>com.sun.xml.bind.mvn</groupId>
<artifactId>jaxb-bundles</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>com.sun.xml.bind</groupId>
@@ -114,7 +115,7 @@ holder.
<build>
<plugins>
<plugin>
<!-- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-junit4osgi-plugin</artifactId>
<version>${felix.junit4osgi}</version>
@@ -150,7 +151,7 @@ holder.
</configuration>
</execution>
</executions>
</plugin>
</plugin>-->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -315,7 +316,6 @@ holder.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.plugin}</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -3,7 +3,7 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013-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
@@ -48,6 +48,7 @@ holder.
<groupId>com.sun.xml.bind.mvn</groupId>
<artifactId>jaxb-bundles</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>com.sun.xml.bind</groupId>
@@ -59,10 +60,6 @@ holder.
Old JAXB schema generator.The *tool* to generate XML schema based on java classes.
</description>
<modules>
<module>../../jaxb-jxc-jdk9</module>
</modules>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -83,6 +80,20 @@ holder.
</properties>
<profiles>
<profile>
<id>jdk9-setup</id>
<activation>
<jdk>9</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc-jdk9</artifactId>
<optional>true</optional>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>default-profile</id>
<activation>
@@ -115,7 +126,7 @@ holder.
<build>
<plugins>
<plugin>
<!-- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-junit4osgi-plugin</artifactId>
<version>${felix.junit4osgi}</version>
@@ -147,7 +158,7 @@ holder.
</configuration>
</execution>
</executions>
</plugin>
</plugin>-->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -351,7 +362,6 @@ holder.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.plugin}</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -3,7 +3,7 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2016-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
@@ -41,9 +41,9 @@
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>jar-with-jdk9-sources</id>
@@ -55,35 +55,24 @@
<dependencySets>
<dependencySet>
<outputDirectory>.</outputDirectory>
<includes>
<include>org.glassfish.jaxb:jaxb-jxc</include>
<include>org.glassfish.jaxb:codemodel</include>
<include>org.glassfish.jaxb:xsom</include>
<include>com.sun.istack:istack-commons-tools</include>
<include>com.sun.xml.dtd-parser:dtd-parser</include>
<include>com.sun.xml.bind.external:rngom</include>
<include>relaxngDatatype:relaxngDatatype</include>
</includes>
<unpack>true</unpack>
</dependencySet>
</dependencySets>
<moduleSets>
<moduleSet>
<dependencySet>
<outputDirectory>META-INF/versions/9</outputDirectory>
<includes>
<include>org.glassfish.jaxb:jaxb-jxc-jdk9</include>
</includes>
<binaries>
<unpack>true</unpack>
<includeDependencies>false</includeDependencies>
<outputDirectory>META-INF/versions/9</outputDirectory>
<unpackOptions>
<excludes>
<exclude>META-INF/**</exclude>
</excludes>
</unpackOptions>
</binaries>
</moduleSet>
</moduleSets>
<unpack>true</unpack>
<unpackOptions>
<excludes>
<exclude>META-INF/**</exclude>
</excludes>
</unpackOptions>
</dependencySet>
</dependencySets>
</assembly>
@@ -3,7 +3,7 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013-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
@@ -48,6 +48,7 @@ holder.
<groupId>com.sun.xml.bind.mvn</groupId>
<artifactId>jaxb-bundles</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>com.sun.xml.bind</groupId>
@@ -113,7 +114,7 @@ holder.
<build>
<plugins>
<plugin>
<!-- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-junit4osgi-plugin</artifactId>
<version>${felix.junit4osgi}</version>
@@ -151,7 +152,7 @@ holder.
</configuration>
</execution>
</executions>
</plugin>
</plugin>-->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -296,7 +297,6 @@ holder.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.plugin}</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -3,7 +3,7 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013-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
@@ -48,6 +48,7 @@ holder.
<groupId>com.sun.xml.bind.mvn</groupId>
<artifactId>jaxb-bundles</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>com.sun.xml.bind</groupId>
@@ -61,10 +62,6 @@ holder.
<!--todo: finish me-->
</description>
<modules>
<module>../../jaxb-xjc-jdk9</module>
</modules>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -97,6 +94,20 @@ holder.
</properties>
<profiles>
<profile>
<id>jdk9-setup</id>
<activation>
<jdk>9</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc-jdk9</artifactId>
<optional>true</optional>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>default-profile</id>
<activation>
@@ -142,7 +153,7 @@ holder.
</execution>
</executions>
</plugin>
<plugin>
<!-- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-junit4osgi-plugin</artifactId>
<version>${felix.junit4osgi}</version>
@@ -191,7 +202,7 @@ holder.
</configuration>
</execution>
</executions>
</plugin>
</plugin>-->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -484,7 +495,6 @@ holder.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.plugin}</version>
<configuration>
<skip>true</skip>
</configuration>
Oops, something went wrong.

0 comments on commit 0e09f0a

Please sign in to comment.