diff --git a/main/pom.xml b/main/pom.xml index cfa2658..9c398d9 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 @@ -9,10 +9,8 @@ butterfly-container 1.2.7-SNAPSHOT - - org.openrefine.dependencies + butterfly - 1.2.7-SNAPSHOT SIMILE Butterfly Engine https://github.com/OpenRefine/simile-butterfly/ @@ -111,9 +109,10 @@ 1.9.1 - javax.servlet - javax.servlet-api - 4.0.1 + jakarta.servlet + jakarta.servlet-api + 5.0.0 + provided org.slf4j diff --git a/main/src/edu/mit/simile/butterfly/Butterfly.java b/main/src/edu/mit/simile/butterfly/Butterfly.java index e6ff843..cec6345 100644 --- a/main/src/edu/mit/simile/butterfly/Butterfly.java +++ b/main/src/edu/mit/simile/butterfly/Butterfly.java @@ -28,13 +28,13 @@ import java.util.Timer; import java.util.TimerTask; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.app.VelocityEngine; diff --git a/main/src/edu/mit/simile/butterfly/ButterflyModule.java b/main/src/edu/mit/simile/butterfly/ButterflyModule.java index 68b8869..4db1331 100644 --- a/main/src/edu/mit/simile/butterfly/ButterflyModule.java +++ b/main/src/edu/mit/simile/butterfly/ButterflyModule.java @@ -9,10 +9,10 @@ import java.util.Set; import java.util.Timer; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.VelocityContext; diff --git a/main/src/edu/mit/simile/butterfly/ButterflyModuleImpl.java b/main/src/edu/mit/simile/butterfly/ButterflyModuleImpl.java index b6cc49a..d5d1b62 100644 --- a/main/src/edu/mit/simile/butterfly/ButterflyModuleImpl.java +++ b/main/src/edu/mit/simile/butterfly/ButterflyModuleImpl.java @@ -27,10 +27,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections.ExtendedProperties; import org.apache.commons.collections.OrderedMap; diff --git a/main/src/edu/mit/simile/butterfly/ButterflyMounter.java b/main/src/edu/mit/simile/butterfly/ButterflyMounter.java index 3ed4944..865bf76 100644 --- a/main/src/edu/mit/simile/butterfly/ButterflyMounter.java +++ b/main/src/edu/mit/simile/butterfly/ButterflyMounter.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/main/src/edu/mit/simile/butterfly/ScriptableButterfly.java b/main/src/edu/mit/simile/butterfly/ScriptableButterfly.java index c13c6a9..d2509f0 100644 --- a/main/src/edu/mit/simile/butterfly/ScriptableButterfly.java +++ b/main/src/edu/mit/simile/butterfly/ScriptableButterfly.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; diff --git a/main/tests/src/edu/mit/simile/butterfly/tests/ButterflyTest.java b/main/tests/src/edu/mit/simile/butterfly/tests/ButterflyTest.java index 7409de4..f9d5c8f 100644 --- a/main/tests/src/edu/mit/simile/butterfly/tests/ButterflyTest.java +++ b/main/tests/src/edu/mit/simile/butterfly/tests/ButterflyTest.java @@ -3,10 +3,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; -import org.testng.annotations.BeforeSuite; import edu.mit.simile.butterfly.Butterfly; diff --git a/main/tests/src/edu/mit/simile/butterfly/tests/ServletAPIExtensionTests.java b/main/tests/src/edu/mit/simile/butterfly/tests/ServletAPIExtensionTests.java index 7b61865..eb71f6c 100644 --- a/main/tests/src/edu/mit/simile/butterfly/tests/ServletAPIExtensionTests.java +++ b/main/tests/src/edu/mit/simile/butterfly/tests/ServletAPIExtensionTests.java @@ -1,6 +1,6 @@ package edu.mit.simile.butterfly.tests; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/main/tests/src/edu/mit/simile/butterfly/tests/ZoneTests.java b/main/tests/src/edu/mit/simile/butterfly/tests/ZoneTests.java index eff9015..6619131 100644 --- a/main/tests/src/edu/mit/simile/butterfly/tests/ZoneTests.java +++ b/main/tests/src/edu/mit/simile/butterfly/tests/ZoneTests.java @@ -1,6 +1,6 @@ package edu.mit.simile.butterfly.tests; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.LoggerFactory; import org.testng.Assert;