This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 4d779c56d0bfd7032b8fbb02820080b3be513f9a
Author: Robert Lazarski <robertlazar...@gmail.com>
AuthorDate: Sat Oct 26 07:42:58 2024 -1000
Dep updates
---
modules/distribution/pom.xml | 31 ++++++++++++++-----------------
modules/rampart-integration/pom.xml | 7 +------
modules/rampart-samples/pom.xml | 6 ------
modules/rampart-tests/pom.xml | 6 ------
modules/rampart-trust/pom.xml | 6 ------
pom.xml | 30 ++++++++++++++++++++++++++----
6 files changed, 41 insertions(+), 45 deletions(-)
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 8bba47e8..de659ebb 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -35,6 +35,18 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>10.0.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
@@ -134,12 +146,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.72</version>
+ <version>${bcprov.jdk18.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
- <version>2.23.1</version>
+ <version>2.24.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -148,21 +160,6 @@
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>2.0.13</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>2.0.13</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>2.0.13</version>
- </dependency>
</dependencies>
</project>
diff --git a/modules/rampart-integration/pom.xml
b/modules/rampart-integration/pom.xml
index 577cf0ce..3c0f457c 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -570,7 +570,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.16.1</version>
+ <version>2.17.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -603,11 +603,6 @@
<artifactId>log4j-api</artifactId>
<version>2.24.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>2.24.1</version>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
diff --git a/modules/rampart-samples/pom.xml b/modules/rampart-samples/pom.xml
index 4a5bf4d7..82b43607 100644
--- a/modules/rampart-samples/pom.xml
+++ b/modules/rampart-samples/pom.xml
@@ -129,12 +129,6 @@
<version>2.24.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>2.24.1</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
diff --git a/modules/rampart-tests/pom.xml b/modules/rampart-tests/pom.xml
index e93f3ce4..62970a07 100644
--- a/modules/rampart-tests/pom.xml
+++ b/modules/rampart-tests/pom.xml
@@ -126,12 +126,6 @@
<version>2.24.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>2.24.1</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
diff --git a/modules/rampart-trust/pom.xml b/modules/rampart-trust/pom.xml
index a81abdf6..5f5e171f 100644
--- a/modules/rampart-trust/pom.xml
+++ b/modules/rampart-trust/pom.xml
@@ -124,12 +124,6 @@
<version>2.24.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>2.24.1</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
diff --git a/pom.xml b/pom.xml
index 93c5bdc5..69143cf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -435,6 +435,17 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>${axis2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -610,13 +621,23 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-jcl</artifactId>
<version>2.24.1</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <version>2.24.1</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
@@ -720,6 +741,7 @@
<failIfNoTests>false</failIfNoTests>
<jacoco.version>0.8.12</jacoco.version>
+ <slf4j.version>2.0.16</slf4j.version>
</properties>
<pluginRepositories>
