This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/turbine-core.git
The following commit(s) were added to refs/heads/trunk by this push:
new c25cb8d7 Update dependencies: Use jakarte servlet compatible jabsorb
2.0.0, add json dependency explicitely (which is optional, but required for
Turbine xml rpc service to work), remove commons-configuration (includes
commons lang), update commons-configuration 2.11.2, -logging 1.3.2, -text
1.12.0 and yauaa to 7.26.1
c25cb8d7 is described below
commit c25cb8d7154e0239cc57c41c6ee09e6bc47a7103
Author: gemkall <[email protected]>
AuthorDate: Fri Jul 12 14:54:26 2024 +0200
Update dependencies: Use jakarte servlet compatible jabsorb 2.0.0, add json
dependency explicitely (which is optional, but required for Turbine xml rpc
service to work), remove commons-configuration (includes commons lang), update
commons-configuration 2.11.2, -logging 1.3.2, -text 1.12.0 and yauaa to 7.26.1
---
pom.xml | 50 ++++++----------------
.../apache/turbine/services/intake/IntakeTool.java | 2 +-
2 files changed, 13 insertions(+), 39 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2a338130..c46660a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -885,7 +885,7 @@
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.1.0</version>
- <!--scope>provided</scope-->
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
@@ -900,13 +900,8 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
- <version>2.10.1</version>
+ <version>2.11.0</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <version>1.6.0</version>
- </dependency-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email2-jakarta</artifactId>
@@ -920,7 +915,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.11.0</version>
+ <version>1.12.0</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -937,7 +932,7 @@
<groupId>nl.basjes.parse.useragent</groupId>
<artifactId>yauaa</artifactId>
<!-- java 11 required for v6.1+ -->
- <version>7.25.0</version>
+ <version>7.26.1</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
@@ -1017,11 +1012,6 @@
</exclusions>
</dependency>
<!-- use default dbcp2 from torque-runtime -->
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.10</version>
- </dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
@@ -1054,33 +1044,17 @@
<version>2.7.3</version>
<optional>true</optional>
</dependency>
+ <!-- jabsorb and json dependencies required for turbien service json rpc
to work-->
<dependency>
<groupId>org.jabsorb</groupId>
<artifactId>jabsorb</artifactId>
- <version>1.3.2</version>
- <optional>true</optional>
- <!-- requires maven version >= 3,
- exclude old versions:
org.slf4j:slf4j-jdk14,slf4j-api,(renamed)cl104-over-slf4j,org.mortbay.jetty:jsp-2.1,
commons-httpclient:commons-httpclient,
- mvn eclipse:eclipse still no wildcard exclude (mvn version 3.3.9)
- -->
- <exclusions>
- <exclusion>
- <artifactId>jsp-2.1</artifactId>
- <groupId>org.mortbay.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jcl104-over-slf4j</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-jdk14</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
+ <version>2.0.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20240303</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/src/java/org/apache/turbine/services/intake/IntakeTool.java
b/src/java/org/apache/turbine/services/intake/IntakeTool.java
index 4a19f831..2558c6d8 100644
--- a/src/java/org/apache/turbine/services/intake/IntakeTool.java
+++ b/src/java/org/apache/turbine/services/intake/IntakeTool.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.fulcrum.intake.IntakeException;
import org.apache.fulcrum.intake.IntakeService;
import org.apache.fulcrum.intake.Retrievable;
