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.

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

fix(deps): update dependency org.eclipse.jetty:jetty-server to v11 #1375

Merged
merged 6 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.BindException;
import java.net.MalformedURLException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
import org.apache.commons.io.IOUtils;

import jakarta.inject.Singleton;
import javax.servlet.http.HttpServletRequest;

import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;
import java.time.Instant;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@

import jakarta.annotation.Nonnull;
import jakarta.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
import io.micronaut.core.annotation.NonNull;
import io.micronaut.context.annotation.DefaultImplementation;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;

/**
* Adapts from {@link HttpServletRequest} to {@link AwsProxyRequest}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
import io.micronaut.core.annotation.NonNull;
import io.micronaut.context.annotation.DefaultImplementation;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;

/**
Expand Down
1 change: 0 additions & 1 deletion function-aws-api-proxy/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dependencies {
testImplementation(mnSecurity.micronaut.security)
testImplementation(mnViews.micronaut.views.handlebars)
testImplementation(libs.jackson.afterburner)
testImplementation(libs.servlet.api)
testImplementation(libs.fileupload)
}

Expand Down
6 changes: 2 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
micronaut = "4.0.0-M1"
micronaut-docs = "2.0.0"
micronaut-test = "4.0.0-M1"
groovy = "4.0.10"
groovy = "4.0.11"
spock = "2.3-groovy-4.0"

bouncycastle = '1.70'
fileupload = '0.0.5'
jetty = '9.4.51.v20230217'
jetty = '11.0.14'
logback-json-classic = '0.1.5'

micronaut-discovery = '4.0.0-M1'
Expand All @@ -27,7 +27,6 @@ managed-aws-lambda-events = '3.11.1'
managed-aws-serverless-core = '1.9.2'
managed-aws-cdk-lib='2.72.1'
micronaut-starter = "3.8.8"
servlet-api = "2.5"
slf4j = "2.0.7"
testcontainers = "1.17.6"
javapoet = "1.13.0"
Expand Down Expand Up @@ -104,7 +103,6 @@ managed-awssdk-secretsmanager = { module = 'software.amazon.awssdk:secretsmanage
managed-aws-serverless-core = { module = 'com.amazonaws.serverless:aws-serverless-java-container-core', version.ref = 'managed-aws-serverless-core' }
managed-jcl-over-slf4j = { module = 'org.slf4j:jcl-over-slf4j', version.ref = 'slf4j' }

servlet-api = { module = 'javax.servlet:servlet-api', version.ref = 'servlet-api' }
testcontainers-bom = { module = 'org.testcontainers:testcontainers-bom', version.ref = 'testcontainers' }
testcontainers = { module = 'org.testcontainers:testcontainers' }
testcontainers-mongodb = { module = 'org.testcontainers:mongodb' }
Expand Down