W-13897522: Revert JDK17 and Spring Boot 3

salesforce · Aug 9, 2023 · ff67d36 · ff67d36
1 parent f73e04d
commit ff67d36
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 33 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -49,7 +49,7 @@ jobs:
     - name: Setup Java JDK
       uses: actions/setup-java@v2
       with:
-        java-version: 17
+        java-version: 11
         distribution: 'zulu'
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
@@ -68,4 +68,4 @@ jobs:
        ./gradlew -PdockerRepo=salesforce/ -x test build  --info
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -13,7 +13,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
-        java-version: 17
+        java-version: 11
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Log into registry
@@ -43,4 +43,4 @@ jobs:
 #      with:
 #        image-name: salesforce/carbonj:${{ env.GRADLE_PROJECT_VERSION }}
 #        severity-threshold: CRITICAL
-        # run-quality-checks: false
+        # run-quality-checks: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     - name: Set up JDK 1.11
       uses: actions/setup-java@v2
       with:
-        java-version: 17
+        java-version: 11
         distribution: 'zulu'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -27,4 +27,4 @@ jobs:
     - name: Release with Gradle
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: ./gradlew  -PdockerRepo=salesforce/ clean build -Prelease.useAutomaticVersion=true -x test :carbonj.service:release --info --stacktrace
+      run: ./gradlew  -PdockerRepo=salesforce/ clean build -Prelease.useAutomaticVersion=true -x test :carbonj.service:release --info --stacktrace
diff --git a/build.gradle b/build.gradle
@@ -43,8 +43,8 @@ allprojects {
 subprojects {
     apply plugin: 'java'
 
-    sourceCompatibility = 17
-    targetCompatibility = 17
+    sourceCompatibility = 11
+    targetCompatibility = 11
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
     }
@@ -68,4 +68,4 @@ subprojects {
     }
 
 
-}
+}
diff --git a/carbonj.service/Dockerfile b/carbonj.service/Dockerfile
@@ -28,7 +28,7 @@ RUN yum install -y gcc-c++ gcc make libtool automake autoconf make python3-devel
 RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems && \
      yum install -y https://cdn.azul.com/zulu/bin/zulu-repo-1.0.0-1.noarch.rpm && \
      yum update -y && \
-     yum install -y zulu17-jdk \
+     yum install -y zulu11 \
      python3 \
      perl-URI-Encode \
      perl-Data-Dumper && \
@@ -102,4 +102,4 @@ RUN chmod +x /sbin/tini
 ENTRYPOINT ["/sbin/tini", "--"]
 
 # Run your program under Tini
-CMD ["/app/bin/entrypoint.sh"]
+CMD ["/app/bin/entrypoint.sh"]
diff --git a/carbonj.service/src/main/java/com/demandware/carbonj/service/admin/CarbonjAdmin.java b/carbonj.service/src/main/java/com/demandware/carbonj/service/admin/CarbonjAdmin.java
@@ -31,8 +31,8 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import jakarta.servlet.ServletInputStream;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.Writer;
 import java.nio.charset.Charset;
@@ -991,4 +991,4 @@ private DataPoint toDataPoint( Metric m, String line )
         p.setMetricId( m.id );
         return p;
     }
-}
+}
diff --git a/...vice/src/main/java/com/demandware/carbonj/service/engine/GraphiteMetricSearchServlet.java b/...vice/src/main/java/com/demandware/carbonj/service/engine/GraphiteMetricSearchServlet.java
@@ -10,11 +10,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import com.demandware.carbonj.service.events.EventsLogger;
 import com.demandware.carbonj.service.db.TimeSeriesStore;
@@ -125,4 +125,4 @@ protected void doGet( HttpServletRequest req, HttpServletResponse res )
 
     }
 
-}
+}
diff --git a/...ervice/src/main/java/com/demandware/carbonj/service/engine/GraphiteSeriesDataServlet.java b/...ervice/src/main/java/com/demandware/carbonj/service/engine/GraphiteSeriesDataServlet.java
@@ -9,11 +9,11 @@
 import java.io.IOException;
 import java.util.List;
 
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import com.demandware.carbonj.service.events.EventsLogger;
 import com.demandware.carbonj.service.db.TimeSeriesStore;
@@ -152,4 +152,4 @@ protected void doGet( HttpServletRequest req, HttpServletResponse res )
         }
     }
 
-}
+}
diff --git a/...ce/src/main/java/com/demandware/carbonj/service/engine/GraphiteSeriesDataTestServlet.java b/...ce/src/main/java/com/demandware/carbonj/service/engine/GraphiteSeriesDataTestServlet.java
@@ -17,11 +17,11 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -164,4 +164,4 @@ public void setUntil( long until )
             this.until = until;
         }
     }
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -2,4 +2,4 @@ version=1.1.40-SNAPSHOT
 org.gradle.jvmargs=--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
 org.gradle.daemon=true
 ccGradlePluginVersion=3.0.3
-springbootVersion=3.0.2
+springbootVersion=2.7.14