Skip to content

Commit d70b82a

Browse files
highsourcehighsource
committed
Fixing the 0.8.4 build.
1 parent 38bd54a commit d70b82a

File tree

11 files changed

+134
-30
lines changed

11 files changed

+134
-30
lines changed

‎basic/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<dependency>
3636
<groupId>com.google.code.javaparser</groupId>
3737
<artifactId>javaparser</artifactId>
38-
<version>1.0.11</version>
3938
</dependency>
4039
<dependency>
4140
<groupId>org.jvnet.jaxb2.maven2</groupId>

‎plugins/.classpath‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
10+
<attributes>
11+
<attribute name="maven.pomderived" value="true"/>
12+
</attributes>
13+
</classpathentry>
14+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
15+
<attributes>
16+
<attribute name="optional" value="true"/>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
20+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
21+
<attributes>
22+
<attribute name="maven.pomderived" value="true"/>
23+
</attributes>
24+
</classpathentry>
25+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
26+
<attributes>
27+
<attribute name="maven.pomderived" value="true"/>
28+
</attributes>
29+
</classpathentry>
30+
<classpathentry kind="output" path="target/classes"/>
31+
</classpath>

‎plugins/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target

‎plugins/.project‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>jaxb2-basics-full</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
22+
</natures>
23+
</projectDescription>

‎plugins/pom.xml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<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">
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>org.jvnet.jaxb2_commons</groupId>
4+
<artifactId>jaxb2-basics-plugins</artifactId>
5+
<packaging>jar</packaging>
6+
<name>JAXB2 Basics - Full Plugins JAR</name>
7+
<parent>
8+
<groupId>org.jvnet.jaxb2_commons</groupId>
9+
<artifactId>jaxb2-basics-project</artifactId>
10+
<version>0.8.3-SNAPSHOT</version>
11+
<relativePath>../pom.xml</relativePath>
12+
</parent>
13+
<dependencies>
14+
<dependency>
15+
<groupId>org.jvnet.jaxb2_commons</groupId>
16+
<artifactId>jaxb2-basics</artifactId>
17+
</dependency>
18+
<dependency>
19+
<groupId>org.jvnet.jaxb2_commons</groupId>
20+
<artifactId>jaxb2-basics-runtime</artifactId>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.jvnet.jaxb2_commons</groupId>
24+
<artifactId>jaxb2-basics-tools</artifactId>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.jvnet.jaxb2_commons</groupId>
28+
<artifactId>jaxb2-basics-runtime</artifactId>
29+
</dependency>
30+
</dependencies>
31+
<build>
32+
<plugins>
33+
<plugin>
34+
<groupId>org.apache.maven.plugins</groupId>
35+
<artifactId>maven-shade-plugin</artifactId>
36+
<executions>
37+
<execution>
38+
<phase>package</phase>
39+
<goals>
40+
<goal>shade</goal>
41+
</goals>
42+
<configuration>
43+
<createDependencyReducedPom>false</createDependencyReducedPom>
44+
<transformers>
45+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
46+
</transformers>
47+
</configuration>
48+
</execution>
49+
</executions>
50+
</plugin>
51+
</plugins>
52+
</build>
53+
</project>

‎pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<module>tools</module>
6868
<module>testing</module>
6969
<module>basic</module>
70+
<module>plugins</module>
7071
</modules>
7172
<profiles>
7273
<profile>
@@ -106,6 +107,11 @@
106107
</dependencies>
107108
<dependencyManagement>
108109
<dependencies>
110+
<dependency>
111+
<groupId>org.jvnet.jaxb2_commons</groupId>
112+
<artifactId>jaxb2-basics-plugins</artifactId>
113+
<version>${project.version}</version>
114+
</dependency>
109115
<dependency>
110116
<groupId>org.jvnet.jaxb2_commons</groupId>
111117
<artifactId>jaxb2-basics-ant</artifactId>
@@ -232,6 +238,12 @@
232238
<artifactId>ant-launcher</artifactId>
233239
<version>1.7.0</version>
234240
</dependency>
241+
<!-- Java Parser -->
242+
<dependency>
243+
<groupId>com.google.code.javaparser</groupId>
244+
<artifactId>javaparser</artifactId>
245+
<version>1.0.11</version>
246+
</dependency>
235247
</dependencies>
236248
</dependencyManagement>
237249
<build>

