Skip to content

Commit

Permalink
[#140] Update dependencies for latest jaxb v2
Browse files Browse the repository at this point in the history 
 - Add support for building w/ JDK 9+
  • Loading branch information
@mattrpav
mattrpav committed Apr 26, 2022
1 parent 67a6b68 commit e9ce145
Show file tree
Hide file tree
Showing 16 changed files with 176 additions and 102 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven-build-action.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ jobs:
java-version: 11

- name: Build project with Maven
run: mvn clean install
run: mvn -Pall,samples clean install
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
target
.project
.settings
.classpath
11 changes: 0 additions & 11 deletions .project
View file

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Please refer to the [wiki](https://github.com/highsource/jaxb2-basics/wiki) for

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.

JAXB2 Basics can only be used with Java 1.7 and above.
JAXB2 Basics can only be used with Java 1.8 and above.

## Using JAXB2 Basics

Expand Down
4 changes: 4 additions & 0 deletions plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-tools</artifactId>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
37 changes: 22 additions & 15 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,13 @@
</profiles>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jaxb.version>2.3.0</jaxb.version>
<jaxb.version>2.3.6</jaxb.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<jaxb-core.version>2.3.0.1</jaxb-core.version>
<activation.version>1.2.0</activation.version>
<maven-jaxb2-plugin.version>0.14.0</maven-jaxb2-plugin.version>
<cxf-codegen-plugin.version>3.2.4</cxf-codegen-plugin.version>
<slf4j.version>1.7.7</slf4j.version>
<maven-jaxb2-plugin.version>0.15.1</maven-jaxb2-plugin.version>
<cxf-codegen-plugin.version>3.3.13</cxf-codegen-plugin.version>
<slf4j.version>1.7.36</slf4j.version>
</properties>
<prerequisites>
<maven>3.1</maven>
Expand Down Expand Up @@ -212,7 +214,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.version}</version>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand All @@ -222,7 +224,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
<version>${jaxb.version}</version>
<version>${jaxb-core.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand Down Expand Up @@ -300,12 +302,12 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
<version>1.10.12</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.7.0</version>
<version>1.10.12</version>
</dependency>
<!-- Java Parser -->
<dependency>
Expand All @@ -331,15 +333,15 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.10.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<version>3.1.0</version>
<dependencies>
<!--dependency>
<groupId>sun.jdk</groupId>
Expand All @@ -355,10 +357,15 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-optional</artifactId>
<version>1.5.3-1</version>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.12</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
<version>1.10.12</version>
</dependency>
</dependencies>
</plugin>
<plugin>
Expand Down
56 changes: 37 additions & 19 deletions samples/basic/project-build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,50 +3,64 @@
<property name="artifactId" value="jaxb2-basics-sample-basic-ant"/>
<path id="compile.path">
<fileset dir="${basedir}/lib">
<include name="commons-lang3-*.jar"/>
<include name="jaxb-api-*.jar"/>
<include name="commons-lang3-*.jar"/>
<include name="codemodel-*.jar"/>
<include name="istack-commons-*.jar"/>
<include name="jakarta.xml.bind-api-*.jar"/>
<include name="jaxb2-basics-runtime-*.jar"/>
<include name="junit-*.jar"/>
<include name="relaxng-datatype-*.jar"/>
<include name="rngom-*.jar"/>
<include name="txw2-*.jar"/>
<include name="xsom-*.jar"/>
</fileset>
</path>
<path id="test-compile.path">
<fileset dir="${basedir}/lib">
<include name="istack-commons-*.jar"/>
<include name="javax.activation-*.jar"/>
<include name="jaxb-api-*.jar"/>
<include name="jaxb-impl-*.jar"/>
<include name="jakarta.xml.bind-api-*.jar"/>
<include name="jaxb-runtime-*.jar"/>
<include name="jaxb-core-*.jar"/>
<include name="stax-api-*.jar"/>
<include name="jsr173_api-*.jar"/>

<include name="jaxb2-basics-runtime-*.jar"/>
<include name="junit-*.jar"/>
<include name="jaxb2-basics-testing-*.jar"/>
<include name="xmlunit-*.jar"/>
<include name="codemodel-*.jar"/>
<include name="commons-io-*.jar"/>
<include name="commons-lang3-*.jar"/>

<include name="slf4j-*.jar"/>
<include name="jcl-over-slf4j-*.jar"/>
<include name="relaxng-datatype-*.jar"/>
<include name="rngom-*.jar"/>
<include name="txw2-*.jar"/>
<include name="xsom-*.jar"/>
</fileset>
</path>
<path id="test.path">
<fileset dir="${basedir}/lib">
<include name="istack-commons-*.jar"/>
<include name="javax.activation-*.jar"/>
<include name="jaxb-api-*.jar"/>
<include name="jaxb-impl-*.jar"/>
<include name="jakarta.xml.bind-api-*.jar"/>
<include name="jaxb-runtime-*.jar"/>
<include name="jaxb-core-*.jar"/>
<include name="stax-api-*.jar"/>
<include name="jsr173_api-*.jar"/>

<include name="jaxb2-basics-runtime-*.jar"/>
<include name="junit-*.jar"/>
<include name="jaxb2-basics-testing-*.jar"/>
<include name="xmlunit-*.jar"/>
<include name="codemodel-*.jar"/>
<include name="commons-io-*.jar"/>
<include name="commons-lang3-*.jar"/>

<include name="slf4j-*.jar"/>
<include name="jcl-over-slf4j-*.jar"/>
<include name="relaxng-datatype-*.jar"/>
<include name="rngom-*.jar"/>
<include name="txw2-*.jar"/>
<include name="xsom-*.jar"/>
</fileset>
</path>
<target name="clean">
Expand All @@ -59,18 +73,22 @@
<!-- XJC2 Task classpath -->
<classpath>
<fileset dir="${basedir}/lib">
<include name="codemodel-*.jar"/>
<include name="istack-commons-*.jar"/>
<include name="javax.activation-*.jar"/>
<include name="jaxb-api-*.jar"/>
<include name="jaxb-impl-*.jar"/>
<include name="jakarta.xml.bind-api-*.jar"/>
<include name="jaxb-runtime-*.jar"/>
<include name="jaxb-core-*.jar"/>
<include name="jsr173_api-*.jar"/>
<include name="junit-*.jar"/>
<include name="stax-api-*.jar"/>

<include name="jaxb-xjc-*.jar"/>
<include name="jaxb2-basics-ant-*.jar"/>

<include name="jcl-over-slf4j-*.jar"/>
<include name="relaxng-datatype-*.jar"/>
<include name="rngom-*.jar"/>
<include name="txw2-*.jar"/>
<include name="xsom-*.jar"/>
</fileset>
</classpath>
</taskdef>
Expand Down Expand Up @@ -104,8 +122,8 @@
srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc"
classpathref="compile.path"
includeantruntime="false"
source="1.7"
target="1.7">
source="1.8"
target="1.8">
</javac>
<copy todir="${basedir}/target/classes">
<fileset dir="${basedir}/src/main/resources"/>
Expand All @@ -121,8 +139,8 @@
srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc"
classpathref="test-compile.path"
includeantruntime="false"
source="1.7"
target="1.7">
source="1.8"
target="1.8">
</javac>
<copy todir="${basedir}/target/test-classes">
<fileset dir="${basedir}/src/test/resources"/>
Expand Down Expand Up @@ -161,4 +179,4 @@
basedir="${basedir}/target/classes"/>
</target>
<target name="install" depends="package"/>
</project>
</project>
6 changes: 3 additions & 3 deletions samples/basic/project-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 4 additions & 0 deletions samples/cxf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
<dependency> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf-codegen-plugin.version}</version>
</dependency>
</dependencies>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
34 changes: 23 additions & 11 deletions samples/cxf/project-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@
<packaging>jar</packaging>
<name>JAXB2 Basics - Sample [cxf-maven]</name>
<dependencies>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
<artifactId>javax.jws-api</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
Expand All @@ -34,8 +46,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -71,19 +83,19 @@
</configuration>
<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>${jaxb.version}</version>
</dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
<version>${jaxb.version}</version>
<version>${jaxb-core.version}</version>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
Expand All @@ -94,4 +106,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Loading

0 comments on commit e9ce145

Please sign in to comment.