Skip to content

Commit

Permalink
Java 11 and security fix for next major oxalis release
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaron-kumar
aaron-kumar committed Jan 10, 2023
1 parent e3d79d6 commit 9385259
Show file tree
Hide file tree
Showing 6 changed files with 233 additions and 51 deletions.
51 changes: 40 additions & 11 deletions peppol-bdx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>network.oxalis.peppol</groupId>
<artifactId>peppol-specifications</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>2.0.0-RC1-SNAPSHOT</version>
</parent>

<artifactId>peppol-bdx</artifactId>
Expand Down Expand Up @@ -63,26 +63,55 @@
</license>
</licenses>

<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>1.6</version>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.14.0</version>
<executions>
<execution>
<id>xjc</id>
<goals>
<goal>xjc</goal>
<goal>generate</goal>
</goals>
<configuration>
<generateDirectory>target/generated-sources/xjc/</generateDirectory>
<schemaDirectory>${basedir}/src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>*.xsd</include>
</schemaIncludes>
<bindingDirectory>${basedir}/src/main/xjb</bindingDirectory>
<bindingIncludes>
<include>*.xjb</include>
</bindingIncludes>
</configuration>
</execution>
</executions>
<configuration>
<encoding>${java.encoding}</encoding>
<target>2.1</target>
</configuration>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

</project>
68 changes: 55 additions & 13 deletions peppol-busdox/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>network.oxalis.peppol</groupId>
<artifactId>peppol-specifications</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>2.0.0-RC1-SNAPSHOT</version>
</parent>

<artifactId>peppol-busdox</artifactId>
Expand Down Expand Up @@ -64,29 +64,69 @@
</license>
</licenses>

<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>1.6</version>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.14.0</version>
<executions>
<execution>
<id>xjc</id>
<goals>
<goal>xjc</goal>
<goal>generate</goal>
</goals>
<configuration>
<encoding>${java.encoding}</encoding>
<generateDirectory>target/generated-sources/xjc/</generateDirectory>
<schemaDirectory>${basedir}/src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>*.xsd</include>
</schemaIncludes>
<bindingDirectory>${basedir}/src/main/xjb</bindingDirectory>
<bindingIncludes>
<include>*.xjb</include>
</bindingIncludes>
</configuration>
</execution>
</executions>
<configuration>
<encoding>${java.encoding}</encoding>
<target>2.1</target>
</configuration>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.jvnet.jax-ws-commons</groupId>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
<version>2.2</version>
<version>2.3.5</version>
<executions>
<!-- Use one execution per WSDL file, as the wsdlLocation can specify only one file at a time. The wsdlLocation
is the location how the WSDL file will be referenced in the code (using class.getResource). Also important: use a different
Expand All @@ -98,6 +138,7 @@
<goal>wsimport</goal>
</goals>
<configuration>
<encoding>${java.encoding}</encoding>
<wsdlFiles>
<wsdlFile>ManageBusinessIdentifierService-1.0.wsdl</wsdlFile>
</wsdlFiles>
Expand All @@ -115,6 +156,7 @@
<goal>wsimport</goal>
</goals>
<configuration>
<encoding>${java.encoding}</encoding>
<wsdlFiles>
<wsdlFile>ManageServiceMetadataService-1.0.wsdl</wsdlFile>
</wsdlFiles>
Expand Down Expand Up @@ -142,7 +184,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-tools</artifactId>
<version>2.2.10</version>
<version>2.3.5</version>
</dependency>
</dependencies>
</plugin>
Expand Down
52 changes: 41 additions & 11 deletions peppol-sbdh/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>network.oxalis.peppol</groupId>
<artifactId>peppol-specifications</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>2.0.0-RC1-SNAPSHOT</version>
</parent>

<artifactId>peppol-sbdh</artifactId>
Expand Down Expand Up @@ -68,25 +68,55 @@
</license>
</licenses>

<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>1.6</version>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.14.0</version>
<executions>
<execution>
<id>xjc</id>
<goals>
<goal>xjc</goal>
<goal>generate</goal>
</goals>
<configuration>
<generateDirectory>target/generated-sources/xjc/</generateDirectory>
<schemaDirectory>${basedir}/src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>*.xsd</include>
</schemaIncludes>
<bindingDirectory>${basedir}/src/main/xjb</bindingDirectory>
<bindingIncludes>
<include>*.xjb</include>
</bindingIncludes>
<generatePackage>network.oxalis.peppol.sbdh.jaxb</generatePackage>
</configuration>
</execution>
</executions>
<configuration>
<encoding>UTF-8</encoding>
<target>2.1</target>
<packageName>network.oxalis.peppol.sbdh.jaxb</packageName>
</configuration>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
48 changes: 38 additions & 10 deletions peppol-schematron/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>network.oxalis.peppol</groupId>
<artifactId>peppol-specifications</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>2.0.0-RC1-SNAPSHOT</version>
</parent>

<artifactId>peppol-schematron</artifactId>
Expand Down Expand Up @@ -66,6 +66,16 @@
</licenses>

<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand All @@ -80,21 +90,39 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>1.6</version>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.14.0</version>
<executions>
<execution>
<id>xjc</id>
<goals>
<goal>xjc</goal>
<goal>generate</goal>
</goals>
<configuration>
<generateDirectory>target/generated-sources/xjc/</generateDirectory>
<schemaDirectory>${basedir}/src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>*.xsd</include>
</schemaIncludes>
<bindingDirectory>${basedir}/src/main/xjb</bindingDirectory>
<bindingIncludes>
<include>*.xjb</include>
</bindingIncludes>
</configuration>
</execution>
</executions>
<configuration>
<encoding>UTF-8</encoding>
<target>2.1</target>
</configuration>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
28 changes: 25 additions & 3 deletions peppol-ubl21/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>network.oxalis.peppol</groupId>
<artifactId>peppol-specifications</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>2.0.0-RC1-SNAPSHOT</version>
</parent>

<artifactId>peppol-ubl21</artifactId>
Expand Down Expand Up @@ -66,6 +66,16 @@
</licenses>

<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand All @@ -77,7 +87,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.13.2</version>
<version>0.14.0</version>
<executions>
<execution>
<id>xsd</id>
Expand Down Expand Up @@ -105,8 +115,20 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

</project>
Loading

0 comments on commit 9385259

Please sign in to comment.