This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-intake.git
The following commit(s) were added to refs/heads/master by this push:
new 74ee9dc1 Use turbine parent 13-SNAPSHOT with java 17 baseline; update
missing dep log4j-api in test scope, use jakarta servlet api 6.1.0
74ee9dc1 is described below
commit 74ee9dc1d45bb44d6059b95e8a149ba441121a5f
Author: Georg Kallidis <g...@apache.org>
AuthorDate: Tue Jul 9 15:08:29 2024 +0200
Use turbine parent 13-SNAPSHOT with java 17 baseline; update missing dep
log4j-api in test scope, use jakarta servlet api 6.1.0
---
pom.xml | 19 ++++++++++++-------
.../apache/fulcrum/intake/model/UploadPartField.java | 3 ++-
.../fulcrum/intake/validator/FileValidator.java | 3 ++-
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 53ae731d..5074dab3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath />
</parent>
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parser</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -118,9 +118,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.1.0</version>
<scope>provided</scope>
</dependency>
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -137,13 +137,18 @@
<version>2.0.0</version>
<scope>test</scope>
</dependency>
- <!-- log4j2 only usable in testcontainer 1.0.10 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${turbine.log4j2.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/src/java/org/apache/fulcrum/intake/model/UploadPartField.java
b/src/java/org/apache/fulcrum/intake/model/UploadPartField.java
index 427cc079..ab2ce9d3 100644
--- a/src/java/org/apache/fulcrum/intake/model/UploadPartField.java
+++ b/src/java/org/apache/fulcrum/intake/model/UploadPartField.java
@@ -19,7 +19,6 @@ package org.apache.fulcrum.intake.model;
* under the License.
*/
-import javax.servlet.http.Part;
import org.apache.fulcrum.intake.IntakeException;
import org.apache.fulcrum.intake.IntakeRuntimeException;
@@ -28,6 +27,8 @@ import
org.apache.fulcrum.intake.validator.ValidationException;
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.fulcrum.parser.ValueParser;
+import jakarta.servlet.http.Part;
+
/**
* @author <a href="mailto:jmcna...@collab.net";>John McNally</a>
* @author <a href="mailto:h...@intermeta.de";>Henning P. Schmiedehausen</a>
diff --git a/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
b/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
index f1467b3a..9aae445b 100644
--- a/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
+++ b/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
@@ -26,7 +26,8 @@ import java.nio.charset.Charset;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.Part;
+
/**
* A validator that will compare a Part testValue against the following
