Skip to content

Commit e746206

Browse files
mattrpavmattrpav
authored
[#140] Update dependencies for latest jaxb v2 (#141)
- Add support for building w/ JDK 9+
1 parent 67a6b68 commit e746206

File tree

17 files changed

+177
-102
lines changed

17 files changed

+177
-102
lines changed

‎.github/workflows/maven-build-action.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
java-version: 11
2020

2121
- name: Build project with Maven
22-
run: mvn clean install
22+
run: mvn -Pall,samples clean install

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
target
44
.project
55
.settings
6+
.classpath

‎.project‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Please refer to the [wiki](https://github.com/highsource/jaxb2-basics/wiki) for
99

1010
JAXB2 Basics can only be used with JAXB/XJC 2.3.0 and higher. JAXB/XJC versions 2.2.x and earlier are no longer supported.
1111

12-
JAXB2 Basics can only be used with Java 1.7 and above.
12+
JAXB2 Basics can only be used with Java 1.8 and above.
1313

1414
## Using JAXB2 Basics
1515

‎plugins/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<groupId>org.jvnet.jaxb2_commons</groupId>
2222
<artifactId>jaxb2-basics-tools</artifactId>
2323
</dependency>
24+
<dependency>
25+
<groupId>com.sun.activation</groupId>
26+
<artifactId>javax.activation</artifactId>
27+
</dependency>
2428
</dependencies>
2529
<build>
2630
<plugins>

‎pom.xml‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,13 @@
138138
</profiles>
139139
<properties>
140140
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
141-
<jaxb.version>2.3.0</jaxb.version>
141+
<jaxb.version>2.3.6</jaxb.version>
142+
<jaxb-api.version>2.3.1</jaxb-api.version>
143+
<jaxb-core.version>2.3.0.1</jaxb-core.version>
142144
<activation.version>1.2.0</activation.version>
143-
<maven-jaxb2-plugin.version>0.14.0</maven-jaxb2-plugin.version>
144-
<cxf-codegen-plugin.version>3.2.4</cxf-codegen-plugin.version>
145-
<slf4j.version>1.7.7</slf4j.version>
145+
<maven-jaxb2-plugin.version>0.15.1</maven-jaxb2-plugin.version>
146+
<cxf-codegen-plugin.version>3.3.13</cxf-codegen-plugin.version>
147+
<slf4j.version>1.7.36</slf4j.version>
146148
</properties>
147149
<prerequisites>
148150
<maven>3.1</maven>
@@ -212,7 +214,7 @@
212214
<dependency>
213215
<groupId>javax.xml.bind</groupId>
214216
<artifactId>jaxb-api</artifactId>
215-
<version>${jaxb.version}</version>
217+
<version>${jaxb-api.version}</version>
216218
</dependency>
217219
<dependency>
218220
<groupId>org.glassfish.jaxb</groupId>
@@ -222,7 +224,7 @@
222224
<dependency>
223225
<groupId>org.glassfish.jaxb</groupId>
224226
<artifactId>jaxb-core</artifactId>
225-
<version>${jaxb.version}</version>
227+
<version>${jaxb-core.version}</version>
226228
</dependency>
227229
<dependency>
228230
<groupId>org.glassfish.jaxb</groupId>
@@ -300,12 +302,12 @@
300302
<dependency>
301303
<groupId>org.apache.ant</groupId>
302304
<artifactId>ant</artifactId>
303-
<version>1.7.0</version>
305+
<version>1.10.12</version>
304306
</dependency>
305307
<dependency>
306308
<groupId>org.apache.ant</groupId>
307309
<artifactId>ant-launcher</artifactId>
308-
<version>1.7.0</version>
310+
<version>1.10.12</version>
309311
</dependency>
310312
<!-- Java Parser -->
311313
<dependency>
@@ -331,15 +333,15 @@
331333
</plugin>
332334
<plugin>
333335
<artifactId>maven-compiler-plugin</artifactId>
334-
<version>3.7.0</version>
336+
<version>3.10.1</version>
335337
<configuration>
336-
<source>1.7</source>
337-
<target>1.7</target>
338+
<source>1.8</source>
339+
<target>1.8</target>
338340
</configuration>
339341
</plugin>
340342
<plugin>
341343
<artifactId>maven-antrun-plugin</artifactId>
342-
<version>1.8</version>
344+
<version>3.1.0</version>
343345
<dependencies>
344346
<!--dependency>
345347
<groupId>sun.jdk</groupId>
@@ -355,10 +357,15 @@
355357
<scope>runtime</scope>
356358
</dependency>
357359
<dependency>
358-
<groupId>ant</groupId>
359-
<artifactId>ant-optional</artifactId>
360-
<version>1.5.3-1</version>
360+
<groupId>org.apache.ant</groupId>
361+
<artifactId>ant</artifactId>
362+
<version>1.10.12</version>
361363
</dependency>
364+
<dependency>
365+
<groupId>org.apache.ant</groupId>
366+
<artifactId>ant-junit</artifactId>
367+
<version>1.10.12</version>
368+
</dependency>
362369
</dependencies>
363370
</plugin>
364371
<plugin>

‎samples/basic/project-build.xml‎

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,64 @@
33
<property name="artifactId" value="jaxb2-basics-sample-basic-ant"/>
44
<path id="compile.path">
55
<fileset dir="${basedir}/lib">
6-
<include name="commons-lang3-*.jar"/>
7-
<include name="jaxb-api-*.jar"/>
6+
<include name="commons-lang3-*.jar"/>
7+
<include name="codemodel-*.jar"/>
8+
<include name="istack-commons-*.jar"/>
9+
<include name="jakarta.xml.bind-api-*.jar"/>
810
<include name="jaxb2-basics-runtime-*.jar"/>
11+
<include name="junit-*.jar"/>
12+
<include name="relaxng-datatype-*.jar"/>
13+
<include name="rngom-*.jar"/>
14+
<include name="txw2-*.jar"/>
15+
<include name="xsom-*.jar"/>
916
</fileset>
1017
</path>
1118
<path id="test-compile.path">
1219
<fileset dir="${basedir}/lib">
20+
<include name="istack-commons-*.jar"/>
1321
<include name="javax.activation-*.jar"/>
14-
<include name="jaxb-api-*.jar"/>
15-
<include name="jaxb-impl-*.jar"/>
22+
<include name="jakarta.xml.bind-api-*.jar"/>
1623
<include name="jaxb-runtime-*.jar"/>
1724
<include name="jaxb-core-*.jar"/>
1825
<include name="stax-api-*.jar"/>
1926
<include name="jsr173_api-*.jar"/>
20-
2127
<include name="jaxb2-basics-runtime-*.jar"/>
2228
<include name="junit-*.jar"/>
2329
<include name="jaxb2-basics-testing-*.jar"/>
2430
<include name="xmlunit-*.jar"/>
31+
<include name="codemodel-*.jar"/>
32+
<include name="commons-io-*.jar"/>
2533
<include name="commons-lang3-*.jar"/>
26-
2734
<include name="slf4j-*.jar"/>
2835
<include name="jcl-over-slf4j-*.jar"/>
36+
<include name="relaxng-datatype-*.jar"/>
37+
<include name="rngom-*.jar"/>
38+
<include name="txw2-*.jar"/>
39+
<include name="xsom-*.jar"/>
2940
</fileset>
3041
</path>
3142
<path id="test.path">
3243
<fileset dir="${basedir}/lib">
44+
<include name="istack-commons-*.jar"/>
3345
<include name="javax.activation-*.jar"/>
34-
<include name="jaxb-api-*.jar"/>
35-
<include name="jaxb-impl-*.jar"/>
46+
<include name="jakarta.xml.bind-api-*.jar"/>
3647
<include name="jaxb-runtime-*.jar"/>
3748
<include name="jaxb-core-*.jar"/>
3849
<include name="stax-api-*.jar"/>
3950
<include name="jsr173_api-*.jar"/>
40-
4151
<include name="jaxb2-basics-runtime-*.jar"/>
4252
<include name="junit-*.jar"/>
4353
<include name="jaxb2-basics-testing-*.jar"/>
4454
<include name="xmlunit-*.jar"/>
55+
<include name="codemodel-*.jar"/>
4556
<include name="commons-io-*.jar"/>
4657
<include name="commons-lang3-*.jar"/>
47-
4858
<include name="slf4j-*.jar"/>
4959
<include name="jcl-over-slf4j-*.jar"/>
60+
<include name="relaxng-datatype-*.jar"/>
61+
<include name="rngom-*.jar"/>
62+
<include name="txw2-*.jar"/>
63+
<include name="xsom-*.jar"/>
5064
</fileset>
5165
</path>
5266
<target name="clean">
@@ -59,18 +73,22 @@
5973
<!-- XJC2 Task classpath -->
6074
<classpath>
6175
<fileset dir="${basedir}/lib">
76+
<include name="codemodel-*.jar"/>
77+
<include name="istack-commons-*.jar"/>
6278
<include name="javax.activation-*.jar"/>
63-
<include name="jaxb-api-*.jar"/>
64-
<include name="jaxb-impl-*.jar"/>
79+
<include name="jakarta.xml.bind-api-*.jar"/>
6580
<include name="jaxb-runtime-*.jar"/>
6681
<include name="jaxb-core-*.jar"/>
6782
<include name="jsr173_api-*.jar"/>
83+
<include name="junit-*.jar"/>
6884
<include name="stax-api-*.jar"/>
69-
7085
<include name="jaxb-xjc-*.jar"/>
7186
<include name="jaxb2-basics-ant-*.jar"/>
72-
7387
<include name="jcl-over-slf4j-*.jar"/>
88+
<include name="relaxng-datatype-*.jar"/>
89+
<include name="rngom-*.jar"/>
90+
<include name="txw2-*.jar"/>
91+
<include name="xsom-*.jar"/>
7492
</fileset>
7593
</classpath>
7694
</taskdef>
@@ -104,8 +122,8 @@
104122
srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc"
105123
classpathref="compile.path"
106124
includeantruntime="false"
107-
source="1.7"
108-
target="1.7">
125+
source="1.8"
126+
target="1.8">
109127
</javac>
110128
<copy todir="${basedir}/target/classes">
111129
<fileset dir="${basedir}/src/main/resources"/>
@@ -121,8 +139,8 @@
121139
srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc"
122140
classpathref="test-compile.path"
123141
includeantruntime="false"
124-
source="1.7"
125-
target="1.7">
142+
source="1.8"
143+
target="1.8">
126144
</javac>
127145
<copy todir="${basedir}/target/test-classes">
128146
<fileset dir="${basedir}/src/test/resources"/>
@@ -161,4 +179,4 @@
161179
basedir="${basedir}/target/classes"/>
162180
</target>
163181
<target name="install" depends="package"/>
164-
</project>
182+
</project>

‎samples/basic/project-pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@
7373
<plugin>
7474
<artifactId>maven-compiler-plugin</artifactId>
7575
<configuration>
76-
<source>1.7</source>
77-
<target>1.7</target>
76+
<source>1.8</source>
77+
<target>1.8</target>
7878
</configuration>
7979
</plugin>
8080
</plugins>
8181
</build>
82-
</project>
82+
</project>

‎samples/basic/src/test/resources/EMPTY.git‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# This is added to work around git limitation around empty folders

‎samples/cxf/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
<groupId>org.slf4j</groupId>
4444
<artifactId>slf4j-simple</artifactId>
4545
</dependency>
46+
<dependency> <groupId>org.apache.cxf</groupId>
47+
<artifactId>cxf-codegen-plugin</artifactId>
48+
<version>${cxf-codegen-plugin.version}</version>
49+
</dependency>
4650
</dependencies>
4751
<build>
4852
<defaultGoal>install</defaultGoal>

0 commit comments

Comments
 (0)