From 77d16c8e92d19c7b71e8c7c01ecc2723444d2b2b Mon Sep 17 00:00:00 2001 From: JP Leibundguth Date: Thu, 17 Dec 2020 14:08:54 -0800 Subject: [PATCH] Update Jetty to latest 9.4.* patch --- build.gradle | 2 +- dependencies.lock | 3 + governator-annotations/dependencies.lock | 62 ++ governator-api/dependencies.lock | 42 ++ governator-archaius/dependencies.lock | 326 +++++++++++ governator-commons-cli/dependencies.lock | 326 +++++++++++ governator-core/dependencies.lock | 178 ++++++ governator-jersey/build.gradle | 2 +- governator-jersey/dependencies.lock | 354 ++++++++++++ governator-jetty/build.gradle | 4 +- governator-jetty/dependencies.lock | 306 ++++++++++ .../governator/guice/jetty/JettyModule.java | 4 +- governator-legacy/dependencies.lock | 296 ++++++++++ governator-providers/dependencies.lock | 58 ++ governator-servlet/dependencies.lock | 254 +++++++++ governator-test-junit/dependencies.lock | 494 ++++++++++++++++ governator-test-spock/build.gradle | 4 +- governator-test-spock/dependencies.lock | 534 ++++++++++++++++++ governator-test/build.gradle | 3 +- governator-test/dependencies.lock | 410 ++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- 21 files changed, 3655 insertions(+), 9 deletions(-) create mode 100644 dependencies.lock create mode 100644 governator-annotations/dependencies.lock create mode 100644 governator-api/dependencies.lock create mode 100644 governator-archaius/dependencies.lock create mode 100644 governator-commons-cli/dependencies.lock create mode 100644 governator-core/dependencies.lock create mode 100644 governator-jersey/dependencies.lock create mode 100644 governator-jetty/dependencies.lock create mode 100644 governator-legacy/dependencies.lock create mode 100644 governator-providers/dependencies.lock create mode 100644 governator-servlet/dependencies.lock create mode 100644 governator-test-junit/dependencies.lock create mode 100644 governator-test-spock/dependencies.lock create mode 100644 governator-test/dependencies.lock diff --git a/build.gradle b/build.gradle index 3bbb57a3..fc4295bc 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ */ plugins { - id 'nebula.netflixoss' version '8.0.0' + id 'nebula.netflixoss' version '8.8.0' } subprojects { diff --git a/dependencies.lock b/dependencies.lock new file mode 100644 index 00000000..544b7b4d --- /dev/null +++ b/dependencies.lock @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file diff --git a/governator-annotations/dependencies.lock b/governator-annotations/dependencies.lock new file mode 100644 index 00000000..27cc73a9 --- /dev/null +++ b/governator-annotations/dependencies.lock @@ -0,0 +1,62 @@ +{ + "compileClasspath": { + "com.netflix.governator:governator-api": { + "project": true + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api" + ], + "locked": "1" + } + }, + "runtimeClasspath": { + "com.netflix.governator:governator-api": { + "project": true + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api" + ], + "locked": "1" + } + }, + "testCompileClasspath": { + "com.netflix.governator:governator-api": { + "project": true + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + }, + "testRuntimeClasspath": { + "com.netflix.governator:governator-api": { + "project": true + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + } +} \ No newline at end of file diff --git a/governator-api/dependencies.lock b/governator-api/dependencies.lock new file mode 100644 index 00000000..afaeee51 --- /dev/null +++ b/governator-api/dependencies.lock @@ -0,0 +1,42 @@ +{ + "compileClasspath": { + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + } + }, + "runtimeClasspath": { + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + } + }, + "testCompileClasspath": { + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + }, + "testRuntimeClasspath": { + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + } +} \ No newline at end of file diff --git a/governator-archaius/dependencies.lock b/governator-archaius/dependencies.lock new file mode 100644 index 00000000..bc9f181c --- /dev/null +++ b/governator-archaius/dependencies.lock @@ -0,0 +1,326 @@ +{ + "compileClasspath": { + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.4.3" + }, + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.archaius:archaius-core": { + "locked": "0.5.12", + "requested": "0.5.12" + }, + "com.netflix.governator:governator": { + "project": true + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator", + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "project": true + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.3.1" + }, + "org.ow2.asm:asm": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "7.2" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + } + }, + "runtimeClasspath": { + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.4.3" + }, + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.archaius:archaius-core": { + "locked": "0.5.12", + "requested": "0.5.12" + }, + "com.netflix.governator:governator": { + "project": true + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator", + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "project": true + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.3.1" + }, + "org.ow2.asm:asm": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "7.2" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + } + }, + "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.4.3" + }, + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.archaius:archaius-core": { + "locked": "0.5.12", + "requested": "0.5.12" + }, + "com.netflix.governator:governator": { + "project": true + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator", + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "project": true + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.3.1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.ow2.asm:asm": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "7.2" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + }, + "testRuntimeClasspath": { + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.4.3" + }, + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.archaius:archaius-core": { + "locked": "0.5.12", + "requested": "0.5.12" + }, + "com.netflix.governator:governator": { + "project": true + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator", + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "project": true + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.3.1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.ow2.asm:asm": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "7.2" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + } +} \ No newline at end of file diff --git a/governator-commons-cli/dependencies.lock b/governator-commons-cli/dependencies.lock new file mode 100644 index 00000000..2a84c5b4 --- /dev/null +++ b/governator-commons-cli/dependencies.lock @@ -0,0 +1,326 @@ +{ + "compileClasspath": { + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.4.3" + }, + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.governator:governator": { + "project": true + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator", + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "project": true + }, + "commons-cli:commons-cli": { + "locked": "1.2", + "requested": "1.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.3.1" + }, + "org.ow2.asm:asm": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "7.2" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + } + }, + "runtimeClasspath": { + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.4.3" + }, + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.governator:governator": { + "project": true + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator", + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "project": true + }, + "commons-cli:commons-cli": { + "locked": "1.2", + "requested": "1.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.3.1" + }, + "org.ow2.asm:asm": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "7.2" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + } + }, + "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.4.3" + }, + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.governator:governator": { + "project": true + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator", + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "project": true + }, + "commons-cli:commons-cli": { + "locked": "1.2", + "requested": "1.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.3.1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.ow2.asm:asm": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "7.2" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + }, + "testRuntimeClasspath": { + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.4.3" + }, + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.governator:governator": { + "project": true + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator", + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "project": true + }, + "commons-cli:commons-cli": { + "locked": "1.2", + "requested": "1.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "2.3.1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.ow2.asm:asm": { + "firstLevelTransitive": [ + "com.netflix.governator:governator" + ], + "locked": "7.2" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + } +} \ No newline at end of file diff --git a/governator-core/dependencies.lock b/governator-core/dependencies.lock new file mode 100644 index 00000000..f893a70d --- /dev/null +++ b/governator-core/dependencies.lock @@ -0,0 +1,178 @@ +{ + "compileClasspath": { + "com.google.inject.extensions:guice-grapher": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.netflix.governator:governator-api": { + "project": true + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "1.3.5", + "requested": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api" + ], + "locked": "1", + "requested": "1" + }, + "org.slf4j:slf4j-api": { + "locked": "1.7.2", + "requested": "1.7.2" + } + }, + "runtimeClasspath": { + "com.google.inject.extensions:guice-grapher": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.netflix.governator:governator-api": { + "project": true + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "1.3.5", + "requested": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api" + ], + "locked": "1", + "requested": "1" + }, + "org.slf4j:slf4j-api": { + "locked": "1.7.2", + "requested": "1.7.2" + } + }, + "testCompileClasspath": { + "com.google.code.findbugs:jsr305": { + "locked": "3.0.0", + "requested": "3.0.0" + }, + "com.google.inject.extensions:guice-grapher": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.netflix.governator:governator-api": { + "project": true + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "1.3.5", + "requested": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api" + ], + "locked": "1", + "requested": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.hamcrest:hamcrest-core": { + "locked": "1.3", + "requested": "1.3" + }, + "org.hamcrest:hamcrest-library": { + "locked": "1.3", + "requested": "1.3" + }, + "org.mockito:mockito-all": { + "locked": "1.9.5", + "requested": "1.9.5" + }, + "org.slf4j:slf4j-api": { + "locked": "1.7.2", + "requested": "1.7.2" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + }, + "testRuntimeClasspath": { + "com.google.code.findbugs:jsr305": { + "locked": "3.0.0", + "requested": "3.0.0" + }, + "com.google.inject.extensions:guice-grapher": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.netflix.governator:governator-api": { + "project": true + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "1.3.5", + "requested": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api" + ], + "locked": "1", + "requested": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.hamcrest:hamcrest-core": { + "locked": "1.3", + "requested": "1.3" + }, + "org.hamcrest:hamcrest-library": { + "locked": "1.3", + "requested": "1.3" + }, + "org.mockito:mockito-all": { + "locked": "1.9.5", + "requested": "1.9.5" + }, + "org.slf4j:slf4j-api": { + "locked": "1.7.2", + "requested": "1.7.2" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + } +} \ No newline at end of file diff --git a/governator-jersey/build.gradle b/governator-jersey/build.gradle index dc4ef246..d8853e46 100644 --- a/governator-jersey/build.gradle +++ b/governator-jersey/build.gradle @@ -15,6 +15,6 @@ dependencies { compileOnly 'javax.servlet:javax.servlet-api:3.0.1' - testCompile'org.eclipse.jetty:jetty-servlet:9.2.29.v20191105' + testCompile'org.eclipse.jetty:jetty-servlet:9.4.33.v20201020' testCompile project(':governator-jetty') } diff --git a/governator-jersey/dependencies.lock b/governator-jersey/dependencies.lock new file mode 100644 index 00000000..1f2b0ead --- /dev/null +++ b/governator-jersey/dependencies.lock @@ -0,0 +1,354 @@ +{ + "compileClasspath": { + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-servlet": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core", + "com.netflix.governator:governator-providers" + ], + "locked": "4.1.0" + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "project": true + }, + "com.netflix.governator:governator-providers": { + "project": true + }, + "com.sun.jersey.contribs:jersey-guice": { + "locked": "1.19", + "requested": "1.19" + }, + "com.sun.jersey:jersey-server": { + "locked": "1.19", + "requested": "1.19" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core", + "com.netflix.governator:governator-providers" + ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { + "locked": "3.0.1", + "requested": "3.0.1" + }, + "javax.xml.bind:jaxb-api": { + "locked": "2.3.1", + "requested": "2.3.1" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + } + }, + "runtimeClasspath": { + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-servlet": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core", + "com.netflix.governator:governator-providers" + ], + "locked": "4.1.0" + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "project": true + }, + "com.netflix.governator:governator-providers": { + "project": true + }, + "com.sun.jersey.contribs:jersey-guice": { + "locked": "1.19", + "requested": "1.19" + }, + "com.sun.jersey:jersey-server": { + "locked": "1.19", + "requested": "1.19" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core", + "com.netflix.governator:governator-providers" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "locked": "2.3.1", + "requested": "2.3.1" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + } + }, + "testCompileClasspath": { + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-servlet": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core", + "com.netflix.governator:governator-providers" + ], + "locked": "4.1.0" + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "project": true + }, + "com.netflix.governator:governator-jetty": { + "project": true + }, + "com.netflix.governator:governator-providers": { + "project": true + }, + "com.sun.jersey.contribs:jersey-guice": { + "locked": "1.19", + "requested": "1.19" + }, + "com.sun.jersey:jersey-server": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "locked": "1.19", + "requested": "1.19" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core", + "com.netflix.governator:governator-providers" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "locked": "2.3.1", + "requested": "2.3.1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.eclipse.jetty:jetty-servlet": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "locked": "9.4.33.v20201020", + "requested": "9.4.33.v20201020" + }, + "org.eclipse.jetty:jetty-webapp": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "locked": "9.4.33.v20201020" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + }, + "testRuntimeClasspath": { + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-servlet": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core", + "com.netflix.governator:governator-providers" + ], + "locked": "4.1.0" + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "project": true + }, + "com.netflix.governator:governator-jetty": { + "project": true + }, + "com.netflix.governator:governator-providers": { + "project": true + }, + "com.sun.jersey.contribs:jersey-guice": { + "locked": "1.19", + "requested": "1.19" + }, + "com.sun.jersey:jersey-server": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "locked": "1.19", + "requested": "1.19" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core", + "com.netflix.governator:governator-providers" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "locked": "2.3.1", + "requested": "2.3.1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.eclipse.jetty:jetty-servlet": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "locked": "9.4.33.v20201020", + "requested": "9.4.33.v20201020" + }, + "org.eclipse.jetty:jetty-webapp": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-jetty" + ], + "locked": "9.4.33.v20201020" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + } +} \ No newline at end of file diff --git a/governator-jetty/build.gradle b/governator-jetty/build.gradle index 944bb571..4580e854 100644 --- a/governator-jetty/build.gradle +++ b/governator-jetty/build.gradle @@ -7,8 +7,8 @@ dependencies { compile "javax.xml.bind:jaxb-api:${jaxb_version}" compile 'com.sun.jersey:jersey-server:1.19' - compile 'org.eclipse.jetty:jetty-servlet:9.2.29.v20191105' - compile 'org.eclipse.jetty:jetty-webapp:9.2.29.v20191105' + compile 'org.eclipse.jetty:jetty-servlet:9.4.33.v20201020' + compile 'org.eclipse.jetty:jetty-webapp:9.4.33.v20201020' compileOnly "com.netflix.archaius:archaius2-api:${archaius2_version}" compileOnly "com.netflix.archaius:archaius2-core:${archaius2_version}" diff --git a/governator-jetty/dependencies.lock b/governator-jetty/dependencies.lock new file mode 100644 index 00000000..80a1b8d7 --- /dev/null +++ b/governator-jetty/dependencies.lock @@ -0,0 +1,306 @@ +{ + "compileClasspath": { + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-servlet": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.archaius:archaius2-api": { + "locked": "2.1.10", + "requested": "2.1.10" + }, + "com.netflix.archaius:archaius2-core": { + "locked": "2.1.10", + "requested": "2.1.10" + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "project": true + }, + "com.sun.jersey:jersey-server": { + "locked": "1.19", + "requested": "1.19" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "locked": "2.3.1", + "requested": "2.3.1" + }, + "org.eclipse.jetty:jetty-servlet": { + "locked": "9.4.33.v20201020", + "requested": "9.4.33.v20201020" + }, + "org.eclipse.jetty:jetty-webapp": { + "locked": "9.4.33.v20201020", + "requested": "9.4.33.v20201020" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + } + }, + "runtimeClasspath": { + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-servlet": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "project": true + }, + "com.sun.jersey:jersey-server": { + "locked": "1.19", + "requested": "1.19" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "locked": "2.3.1", + "requested": "2.3.1" + }, + "org.eclipse.jetty:jetty-servlet": { + "locked": "9.4.33.v20201020", + "requested": "9.4.33.v20201020" + }, + "org.eclipse.jetty:jetty-webapp": { + "locked": "9.4.33.v20201020", + "requested": "9.4.33.v20201020" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + } + }, + "testCompileClasspath": { + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-servlet": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "project": true + }, + "com.sun.jersey.contribs:jersey-guice": { + "locked": "1.19", + "requested": "1.19" + }, + "com.sun.jersey:jersey-server": { + "locked": "1.19", + "requested": "1.19" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "locked": "2.3.1", + "requested": "2.3.1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.eclipse.jetty:jetty-servlet": { + "locked": "9.4.33.v20201020", + "requested": "9.4.33.v20201020" + }, + "org.eclipse.jetty:jetty-webapp": { + "locked": "9.4.33.v20201020", + "requested": "9.4.33.v20201020" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + }, + "testRuntimeClasspath": { + "com.google.inject.extensions:guice-grapher": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.google.inject.extensions:guice-servlet": { + "locked": "4.1.0", + "requested": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "4.1.0" + }, + "com.netflix.governator:governator-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "project": true + }, + "com.netflix.governator:governator-core": { + "project": true + }, + "com.sun.jersey.contribs:jersey-guice": { + "locked": "1.19", + "requested": "1.19" + }, + "com.sun.jersey:jersey-server": { + "locked": "1.19", + "requested": "1.19" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.3.5" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-api", + "com.netflix.governator:governator-core" + ], + "locked": "1" + }, + "javax.xml.bind:jaxb-api": { + "locked": "2.3.1", + "requested": "2.3.1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.eclipse.jetty:jetty-servlet": { + "locked": "9.4.33.v20201020", + "requested": "9.4.33.v20201020" + }, + "org.eclipse.jetty:jetty-webapp": { + "locked": "9.4.33.v20201020", + "requested": "9.4.33.v20201020" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.governator:governator-core" + ], + "locked": "1.7.2" + }, + "org.slf4j:slf4j-log4j12": { + "locked": "1.7.2", + "requested": "1.7.2" + } + } +} \ No newline at end of file diff --git a/governator-jetty/src/main/java/com/netflix/governator/guice/jetty/JettyModule.java b/governator-jetty/src/main/java/com/netflix/governator/guice/jetty/JettyModule.java index 4409586f..049d2d1f 100644 --- a/governator-jetty/src/main/java/com/netflix/governator/guice/jetty/JettyModule.java +++ b/governator-jetty/src/main/java/com/netflix/governator/guice/jetty/JettyModule.java @@ -32,7 +32,7 @@ import javax.inject.Named; import javax.inject.Singleton; import javax.servlet.DispatcherType; -import java.net.MalformedURLException; +import java.io.IOException; import java.util.EnumSet; import java.util.Set; @@ -206,7 +206,7 @@ private Server getServer(OptionalJettyConfig optionalConfig, Set