Merge pull request #60 from Alfresco/fix/MNT-23950-revert-jakarta-java17

MNT-23950 revert jakarta java17 for 8.N
Alfresco · Sep 4, 2023 · 1503230 · 1503230
2 parents 0c44151 + 6a1ac77
commit 1503230
Show file tree

Hide file tree

Showing 84 changed files with 1,012 additions and 1,088 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: adopt
-          java-version: 17
+          java-version: 11
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
 
@@ -77,7 +77,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: adopt
-          java-version: 17
+          java-version: 11
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
 
@@ -110,7 +110,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: adopt
-          java-version: 17
+          java-version: 11
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
 

diff --git a/surf/pom.xml b/surf/pom.xml
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-super-pom</artifactId>
-      <version>12</version>
+      <version>10</version>
    </parent>
 
    <groupId>org.alfresco.surf</groupId>
@@ -55,20 +55,15 @@
 
    <properties>
       <!-- Surf projects historically use 'spring.version' property -->
-      <spring.version>6.0.8</spring.version>
+      <spring.version>5.3.27</spring.version>
       <dependency.alfresco-core.version>8.425</dependency.alfresco-core.version>
-      <dependency.webscripts.version>8.46</dependency.webscripts.version>
-      <dependency.freemarker.version>2.3.30-jakarta-1</dependency.freemarker.version>
+      <dependency.webscripts.version>8.47</dependency.webscripts.version>
+      <dependency.freemarker.version>2.3.30</dependency.freemarker.version>
       <dependency.rhino.version>1.7.13</dependency.rhino.version>
       <dependency.yui.version>2.9.0-alfresco-20141223</dependency.yui.version>
       <dependency.httpcomponents.version>4.5.12</dependency.httpcomponents.version>
       <dependency.opencmis.version>0.11.0</dependency.opencmis.version>
       <plugin.jetty.version>8.1.16.v20140903</plugin.jetty.version>
-      <java.version>17</java.version>
-      <maven.build.sourceVersion>${java.version}</maven.build.sourceVersion>
-      <maven.compiler.source>${java.version}</maven.compiler.source>
-      <maven.compiler.target>${java.version}</maven.compiler.target>
-      <maven.compiler.release>${java.version}</maven.compiler.release>      
    </properties>
 
    <dependencies>
@@ -107,22 +102,11 @@
       </dependency>
 
       <dependency>
-         <groupId>jakarta.servlet</groupId>
-          <artifactId>jakarta.servlet-api</artifactId>
-          <version>6.0.0</version>
+         <groupId>javax.servlet</groupId>
+         <artifactId>javax.servlet-api</artifactId>
+         <version>3.0.1</version>
          <scope>provided</scope>
       </dependency>
-       <dependency>
-           <groupId>jakarta.servlet.jsp</groupId>
-           <artifactId>jakarta.servlet.jsp-api</artifactId>
-           <version>3.1.1</version>
-           <scope>provided</scope>
-       </dependency>
-       <dependency>
-           <groupId>jakarta.el</groupId>
-           <artifactId>jakarta.el-api</artifactId>
-           <version>5.0.0</version>
-       </dependency>
    </dependencies>
 
    <dependencyManagement>
@@ -164,11 +148,11 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.9.4</version>
         </dependency>
-          <dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-fileupload2-jakarta</artifactId>
-          <version>2.0.0-M1</version>
-          </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.5</version>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -213,17 +197,17 @@
          <dependency>
             <groupId>org.tuckey</groupId>
             <artifactId>urlrewritefilter</artifactId>
-            <version>4.0.4-jakarta-3</version>
+            <version>4.0.4</version>
          </dependency>
          <dependency>
-             <groupId>jakarta.servlet.jsp</groupId>
-             <artifactId>jakarta.servlet.jsp-api</artifactId>
-             <version>3.1.1</version>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.1</version>
          </dependency>
          <dependency>
