Fixing Ant and Maven/maven-jaxb2-plugin samples for #91.

highsource · highsource · commit 1bf4019ab8c6 · 2018-06-03T23:24:58.000+02:00
diff --git a/ant/pom.xml b/ant/pom.xml
@@ -16,6 +16,11 @@
 			<artifactId>jaxb-xjc</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>javax.activation</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.ant</groupId>
 			<artifactId>ant</artifactId>
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -12,6 +12,11 @@
 		<version>0.11.2-SNAPSHOT</version>
 	</parent>
 	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jaxb2-basics-plugins</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>jaxb2-basics-sample-po</artifactId>
@@ -54,11 +59,6 @@
 			<classifier>ant-src</classifier>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>jaxb2-basics-plugins</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>jaxb2-basics-sample-jaxws</artifactId>
diff --git a/full-build-9.bat b/full-build-9.bat
@@ -1,5 +1,5 @@
 setlocal
 echo Setting JAVA_HOME to %JAVA9_HOME%.
 set JAVA_HOME=%JAVA9_HOME%
-call mvn clean install -Pall -DperformRelease
+call mvn clean install --fail-at-end -Pall -DperformRelease 
 endlocal
diff --git a/samples/basic/pom.xml b/samples/basic/pom.xml
@@ -31,6 +31,10 @@
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>javax.activation</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-xjc</artifactId>
diff --git a/samples/basic/project-build.xml b/samples/basic/project-build.xml
@@ -10,7 +10,7 @@
 	</path>
 	<path id="test-compile.path">
 		<fileset dir="${basedir}/lib">
-			<include name="activation-*.jar"/>
+			<include name="javax.activation-*.jar"/>
 			<include name="jaxb-api-*.jar"/>
 			<include name="jaxb-impl-*.jar"/>
 			<include name="jaxb-runtime-*.jar"/>
@@ -30,7 +30,7 @@
 	</path>
 	<path id="test.path">
 		<fileset dir="${basedir}/lib">
-			<include name="activation-*.jar"/>
+			<include name="javax.activation-*.jar"/>
 			<include name="jaxb-api-*.jar"/>
 			<include name="jaxb-impl-*.jar"/>
 			<include name="jaxb-runtime-*.jar"/>
@@ -59,7 +59,7 @@
 			<!-- XJC2 Task classpath -->
 			<classpath>
 				<fileset dir="${basedir}/lib">
-					<include name="activation-*.jar"/>
+					<include name="javax.activation-*.jar"/>
 					<include name="jaxb-api-*.jar"/>
 					<include name="jaxb-impl-*.jar"/>
 					<include name="jaxb-runtime-*.jar"/>
@@ -70,13 +70,12 @@
 					<include name="jaxb-xjc-*.jar"/>
 					<include name="jaxb2-basics-ant-*.jar"/>
 
-					<include name="slf4j-*.jar"/>
 					<include name="jcl-over-slf4j-*.jar"/>
 				</fileset>
 			</classpath>
 		</taskdef>
 		<mkdir dir="${basedir}/target/generated-sources/xjc"/>
-		<xjc destdir="${basedir}/target/generated-sources/xjc" extension="true">
+		<xjc destdir="${basedir}/target/generated-sources/xjc" extension="true" failonerror="false">
 			<arg line="
 				-Xequals
 				-XhashCode
