Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More samples need to switch to jakarta #3663

Merged
merged 1 commit into from
May 11, 2022
Merged

More samples need to switch to jakarta #3663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...e-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build-tomcat.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions jib-gradle-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ...ration-test/resources/gradle/projects/war_servlet25/src/main/java/example/HelloWorld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
8 changes: 6 additions & 2 deletions jib-gradle-plugin/src/test/resources/gradle/projects/war_servlet25/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ...in/src/test/resources/gradle/projects/war_servlet25/src/main/java/example/HelloWorld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down