Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Artemis Jakarta Server 2.28.0.

Browse Source 
This allows us to reenable maven-enforcer-plugin. Using that, several tunings of various dependencies is needed to resolve transitive conflicts.

Resolves #1351.
This commit is contained in:
Greg L. Turnquist
2023-05-10 21:42:36 -05:00
parent 88a7f5d408
commit 6db6d51b66
5 changed files with 77 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
pom.xml
View File

@@ -85,7 +85,7 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
<activemq.version>2.19.0</activemq.version>
<activemq.version>2.28.0</activemq.version>
<aspectj.version>1.9.6</aspectj.version>
<assertj.version>3.9.0</assertj.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
@@ -111,14 +111,14 @@
<mail.version>1.4.7</mail.version>
<mockito.version>4.0.0</mockito.version>
<saaj-impl.version>2.0.1</saaj-impl.version>
<slf4j.version>2.0.3</slf4j.version>
<slf4j.version>2.0.6</slf4j.version>
<smack.version>4.3.5</smack.version>
<spring.version>6.0.8</spring.version>
<spring-hateos.version>2.0.1</spring-hateos.version>
<spring-security.version>6.0.3</spring-security.version>
<sun-mail.version>2.0.1</sun-mail.version>
<stax.version>2.0.1</stax.version>
<woodstox.version>6.4.0</woodstox.version>
<woodstox.version>6.5.1</woodstox.version>
<wsdl4j.version>1.6.3</wsdl4j.version>
<wss4j.version>2.4.1</wss4j.version>
<xmlsec.version>3.0.2</xmlsec.version>
@@ -231,6 +231,14 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
<exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -296,33 +304,32 @@
<build>
<plugins>
<!-- TODO: Reenable pending resolution of https://issues.apache.org/jira/browse/ARTEMIS-3549 -->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-enforcer-plugin</artifactId>-->
<!-- <version>3.0.0-M2</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>default-cli</id>-->
<!-- <goals>-->
<!-- <goal>enforce</goal>-->
<!-- </goals>-->
<!-- <phase>validate</phase>-->
<!-- <configuration>-->
<!-- <rules>-->
<!-- <bannedDependencies>-->
<!-- <excludes>-->
<!-- <exclude>commons-logging:*:*</exclude>-->
<!-- </excludes>-->
<!-- <searchTransitive>true</searchTransitive>-->
<!-- </bannedDependencies>-->
<!-- <dependencyConvergence/>-->
<!-- </rules>-->
<!-- <fail>true</fail>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>default-cli</id>
<goals>
<goal>enforce</goal>
</goals>
<phase>validate</phase>
<configuration>
<rules>
<bannedDependencies>
<excludes>
<exclude>commons-logging:*:*</exclude>
</excludes>
<searchTransitive>true</searchTransitive>
</bannedDependencies>
<dependencyConvergence/>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.basepom.maven</groupId>

12
spring-ws-core/pom.xml
View File

@@ -77,6 +77,12 @@
<artifactId>jaxb-runtime</artifactId>
<version>${glassfish-xml-bind.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
@@ -210,6 +216,12 @@
<artifactId>spring-hateoas</artifactId>
<version>${spring-hateos.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
spring-ws-security/pom.xml
View File

@@ -47,6 +47,12 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<exclusions>
<exclusion>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-observation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -94,6 +100,10 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
@@ -120,6 +130,10 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>

8
spring-ws-support/pom.xml
View File

@@ -101,6 +101,14 @@
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

6
spring-ws-test/pom.xml
View File

@@ -44,6 +44,12 @@
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>${xmlunit.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>