diff --git a/samples/basic/project-pom.xml b/samples/basic/project-pom.xml
@@ -14,6 +14,12 @@
 			<version>${jaxb.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>javax.activation</artifactId>
+			<version>${activation.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>
 			<artifactId>jaxb2-basics-runtime</artifactId>
diff --git a/samples/cxf/pom.xml b/samples/cxf/pom.xml
@@ -31,6 +31,10 @@
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>javax.activation</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-xjc</artifactId>
diff --git a/samples/jaxws/pom.xml b/samples/jaxws/pom.xml
@@ -31,6 +31,10 @@
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>javax.activation</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-xjc</artifactId>
diff --git a/samples/po-simple/pom.xml b/samples/po-simple/pom.xml
@@ -35,6 +35,10 @@
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-xjc</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>javax.activation</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
diff --git a/samples/po-simple/project-build.xml b/samples/po-simple/project-build.xml
@@ -9,7 +9,7 @@
 	</path>
 	<path id="test-compile.path">
 		<fileset dir="${basedir}/lib">
-			<include name="activation-*.jar"/>
+			<include name="javax.activation-*.jar"/>
 			<include name="jaxb-api-*.jar"/>
 			<include name="jaxb-impl-*.jar"/>
 			<include name="jaxb-runtime-*.jar"/>
@@ -29,7 +29,7 @@
 	</path>
 	<path id="test.path">
 		<fileset dir="${basedir}/lib">
-			<include name="activation-*.jar"/>
+			<include name="javax.activation-*.jar"/>
 			<include name="jaxb-api-*.jar"/>
 			<include name="jaxb-impl-*.jar"/>
 			<include name="jaxb-runtime-*.jar"/>
@@ -57,7 +57,7 @@
 			<!-- XJC2 Task classpath -->
 			<classpath>
 				<fileset dir="${basedir}/lib">
-					<include name="activation-*.jar"/>
+					<include name="javax.activation-*.jar"/>
 					<include name="jaxb-api-*.jar"/>
 					<include name="jaxb-impl-*.jar"/>
 					<include name="jaxb-runtime-*.jar"/>
@@ -68,13 +68,12 @@
 					<include name="jaxb-xjc-*.jar"/>
 					<include name="jaxb2-basics-ant-*.jar"/>
 
-					<include name="slf4j-*.jar"/>
 					<include name="jcl-over-slf4j-*.jar"/>
 				</fileset>
 			</classpath>
 		</taskdef>
 		<mkdir dir="${basedir}/target/generated-sources/xjc"/>
-		<xjc destdir="${basedir}/target/generated-sources/xjc" extension="true">
+		<xjc destdir="${basedir}/target/generated-sources/xjc" extension="true" failonerror="false">
 			<arg line="
 				-XsimpleEquals
 				-XsimpleHashCode"/>
diff --git a/samples/po-simple/project-pom.xml b/samples/po-simple/project-pom.xml
@@ -14,6 +14,12 @@
 			<version>${jaxb.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>javax.activation</artifactId>
+			<version>${activation.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>
 			<artifactId>jaxb2-basics-testing</artifactId>
diff --git a/samples/po/pom.xml b/samples/po/pom.xml
@@ -31,6 +31,10 @@
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>javax.activation</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-xjc</artifactId>
diff --git a/samples/po/project-build.xml b/samples/po/project-build.xml
@@ -10,7 +10,7 @@
 	</path>
 	<path id="test-compile.path">
 		<fileset dir="${basedir}/lib">
-			<include name="activation-*.jar"/>
+			<include name="javax.activation-*.jar"/>
 			<include name="jaxb-api-*.jar"/>
 			<include name="jaxb-impl-*.jar"/>
 			<include name="jaxb-runtime-*.jar"/>
@@ -30,7 +30,7 @@
 	</path>
 	<path id="test.path">
 		<fileset dir="${basedir}/lib">
-			<include name="activation-*.jar"/>
+			<include name="javax.activation-*.jar"/>
 			<include name="jaxb-api-*.jar"/>
 			<include name="jaxb-impl-*.jar"/>
 			<include name="jaxb-runtime-*.jar"/>
@@ -58,7 +58,7 @@
 			<!-- XJC2 Task classpath -->
 			<classpath>
 				<fileset dir="${basedir}/lib">
-					<include name="activation-*.jar"/>
+					<include name="javax.activation-*.jar"/>
 					<include name="jaxb-api-*.jar"/>
 					<include name="jaxb-impl-*.jar"/>
 					<include name="jaxb-runtime-*.jar"/>
@@ -69,13 +69,12 @@
 					<include name="jaxb-xjc-*.jar"/>
 					<include name="jaxb2-basics-ant-*.jar"/>
 
-					<include name="slf4j-*.jar"/>
 					<include name="jcl-over-slf4j-*.jar"/>
 				</fileset>
 			</classpath>
 		</taskdef>
 		<mkdir dir="${basedir}/target/generated-sources/xjc"/>
-		<xjc destdir="${basedir}/target/generated-sources/xjc" extension="true">
+		<xjc destdir="${basedir}/target/generated-sources/xjc" extension="true" failonerror="false">
 			<arg line="
 				-Xequals
 				-XhashCode
diff --git a/samples/po/project-pom.xml b/samples/po/project-pom.xml
@@ -14,6 +14,12 @@
 			<version>${jaxb.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>javax.activation</artifactId>
+			<version>${activation.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>
 			<artifactId>jaxb2-basics-runtime</artifactId>
diff --git a/samples/pom.xml b/samples/pom.xml
@@ -28,7 +28,7 @@
 						<!--phase>package</phase-->
 						<phase>none</phase>
 						<goals>
-							 <goal>attached</goal>
+							 <goal>single</goal>
 						</goals>
 						<configuration>
 							<descriptors>
@@ -42,7 +42,7 @@
 						<!--phase>package</phase-->
 						<phase>none</phase>
 						<goals>
-							 <goal>attached</goal>
+							 <goal>single</goal>
 						</goals>
 						<configuration>
 							<descriptors>
@@ -61,10 +61,10 @@
 						<!--phase>pre-integration-test</phase-->
 						<phase>none</phase>
 						<configuration>
-							<tasks>
+							<target>
 								<mkdir dir="target/test-maven-repository" />
 								<unzip src="target/${project.artifactId}-${project.version}-maven-src.zip" dest="${basedir}/target/test-maven-assembly" />
-							</tasks>
+							</target>
 						</configuration>
 						<goals>
 							<goal>run</goal>
@@ -75,9 +75,9 @@
 						<!--phase>pre-integration-test</phase-->
 						<phase>none</phase>
 						<configuration>
-							<tasks>
+							<target>
 								<unzip src="${basedir}/target/${project.artifactId}-${project.version}-ant-src.zip" dest="${basedir}/target/test-ant-assembly"/>
-							</tasks>
+							</target>
 						</configuration>
 						<goals>
 							<goal>run</goal>
@@ -88,9 +88,9 @@
 						<!--phase>integration-test</phase-->
 						<phase>none</phase>
 						<configuration>
-							<tasks>
+							<target>
 								<ant dir="${basedir}/target/test-ant-assembly/${project.artifactId}-${project.version}" target="package"/>
-							</tasks>
+							</target>
 						</configuration>
 						<goals>
 							<goal>run</goal>
diff --git a/samples/src/main/assembly/ant-src.xml b/samples/src/main/assembly/ant-src.xml
@@ -19,6 +19,7 @@
 	<dependencySets>
 		<dependencySet>
 			<outputDirectory>lib</outputDirectory>
+			<useProjectArtifact>false</useProjectArtifact>
 		</dependencySet>
 	</dependencySets>
 	<files>
