Fixing the 0.8.4 build.

highsource · Sep 26, 2014 · d70b82a · d70b82a
1 parent 38bd54a
commit d70b82a
Show file tree

Hide file tree

Showing 11 changed files with 134 additions and 30 deletions.
diff --git a/basic/pom.xml b/basic/pom.xml
@@ -35,7 +35,6 @@
 		<dependency>
 			<groupId>com.google.code.javaparser</groupId>
 			<artifactId>javaparser</artifactId>
-			<version>1.0.11</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb2.maven2</groupId>

diff --git a/plugins/.classpath b/plugins/.classpath
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/.gitignore b/plugins/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/plugins/.project b/plugins/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jaxb2-basics-full</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -0,0 +1,53 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.jvnet.jaxb2_commons</groupId>
+	<artifactId>jaxb2-basics-plugins</artifactId>
+	<packaging>jar</packaging>
+	<name>JAXB2 Basics - Full Plugins JAR</name>
+	<parent>
+		<groupId>org.jvnet.jaxb2_commons</groupId>
+		<artifactId>jaxb2-basics-project</artifactId>
+		<version>0.8.3-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<dependencies>
+		<dependency>
+			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<artifactId>jaxb2-basics</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<artifactId>jaxb2-basics-runtime</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<artifactId>jaxb2-basics-tools</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<artifactId>jaxb2-basics-runtime</artifactId>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<createDependencyReducedPom>false</createDependencyReducedPom>
+							<transformers>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -67,6 +67,7 @@
 		<module>tools</module>
 		<module>testing</module>
 		<module>basic</module>
+		<module>plugins</module>
 	</modules>
 	<profiles>
 		<profile>
@@ -106,6 +107,11 @@
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.jvnet.jaxb2_commons</groupId>
+				<artifactId>jaxb2-basics-plugins</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.jvnet.jaxb2_commons</groupId>
 				<artifactId>jaxb2-basics-ant</artifactId>
@@ -232,6 +238,12 @@
 				<artifactId>ant-launcher</artifactId>
 				<version>1.7.0</version>
 			</dependency>
+			<!-- Java Parser -->
+			<dependency>
+				<groupId>com.google.code.javaparser</groupId>
+				<artifactId>javaparser</artifactId>
+				<version>1.0.11</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<build>

diff --git a/qrelease.bat b/qrelease.bat
@@ -4,28 +4,28 @@ set JAVA_HOME=%JAVA6_HOME%
 
 echo Performing a short clean build.
 rem pause
-call mvn clean install -DperformRelease
+call mvn clean install
 echo Short clean build completed.
 rem pause
 
 echo Performing a full clean build.
 rem pause
-call mvn clean install -DperformRelease -Ptests,demos,samples
+call mvn clean install -DperformRelease -Ptests,samples
 echo Full clean build completed.
 rem pause
 
 echo Setting new version to %1.
 rem pause
-call mvn versions:set -Ptests,demos,samples -DnewVersion=%1
+call mvn versions:set -Ptests,samples -DnewVersion=%1
 echo Version was set to %1.
 rem pause
-call mvn versions:commit -Ptests,demos,samples
+call mvn versions:commit -Ptests,samples
 echo Version %1 committed.
 rem pause
 
 echo Performing a short clean build.
 rem pause
-call mvn clean install -DperformRelease
+call mvn clean install
 echo Short clean build completed.
 rem pause
 
@@ -56,28 +56,28 @@ rem pause
 
 echo Performing full clean deploy.
 rem pause
-call mvn -DperformRelease -Psonatype-oss-release,tests,demos,samples clean deploy
+call mvn -DperformRelease -Psonatype-oss-release,tests,samples clean deploy
 echo Full clean deploy done.
 rem pause
 
 echo Setting new version to %2.
 rem pause
-call mvn versions:set -Ptests,demos,samples -DnewVersion=%2
+call mvn versions:set -Ptests,samples -DnewVersion=%2
 echo Version was set to %2.
 rem pause
-call mvn versions:commit -Ptests,demos,samples
+call mvn versions:commit -Ptests,samples
 echo Version %2 was committed.
 rem pause
 
 echo Performing a short clean build.
 rem pause
-call mvn clean install -DperformRelease
+call mvn clean install
 echo Short clean build completed.
 rem pause
 
 echo Performing a full clean build.
 rem pause
-call mvn clean install -DperformRelease -Ptests,demos,samples
+call mvn clean install -DperformRelease -Ptests,samples
 echo Full clean build completed.
 rem pause
 

diff --git a/samples/basic/pom.xml b/samples/basic/pom.xml
@@ -19,7 +19,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>
-			<artifactId>jaxb2-basics</artifactId>
+			<artifactId>jaxb2-basics-plugins</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>

diff --git a/samples/basic/project-build.xml b/samples/basic/project-build.xml
@@ -84,15 +84,7 @@
 			<!-- Plugins -->
 			<classpath>
 				<fileset dir="${basedir}/lib">
-					<!-- JAXB2 Basics library -->
-					<include name="jaxb2-basics-*.jar"/>
-					<!-- JAXB2 Basics library dependencies -->
-					<include name="jaxb2-basics-runtime-*.jar"/>
-					<include name="jaxb2-basics-tools-*.jar"/>
-					<include name="javaparser-*.jar"/>
-					<include name="commons-beanutils-*.jar"/>
-					<include name="commons-lang3-*.jar"/>
-					<include name="commons-logging-*.jar"/>
+					<include name="jaxb2-basics-plugins-*.jar"/>
 				</fileset>
 			</classpath>
 		</xjc>

diff --git a/samples/po/pom.xml b/samples/po/pom.xml
@@ -19,7 +19,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>
-			<artifactId>jaxb2-basics</artifactId>
+			<artifactId>jaxb2-basics-plugins</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>

diff --git a/samples/po/project-build.xml b/samples/po/project-build.xml
@@ -85,14 +85,7 @@
 			<classpath>
 				<fileset dir="${basedir}/lib">
 					<!-- JAXB2 Basics library -->
-					<include name="jaxb2-basics-*.jar"/>
-					<!-- JAXB2 Basics library dependencies -->
-					<include name="jaxb2-basics-runtime-*.jar"/>
-					<include name="jaxb2-basics-tools-*.jar"/>
-					<include name="javaparser-*.jar"/>
-					<include name="commons-beanutils-*.jar"/>
-					<include name="commons-lang3-*.jar"/>
-					<include name="commons-logging-*.jar"/>
+					<include name="jaxb2-basics-plugins-*.jar"/>
 				</fileset>
 			</classpath>
 		</xjc>