‎qrelease.bat‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@ set JAVA_HOME=%JAVA6_HOME%
44

55
echo Performing a short clean build.
66
rem pause
7-
call mvn clean install -DperformRelease
7+
call mvn clean install
88
echo Short clean build completed.
99
rem pause
1010

1111
echo Performing a full clean build.
1212
rem pause
13-
call mvn clean install -DperformRelease -Ptests,demos,samples
13+
call mvn clean install -DperformRelease -Ptests,samples
1414
echo Full clean build completed.
1515
rem pause
1616

1717
echo Setting new version to %1.
1818
rem pause
19-
call mvn versions:set -Ptests,demos,samples -DnewVersion=%1
19+
call mvn versions:set -Ptests,samples -DnewVersion=%1
2020
echo Version was set to %1.
2121
rem pause
22-
call mvn versions:commit -Ptests,demos,samples
22+
call mvn versions:commit -Ptests,samples
2323
echo Version %1 committed.
2424
rem pause
2525

2626
echo Performing a short clean build.
2727
rem pause
28-
call mvn clean install -DperformRelease
28+
call mvn clean install
2929
echo Short clean build completed.
3030
rem pause
3131

@@ -56,28 +56,28 @@ rem pause
5656

5757
echo Performing full clean deploy.
5858
rem pause
59-
call mvn -DperformRelease -Psonatype-oss-release,tests,demos,samples clean deploy
59+
call mvn -DperformRelease -Psonatype-oss-release,tests,samples clean deploy
6060
echo Full clean deploy done.
6161
rem pause
6262

6363
echo Setting new version to %2.
6464
rem pause
65-
call mvn versions:set -Ptests,demos,samples -DnewVersion=%2
65+
call mvn versions:set -Ptests,samples -DnewVersion=%2
6666
echo Version was set to %2.
6767
rem pause
68-
call mvn versions:commit -Ptests,demos,samples
68+
call mvn versions:commit -Ptests,samples
6969
echo Version %2 was committed.
7070
rem pause
7171

7272
echo Performing a short clean build.
7373
rem pause
74-
call mvn clean install -DperformRelease
74+
call mvn clean install
7575
echo Short clean build completed.
7676
rem pause
7777

7878
echo Performing a full clean build.
7979
rem pause
80-
call mvn clean install -DperformRelease -Ptests,demos,samples
80+
call mvn clean install -DperformRelease -Ptests,samples
8181
echo Full clean build completed.
8282
rem pause
8383

‎samples/basic/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</dependency>
2020
<dependency>
2121
<groupId>org.jvnet.jaxb2_commons</groupId>
22-
<artifactId>jaxb2-basics</artifactId>
22+
<artifactId>jaxb2-basics-plugins</artifactId>
2323
</dependency>
2424
<dependency>
2525
<groupId>org.jvnet.jaxb2_commons</groupId>

‎samples/basic/project-build.xml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,7 @@
8484
<!-- Plugins -->
8585
<classpath>
8686
<fileset dir="${basedir}/lib">
87-
<!-- JAXB2 Basics library -->
88-
<include name="jaxb2-basics-*.jar"/>
89-
<!-- JAXB2 Basics library dependencies -->
90-
<include name="jaxb2-basics-runtime-*.jar"/>
91-
<include name="jaxb2-basics-tools-*.jar"/>
92-
<include name="javaparser-*.jar"/>
93-
<include name="commons-beanutils-*.jar"/>
94-
<include name="commons-lang3-*.jar"/>
95-
<include name="commons-logging-*.jar"/>
87+
<include name="jaxb2-basics-plugins-*.jar"/>
9688
</fileset>
9789
</classpath>
9890
</xjc>

‎samples/po/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</dependency>
2020
<dependency>
2121
<groupId>org.jvnet.jaxb2_commons</groupId>
22-
<artifactId>jaxb2-basics</artifactId>
22+
<artifactId>jaxb2-basics-plugins</artifactId>
2323
</dependency>
2424
<dependency>
2525
<groupId>org.jvnet.jaxb2_commons</groupId>

0 commit comments

Comments
 (0)