Merge Upgrade To Tomcat 10 - Meeds-io/MIPs#76

Meeds-io · Dec 20, 2023 · f770424 · f770424
2 parents 180202c + d90ad2a
commit f770424
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,14 +3,6 @@
 #
 **/pom.xml.versionsBackup
 
-# /exo.core.component.security.core/
-/exo.core.component.security.core/.project
-/exo.core.component.security.core/.classpath
-/exo.core.component.security.core/target
-
-# /packaging/module/
-/packaging/module/target
-
 #
 # Default excludes
 #
@@ -48,5 +40,5 @@ target/
 
 # Misc
 *.swp
-.rebel.xml.bak
-rebel.xml
+*.log
+*.epoch
diff --git a/exo.core.component.database/pom.xml b/exo.core.component.database/pom.xml
@@ -140,7 +140,7 @@
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>@{argLine} ${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+              <argLine>@{argLine} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
             </configuration>
          </plugin>
          <plugin>

diff --git a/exo.core.component.organization.api/pom.xml b/exo.core.component.organization.api/pom.xml
@@ -69,16 +69,6 @@
             </exclusion>
          </exclusions>
       </dependency>
-      <dependency>
-         <groupId>org.ogce</groupId>
-         <artifactId>xpp3</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
       <dependency>
          <groupId>org.mockito</groupId>
          <artifactId>mockito-inline</artifactId>
@@ -106,7 +96,7 @@
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>@{argLine} ${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+              <argLine>@{argLine} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
             </configuration>
          </plugin>
          <plugin>

diff --git a/exo.core.component.security.core/pom.xml b/exo.core.component.security.core/pom.xml
@@ -64,7 +64,7 @@
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>@{argLine} ${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+              <argLine>@{argLine} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
             </configuration>
          </plugin>
          <plugin>

diff --git a/...y.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java b/...y.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java
@@ -28,10 +28,10 @@
 import org.exoplatform.services.security.ConversationState;
 import org.exoplatform.services.security.StateKey;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
 
 /**
  * @author <a href="mailto:[email protected]">Andrey Parfonov</a>

diff --git a/...ecurity.core/src/main/java/org/exoplatform/services/security/web/HttpSessionStateKey.java b/...ecurity.core/src/main/java/org/exoplatform/services/security/web/HttpSessionStateKey.java
@@ -20,7 +20,7 @@
 
 import org.exoplatform.services.security.StateKey;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 /**
  * @author <a href="mailto:[email protected]">Andrey Parfonov</a>

diff --git a/...re/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java b/...re/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java
@@ -27,8 +27,8 @@
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
 
 /**
  * @author <a href="mailto:[email protected]">Andrey Parfonov</a>

diff --git a/...ty.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java b/...ty.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java
@@ -33,13 +33,13 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 /**
  * Created by The eXo Platform SAS .

diff --git a/exo.core.component.xml-processing/pom.xml b/exo.core.component.xml-processing/pom.xml
@@ -95,7 +95,7 @@
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>@{argLine} ${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+              <argLine>@{argLine} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
             </configuration>
          </plugin>
          <plugin>

diff --git a/pom.xml b/pom.xml
@@ -123,11 +123,6 @@
          <artifactId>junit</artifactId>
          <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>xml-apis</groupId>
-        <artifactId>xml-apis</artifactId>
-        <scope>test</scope>
-      </dependency>
    </dependencies>
    <!-- This profile is used to allow github action to build branches. The github action is used for sonar analysis -->
    <profiles>