More samples need to switch to jakarta (#3663)

GoogleContainerTools · May 11, 2022 · 7c6e5fe · 7c6e5fe
1 parent 1cf9329
commit 7c6e5fe
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/...e-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build-tomcat.gradle b/...e-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build-tomcat.gradle
@@ -16,8 +16,8 @@ configurations {
 }
 
 dependencies {
-  providedCompile 'javax.servlet:servlet-api:2.5'
-  moreLibs 'javax.annotation:javax.annotation-api:1.2' // random extra JAR
+  providedCompile 'jakarta.servlet:jakarta.servlet-api:5.0.0'
+  moreLibs 'jakarta.annotation:jakarta.annotation-api:2.1.0' // random extra JAR
 }
 
 war {
@@ -27,7 +27,7 @@ war {
 }
 
 jib {
-  from.image = 'tomcat:8.5-jre8-alpine'
+  from.image = 'tomcat:10-jre8-temurin'
   to {
     image = System.getProperty("_TARGET_IMAGE")
     credHelper = 'gcr'

diff --git a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build.gradle b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build.gradle
@@ -16,8 +16,8 @@ configurations {
 }
 
 dependencies {
-  providedCompile 'javax.servlet:servlet-api:2.5'
-  moreLibs 'javax.annotation:javax.annotation-api:1.2' // random extra JAR
+  providedCompile 'jakarta.servlet:jakarta.servlet-api:5.0.0'
+  moreLibs 'jakarta.annotation:jakarta.annotation-api:2.1.0' // random extra JAR
 }
 
 war {

diff --git a/...ration-test/resources/gradle/projects/war_servlet25/src/main/java/example/HelloWorld.java b/...ration-test/resources/gradle/projects/war_servlet25/src/main/java/example/HelloWorld.java
@@ -16,16 +16,16 @@
 
 package example;
 
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public class HelloWorld extends HttpServlet {
 

diff --git a/jib-gradle-plugin/src/test/resources/gradle/projects/war_servlet25/build.gradle b/jib-gradle-plugin/src/test/resources/gradle/projects/war_servlet25/build.gradle
@@ -11,9 +11,13 @@ repositories {
   mavenCentral()
 }
 
+configurations {
+  moreLibs
+}
+
 dependencies {
-  compileOnly 'javax.servlet:servlet-api:2.5'
-  implementation 'javax.annotation:javax.annotation-api:1.2'
+  providedCompile 'jakarta.servlet:jakarta.servlet-api:5.0.0'
+  moreLibs 'jakarta.annotation:jakarta.annotation-api:2.1.0' // random extra JAR
 }
 
 jib {

diff --git a/...in/src/test/resources/gradle/projects/war_servlet25/src/main/java/example/HelloWorld.java b/...in/src/test/resources/gradle/projects/war_servlet25/src/main/java/example/HelloWorld.java
@@ -16,16 +16,16 @@
 
 package example;
 
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public class HelloWorld extends HttpServlet {