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-localization.git
The following commit(s) were added to refs/heads/master by this push:
new 4908dd9 Use turbine parent 13-SNAPSHOT with java 17 baseline; update
missing dep log4j-api in test scope, use jakarta servlet api 6.1.0
4908dd9 is described below
commit 4908dd9d2a8428e8642fd3f46a53f48e7a858ce5
Author: Georg Kallidis <[email protected]>
AuthorDate: Tue Jul 9 15:08:30 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 | 10 +++++-----
.../fulcrum/localization/DefaultLocalizationService.java | 6 +++---
.../org/apache/fulcrum/localization/LocalizationService.java | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 640d881..a0834f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath /><!-- ignore default value -->
</parent>
@@ -82,9 +82,9 @@
<version>4.3.1</version>
</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>
<dependency>
@@ -97,7 +97,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>
diff --git
a/src/java/org/apache/fulcrum/localization/DefaultLocalizationService.java
b/src/java/org/apache/fulcrum/localization/DefaultLocalizationService.java
index 9f25e48..fda614d 100644
--- a/src/java/org/apache/fulcrum/localization/DefaultLocalizationService.java
+++ b/src/java/org/apache/fulcrum/localization/DefaultLocalizationService.java
@@ -22,7 +22,7 @@ package org.apache.fulcrum.localization;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
@@ -108,7 +108,7 @@ public class DefaultLocalizationService
}
/**
- * @see
org.apache.fulcrum.localization.LocalizationService#getBundle(java.lang.String,
javax.servlet.http.HttpServletRequest)
+ * @see
org.apache.fulcrum.localization.LocalizationService#getBundle(java.lang.String,
jakarta.servlet.http.HttpServletRequest)
*
* This method returns a ResourceBundle given the bundle name and
* the Locale information supplied in the HTTP "Accept-Language"
@@ -125,7 +125,7 @@ public class DefaultLocalizationService
}
/* (non-Javadoc)
- * @see
org.apache.fulcrum.localization.LocalizationService#getLocale(javax.servlet.http.HttpServletRequest)
+ * @see
org.apache.fulcrum.localization.LocalizationService#getLocale(jakarta.servlet.http.HttpServletRequest)
*/
public Locale getLocale(HttpServletRequest req)
{
diff --git a/src/java/org/apache/fulcrum/localization/LocalizationService.java
b/src/java/org/apache/fulcrum/localization/LocalizationService.java
index 0bb6d2c..be4754b 100644
--- a/src/java/org/apache/fulcrum/localization/LocalizationService.java
+++ b/src/java/org/apache/fulcrum/localization/LocalizationService.java
@@ -24,7 +24,7 @@ package org.apache.fulcrum.localization;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* <p>
