Skip to content

Commit

Permalink
Integrate jaxb-ri 4.0.3,
Browse files Browse the repository at this point in the history
angus activation 2.0.1,
angus mail 2.0.2,
jakarta activation-api 2.1.2,
jakarta mail-api 2.1.2,
woodstox 6.5.1

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
lukasj committed Jun 7, 2023
1 parent 13f6cfd commit 6048c96
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 15 deletions.
8 changes: 3 additions & 5 deletions jaxws-ri/boms/bom-ext/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
<properties>
<ant.version>1.10.12</ant.version>
<!-- CQ 21208 -->
<asm.version>9.4</asm.version>
<asm.version>9.5</asm.version>
<eclipselink.version>4.0.0</eclipselink.version>
<junit.version>4.13.2</junit.version>
<mail-api.version>2.1.1</mail-api.version>
<angus-mail.version>2.0.1</angus-mail.version>
<mail-api.version>2.1.2</mail-api.version>
<angus-mail.version>2.0.2</angus-mail.version>
<servlet-api.version>6.0.0</servlet-api.version>
</properties>

Expand Down Expand Up @@ -104,8 +104,6 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<type>jar</type>
<classifier>sources</classifier>
<version>${asm.version}</version>
</dependency>

Expand Down
35 changes: 31 additions & 4 deletions jaxws-ri/boms/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@
<istack.plugin.version>4.1.2</istack.plugin.version>
<gmbal-api.version>4.0.3</gmbal-api.version>
<ha-api.version>3.1.13</ha-api.version>
<jaxb.version>4.0.2</jaxb.version>
<jaxb.version>4.0.3</jaxb.version>
<xml.ws-api.version>4.0.0</xml.ws-api.version>
<management-api.version>3.2.3</management-api.version>
<mimepull.version>1.10.0</mimepull.version>
<saaj-api.version>3.0.0</saaj-api.version>
<saaj-impl.version>3.0.2</saaj-impl.version>
<streambuffer.version>2.1.0</streambuffer.version>
<woodstox-core.version>6.5.0</woodstox-core.version>
<woodstox-core.version>6.5.1</woodstox-core.version>
<stax2-api.version>4.2.1</stax2-api.version>
<activation-api.version>2.1.1</activation-api.version>
<angus-activation.version>2.0.0</angus-activation.version>
<activation-api.version>2.1.2</activation-api.version>
<angus-activation.version>2.0.1</angus-activation.version>
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
</properties>

Expand Down Expand Up @@ -229,4 +229,31 @@
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.15.0</version>
<configuration>
<ruleSet>
<rules>
<rule>
<!-- 4.2.0+ comes with no SecurityManager support -->
<groupId>com.sun.istack</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>4.[2-9]+.*</version>
</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleSet>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
4 changes: 2 additions & 2 deletions jaxws-ri/extras/jaxws-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>7.7.1</version>
<version>7.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down Expand Up @@ -171,7 +171,7 @@
<spotbugs.exclude/>
<spotbugs.skip>false</spotbugs.skip>
<spotbugs.threshold>Normal</spotbugs.threshold>
<spotbugs.version>4.7.3.0</spotbugs.version>
<spotbugs.version>4.7.3.4</spotbugs.version>
<findsecbugs.version>1.11.0</findsecbugs.version>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.testRelease>${maven.compiler.release}</maven.compiler.testRelease>
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<spotbugs.exclude/>
<spotbugs.skip>false</spotbugs.skip>
<spotbugs.threshold>Normal</spotbugs.threshold>
<spotbugs.version>4.7.3.0</spotbugs.version>
<spotbugs.version>4.7.3.4</spotbugs.version>
<findsecbugs.version>1.11.0</findsecbugs.version>

<maven.compiler.release>11</maven.compiler.release>
Expand Down
27 changes: 24 additions & 3 deletions jaxws-ri/runtime/policy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<spotbugs.exclude>${project.basedir}/exclude.xml</spotbugs.exclude>
<spotbugs.skip>false</spotbugs.skip>
<spotbugs.threshold>Low</spotbugs.threshold>
<spotbugs.version>4.7.3.0</spotbugs.version>
<spotbugs.version>4.7.3.4</spotbugs.version>
<findsecbugs.version>1.11.0</findsecbugs.version>

<maven.compiler.release>11</maven.compiler.release>
Expand All @@ -99,9 +99,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<legal.doc.source>${project.basedir}/../../..</legal.doc.source>

<jaxb.version>4.0.2</jaxb.version>
<jaxb.version>4.0.3</jaxb.version>
<junit.version>4.13.2</junit.version>
<istack.plugin.version>4.1.1</istack.plugin.version>
<istack.plugin.version>4.1.2</istack.plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -208,6 +208,27 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M8</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.15.0</version>
<configuration>
<ruleSet>
<rules>
<rule>
<!-- 4.2.0+ comes with no SecurityManager support -->
<groupId>com.sun.istack</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>4.[2-9]+.*</version>
</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleSet>
</configuration>
</plugin>
</plugins>
</pluginManagement>

Expand Down

0 comments on commit 6048c96

Please sign in to comment.