-             <groupId>jakarta.servlet.jsp.jstl</groupId>
-             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-             <version>3.0.0</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
          </dependency>
          <dependency>
             <groupId>junit</groupId>

diff --git a/surf/spring-surf-archetype/src/main/resources/archetype-resources/pom.xml b/surf/spring-surf-archetype/src/main/resources/archetype-resources/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
          <groupId>org.tuckey</groupId>
          <artifactId>urlrewritefilter</artifactId>
-         <version>4.0.4-jakarta-3</version>
+         <version>4.0.4</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml b/surf/spring-surf-tests/spring-surf-extensibility-app/pom.xml
@@ -47,16 +47,8 @@
                      <suiteXmlFile>src/test/resources/cachingEnabledSuite.xml</suiteXmlFile>
                      <suiteXmlFile>src/test/resources/cachingDisabledSuite.xml</suiteXmlFile>
                  </suiteXmlFiles>
-                 <argLine>
-                     --add-opens=java.base/java.lang=ALL-UNNAMED
-                     --add-opens=java.base/java.util=ALL-UNNAMED
-                 </argLine>
              </configuration>
          </plugin>
-         <plugin>
-            <artifactId>maven-war-plugin</artifactId>
-            <version>3.4.0</version>
-         </plugin>
       </plugins>
    </build>
    <dependencies>
@@ -91,8 +83,8 @@
 
       <!-- Java Servlet -->
       <dependency>
-         <groupId>jakarta.servlet.jsp.jstl</groupId>
-         <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+         <groupId>javax.servlet</groupId>
+         <artifactId>jstl</artifactId>
       </dependency>
 
       <!-- Log4j -->
@@ -123,8 +115,8 @@
          <artifactId>commons-el</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.apache.commons</groupId>
-         <artifactId>commons-fileupload2-jakarta</artifactId>
+         <groupId>commons-fileupload</groupId>
+         <artifactId>commons-fileupload</artifactId>
       </dependency>
       <dependency>
          <groupId>commons-io</groupId>
@@ -191,8 +183,8 @@
 
       <!-- Container-provided dependencies-->
       <dependency>
-         <groupId>jakarta.servlet.jsp</groupId>
-         <artifactId>jakarta.servlet.jsp-api</artifactId>
+         <groupId>javax.servlet.jsp</groupId>
+         <artifactId>jsp-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <!-- Test dependencies -->

diff --git a/...ring-surf-fvt-app/src/main/webapp/WEB-INF/presetConstructs/WebScript_Template_Replace.xml b/...ring-surf-fvt-app/src/main/webapp/WEB-INF/presetConstructs/WebScript_Template_Replace.xml
diff --git a/surf/spring-surf/spring-surf/pom.xml b/surf/spring-surf/spring-surf/pom.xml
@@ -26,10 +26,6 @@
                         <!-- <suiteXmlFile>src/test/resources/configOverrideTests.xml</suiteXmlFile> -->
                         <!-- <suiteXmlFile>src/test/resources/groovyTests.xml</suiteXmlFile> -->
                     </suiteXmlFiles>
-                     <argLine>
-                        --add-opens=java.base/java.lang=ALL-UNNAMED
-                        --add-opens=java.base/java.util=ALL-UNNAMED
-                     </argLine>
                 </configuration>
             </plugin>
        </plugins>
@@ -49,8 +45,8 @@
 
       <!-- JSP API -->
       <dependency>
-         <groupId>jakarta.servlet.jsp</groupId>
-         <artifactId>jakarta.servlet.jsp-api</artifactId>
+         <groupId>javax.servlet.jsp</groupId>
+         <artifactId>jsp-api</artifactId>
          <scope>provided</scope>
       </dependency>
 

diff --git a/...rf/spring-surf/src/main/java/org/springframework/extensions/config/ConfigBeanFactory.java b/...rf/spring-surf/src/main/java/org/springframework/extensions/config/ConfigBeanFactory.java
@@ -21,12 +21,12 @@
 import java.util.Collections;
 import java.util.Enumeration;
 
