You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2025/09/27 21:18:31 UTC
(jspwiki) 19/20: Leftovers from proper rebase from master
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit f1cb3a80edc9f99de3c140beaa6a4b725fd2145f
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Sat Sep 27 22:43:30 2025 +0200
Leftovers from proper rebase from master
---
LICENSE | 4 ++--
.../apache/wiki/auth/DefaultUserManagerTest.java | 2 +-
jspwiki-util/pom.xml | 25 +---------------------
pom.xml | 5 +++--
4 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/LICENSE b/LICENSE
index da6b4b853..49eef35f7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -213,7 +213,7 @@ annotations-15.0.jar LICENSE
aws-java-sdk-core-1.12.565.jar LICENSE
aws-java-sdk-kendra-1.12.565.jar LICENSE
commons-codec-1.3.jar LICENSE
-commons-collections-4.4.jar LICENSE
+commons-collections-4.5.0.jar LICENSE
commons-fileupload-2.0.0-M4.jar LICENSE
commons-httpclient-3.1.jar LICENSE
commons-io-2.20.0.jar LICENSE
@@ -240,7 +240,7 @@ flexmark-util-options-0.64.8.jar ./jspwiki-war/src/main/config/doc/LI
flexmark-util-sequence-0.64.8.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-visitor-0.64.8.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
freshcookies-security-0.60.jar LICENSE
-gson-2.11.0 LICENSE
+gson-2.13.1 LICENSE
httpclient-4.5.13 LICENSE
httpcore-4.4.13 LICENSE
ion-java-1.0.2 LICENSE
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/DefaultUserManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/DefaultUserManagerTest.java
index bd80be347..c3c4b5f3f 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/DefaultUserManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/DefaultUserManagerTest.java
@@ -26,7 +26,7 @@ import org.apache.wiki.auth.user.UserProfile;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Properties;
import static org.mockito.Mockito.mock;
diff --git a/jspwiki-util/pom.xml b/jspwiki-util/pom.xml
index 7a9195aac..33220b464 100644
--- a/jspwiki-util/pom.xml
+++ b/jspwiki-util/pom.xml
@@ -32,32 +32,9 @@
<dependencies>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>logging-mailhandler</artifactId>
+ <artifactId>jakarta.mail</artifactId>
</dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- </dependency>
-
-
-<dependency>
- <groupId>org.eclipse.angus</groupId>
- <artifactId>angus-mail</artifactId>
- <scope>test</scope>
-</dependency>
-
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
-</dependency>
-
-<dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
-</dependency>
-
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/pom.xml b/pom.xml
index 67c47470d..e4ad62222 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,8 +56,8 @@
<ehcache.version>2.10.9.2</ehcache.version>
<flexmark.version>0.64.8</flexmark.version>
<freshcookies-security.version>0.60</freshcookies-security.version>
- <gson.version>2.11.0</gson.version>
- <hsqldb.version>2.7.2</hsqldb.version>
+ <gson.version>2.13.1</gson.version>
+ <hsqldb.version>2.7.4</hsqldb.version>
<jakarta-activation.version>2.0.1</jakarta-activation.version>
<jakarta-activation-api.version>2.1.3</jakarta-activation-api.version>
<jakarta-jsp-api.version>4.0.0</jakarta-jsp-api.version>
@@ -107,6 +107,7 @@
<plugin.war.version>3.4.0</plugin.war.version>
<plugin.inmemdb.version>1.4.3</plugin.inmemdb.version>
<plugin.jspc.version>5.0.0</plugin.jspc.version>
+ <plugin.build-helper.version>3.6.1</plugin.build-helper.version>
<plugin.checksum.version>1.11</plugin.checksum.version>
<plugin.jslint.version>1.0.1</plugin.jslint.version>
<plugin.cargo.version>1.10.20</plugin.cargo.version>