Skip to content

Bump org.eclipse.jetty:jetty-server from 9.4.26.v20200117 to 11.0.14 #3180

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

Merged
dondonz merged 3 commits into from
Apr 14, 2023
Merged

Bump org.eclipse.jetty:jetty-server from 9.4.26.v20200117 to 11.0.14 #3180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9647a5f
Bump org.eclipse.jetty:jetty-server from 9.4.26.v20200117 to 11.0.14
dependabot[bot] Apr 11, 2023
f8ca3ee
Fix servlet from javax to jakarta coordinates
dondonz Apr 14, 2023
9ae476f
Upgrade SLF4J
dondonz Apr 14, 2023
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
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def getDevelopmentVersion() {
}

def reactiveStreamsVersion = '1.0.3'
def slf4jVersion = '1.7.35'
def slf4jVersion = '2.0.7'
def releaseVersion = System.env.RELEASE_VERSION
def antlrVersion = '4.11.1' // https://mvnrepository.com/artifact/org.antlr/antlr4-runtime
version = releaseVersion ? releaseVersion : getDevelopmentVersion()
Expand Down Expand Up @@ -95,7 +95,7 @@ dependencies {
testImplementation 'org.codehaus.groovy:groovy:3.0.17'
testImplementation 'org.codehaus.groovy:groovy-json:3.0.17'
testImplementation 'com.google.code.gson:gson:2.10.1'
testImplementation 'org.eclipse.jetty:jetty-server:9.4.26.v20200117'
testImplementation 'org.eclipse.jetty:jetty-server:11.0.14'
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
testImplementation 'org.slf4j:slf4j-simple:' + slf4jVersion
testImplementation 'org.awaitility:awaitility-groovy:4.2.0'
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/example/http/ExecutionResultJSONTesting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import graphql.validation.ValidationError;
import graphql.validation.ValidationErrorType;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
Expand Down
6 changes: 3 additions & 3 deletions src/test/groovy/example/http/HttpMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.ResourceHandler;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/example/http/JsonKit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import jakarta.servlet.http.HttpServletResponse;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/example/http/QueryParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package example.http;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.io.BufferedReader;
import java.io.IOException;
import java.util.Collections;
Expand Down