-import jakarta.servlet.GenericServlet;
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
+import javax.servlet.GenericServlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
 import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.context.ApplicationContext;

diff --git a/...f/spring-surf/src/main/java/org/springframework/extensions/surf/DependencyAggregator.java b/...f/spring-surf/src/main/java/org/springframework/extensions/surf/DependencyAggregator.java
@@ -34,7 +34,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jakarta.servlet.ServletContext;
+import javax.servlet.ServletContext;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;

diff --git a/...surf/spring-surf/src/main/java/org/springframework/extensions/surf/DependencyHandler.java b/...surf/spring-surf/src/main/java/org/springframework/extensions/surf/DependencyHandler.java
@@ -37,7 +37,7 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import jakarta.servlet.ServletContext;
+import javax.servlet.ServletContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

diff --git a/...ing-surf/spring-surf/src/main/java/org/springframework/extensions/surf/FrameworkBean.java b/...ing-surf/spring-surf/src/main/java/org/springframework/extensions/surf/FrameworkBean.java
@@ -1,28 +1,28 @@
-/*
- * Copyright (C) 2005-2015 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+/*
+ * Copyright (C) 2005-2015 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.springframework.extensions.surf;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import jakarta.servlet.http.HttpSession;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

diff --git a/...ing-surf/spring-surf/src/main/java/org/springframework/extensions/surf/FrameworkUtil.java b/...ing-surf/spring-surf/src/main/java/org/springframework/extensions/surf/FrameworkUtil.java
@@ -1,46 +1,46 @@
-/*
- * Copyright (C) 2005-2015 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+/*
+ * Copyright (C) 2005-2015 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.springframework.extensions.surf;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import jakarta.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.extensions.config.ConfigService;
-import org.springframework.extensions.config.RemoteConfigElement;
-import org.springframework.extensions.config.RemoteConfigElement.EndpointDescriptor;
-import org.springframework.extensions.config.WebFrameworkConfigElement;
-import org.springframework.extensions.surf.exception.ConnectorServiceException;
-import org.springframework.extensions.surf.exception.CredentialVaultProviderException;
-import org.springframework.extensions.surf.render.RenderService;
-import org.springframework.extensions.surf.resource.ResourceLoader;
-import org.springframework.extensions.surf.resource.ResourceService;
-import org.springframework.extensions.surf.support.ThreadLocalRequestContext;
-import org.springframework.extensions.webscripts.Container;
-import org.springframework.extensions.webscripts.connector.Connector;
-import org.springframework.extensions.webscripts.connector.ConnectorService;
-import org.springframework.extensions.webscripts.connector.ConnectorSession;
-import org.springframework.extensions.webscripts.connector.CredentialVault;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.config.ConfigService;
+import org.springframework.extensions.config.RemoteConfigElement;
+import org.springframework.extensions.config.RemoteConfigElement.EndpointDescriptor;
+import org.springframework.extensions.config.WebFrameworkConfigElement;
+import org.springframework.extensions.surf.exception.ConnectorServiceException;
+import org.springframework.extensions.surf.exception.CredentialVaultProviderException;
+import org.springframework.extensions.surf.render.RenderService;
+import org.springframework.extensions.surf.resource.ResourceLoader;
+import org.springframework.extensions.surf.resource.ResourceService;
+import org.springframework.extensions.surf.support.ThreadLocalRequestContext;
+import org.springframework.extensions.webscripts.Container;
+import org.springframework.extensions.webscripts.connector.Connector;
+import org.springframework.extensions.webscripts.connector.ConnectorService;
+import org.springframework.extensions.webscripts.connector.ConnectorSession;
+import org.springframework.extensions.webscripts.connector.CredentialVault;
 
 /**
  * Static methods which are useful for working with services and