Skip to content

Commit 7279b80

Browse files
iamsanjayiamsanjay
authored
SOLR-17069: Jetty12 + EE10 (#2876)
1 parent 2b1fbc1 commit 7279b80

File tree

344 files changed

+4086
-1040
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

344 files changed

+4086
-1040
lines changed

‎gradle/libs.versions.toml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
[versions]
16-
adobe-testing-s3mock = "2.17.0"
17-
amazon-awssdk = "2.26.19"
16+
adobe-testing-s3mock = "3.9.1"
17+
amazon-awssdk = "2.28.11"
1818
# @keep Antora version used in ref-guide
1919
antora = "3.1.4"
2020
# @keep Most recent commit as of 2022-06-24, this repo does not have tags
@@ -80,8 +80,8 @@ decompose = "3.2.2"
8080
diffplug-spotless = "6.5.2"
8181
dropwizard-metrics = "4.2.26"
8282
eclipse-ecj = "3.39.0"
83-
eclipse-jetty = "10.0.22"
84-
eclipse-jettytoolchain = "4.0.6"
83+
eclipse-jetty = "12.0.19"
84+
eclipse-jettytoolchain = "5.0.2"
8585
# @keep jgit version used by git-status.gradle
8686
eclipse-jgit = "6.7.0.202309050840-r"
8787
essenty = "2.4.0"
@@ -122,6 +122,7 @@ immutables-valueannotations = "2.10.1"
122122
j256-simplemagic = "1.17"
123123
jakarta-annotation = "2.1.1"
124124
jakarta-inject = "2.0.1"
125+
jakarta-servlet = "6.0.0"
125126
jakarta-ws = "3.1.0"
126127
# @keep This is the minimum required Java version for the project.
127128
java-min = "21"
@@ -311,33 +312,38 @@ decompose-decompose = { module = "com.arkivanov.decompose:decompose", version.re
311312
decompose-extensions-compose = { module = "com.arkivanov.decompose:extensions-compose", version.ref = "decompose" }
312313
dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core", version.ref = "dropwizard-metrics" }
313314
dropwizard-metrics-graphite = { module = "io.dropwizard.metrics:metrics-graphite", version.ref = "dropwizard-metrics" }
314-
dropwizard-metrics-jetty10 = { module = "io.dropwizard.metrics:metrics-jetty10", version.ref = "dropwizard-metrics" }
315+
dropwizard-metrics-jetty12 = { module = "io.dropwizard.metrics:metrics-jetty12", version.ref = "dropwizard-metrics" }
316+
dropwizard-metrics-jetty12-ee10 = { module = "io.dropwizard.metrics:metrics-jetty12-ee10", version.ref = "dropwizard-metrics" }
315317
dropwizard-metrics-jmx = { module = "io.dropwizard.metrics:metrics-jmx", version.ref = "dropwizard-metrics" }
316318
dropwizard-metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version.ref = "dropwizard-metrics" }
317-
dropwizard-metrics-servlets = { module = "io.dropwizard.metrics:metrics-servlets", version.ref = "dropwizard-metrics" }
319+
dropwizard-metrics-servlets = { module = "io.dropwizard.metrics:metrics-jakarta-servlets", version.ref = "dropwizard-metrics" }
318320
eclipse-jdt-ecj = { module = "org.eclipse.jdt:ecj", version.ref = "eclipse-ecj" }
319321
eclipse-jetty-alpnjavaclient = { module = "org.eclipse.jetty:jetty-alpn-java-client", version.ref = "eclipse-jetty" }
320322
eclipse-jetty-alpnjavaserver = { module = "org.eclipse.jetty:jetty-alpn-java-server", version.ref = "eclipse-jetty" }
321323
eclipse-jetty-alpnserver = { module = "org.eclipse.jetty:jetty-alpn-server", version.ref = "eclipse-jetty" }
322324
eclipse-jetty-client = { module = "org.eclipse.jetty:jetty-client", version.ref = "eclipse-jetty" }
323325
eclipse-jetty-deploy = { module = "org.eclipse.jetty:jetty-deploy", version.ref = "eclipse-jetty" }
326+
eclipse-jetty-ee = { module = "org.eclipse.jetty:jetty-ee", version.ref = "eclipse-jetty" }
327+
eclipse-jetty-ee10-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "eclipse-jetty" }
328+
eclipse-jetty-ee10-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets", version.ref = "eclipse-jetty" }
329+
eclipse-jetty-ee10-webapp = { module = "org.eclipse.jetty.ee10:jetty-ee10-webapp", version.ref = "eclipse-jetty" }
324330
eclipse-jetty-http = { module = "org.eclipse.jetty:jetty-http", version.ref = "eclipse-jetty" }
325-
eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:http2-client", version.ref = "eclipse-jetty" }
326-
eclipse-jetty-http2-common = { module = "org.eclipse.jetty.http2:http2-common", version.ref = "eclipse-jetty" }
327-
eclipse-jetty-http2-hpack = { module = "org.eclipse.jetty.http2:http2-hpack", version.ref = "eclipse-jetty" }
328-
eclipse-jetty-http2-httpclienttransport = { module = "org.eclipse.jetty.http2:http2-http-client-transport", version.ref = "eclipse-jetty" }
329-
eclipse-jetty-http2-server = { module = "org.eclipse.jetty.http2:http2-server", version.ref = "eclipse-jetty" }
331+
eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:jetty-http2-client", version.ref = "eclipse-jetty" }
332+
eclipse-jetty-http2-common = { module = "org.eclipse.jetty.http2:jetty-http2-common", version.ref = "eclipse-jetty" }
333+
eclipse-jetty-http2-hpack = { module = "org.eclipse.jetty.http2:jetty-http2-hpack", version.ref = "eclipse-jetty" }
334+
eclipse-jetty-http2-httpclienttransport = { module = "org.eclipse.jetty.http2:jetty-http2-client-transport", version.ref = "eclipse-jetty" }
335+
eclipse-jetty-http2-server = { module = "org.eclipse.jetty.http2:jetty-http2-server", version.ref = "eclipse-jetty" }
330336
eclipse-jetty-io = { module = "org.eclipse.jetty:jetty-io", version.ref = "eclipse-jetty" }
331337
eclipse-jetty-jmx = { module = "org.eclipse.jetty:jetty-jmx", version.ref = "eclipse-jetty" }
338+
eclipse-jetty-jndi = { module = "org.eclipse.jetty:jetty-jndi", version.ref = "eclipse-jetty" }
339+
eclipse-jetty-plus = { module = "org.eclipse.jetty:jetty-plus", version.ref = "eclipse-jetty" }
332340
eclipse-jetty-rewrite = { module = "org.eclipse.jetty:jetty-rewrite", version.ref = "eclipse-jetty" }
333341
eclipse-jetty-security = { module = "org.eclipse.jetty:jetty-security", version.ref = "eclipse-jetty" }
334342
eclipse-jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "eclipse-jetty" }
335-
eclipse-jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "eclipse-jetty" }
336-
eclipse-jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets", version.ref = "eclipse-jetty" }
343+
eclipse-jetty-session = { module = "org.eclipse.jetty:jetty-session", version.ref = "eclipse-jetty" }
337344
eclipse-jetty-start = { module = "org.eclipse.jetty:jetty-start", version.ref = "eclipse-jetty" }
338-
eclipse-jetty-toolchain-servletapi = { module = "org.eclipse.jetty.toolchain:jetty-servlet-api", version.ref = "eclipse-jettytoolchain" }
345+
eclipse-jetty-toolchain-servletapi = { module = "org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api", version.ref = "eclipse-jettytoolchain" }
339346
eclipse-jetty-util = { module = "org.eclipse.jetty:jetty-util", version.ref = "eclipse-jetty" }
340-
eclipse-jetty-webapp = { module = "org.eclipse.jetty:jetty-webapp", version.ref = "eclipse-jetty" }
341347
eclipse-jetty-xml = { module = "org.eclipse.jetty:jetty-xml", version.ref = "eclipse-jetty" }
342348
eclipse-jgit-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "eclipse-jgit" }
343349
essenty-lifecycle = { module = "com.arkivanov.essenty:lifecycle", version.ref = "essenty" }
@@ -399,6 +405,7 @@ immutables-valueannotations = { module = "org.immutables:value-annotations", ver
399405
j256-simplemagic = { module = "com.j256.simplemagic:simplemagic", version.ref = "j256-simplemagic" }
400406
jakarta-annotation-api = { module = "jakarta.annotation:jakarta.annotation-api", version.ref = "jakarta-annotation" }
401407
jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version.ref = "jakarta-inject" }
408+
jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version.ref = "jakarta-servlet" }
402409
jakarta-ws-rsapi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "jakarta-ws" }
403410
javacc-javacc = { module = "net.java.dev.javacc:javacc", version.ref = "javacc" }
404411
# @keep transitive dependency for version alignment

‎gradle/testing/randomization/policies/solr-tests.policy

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ grant {
146146

147147
// needed by s3mock
148148
permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.fs";
149+
permission java.lang.RuntimePermission "accessSystemModules";
149150

150151
// needed for kafka mockito
151152
permission java.lang.RuntimePermission "manageProcess";
@@ -240,8 +241,15 @@ grant {
240241
permission java.io.FilePermission "${aws.configFile}", "read,readlink";
241242
permission java.io.FilePermission "${user.home}${/}.aws${/}-", "read,readlink";
242243

244+
// GCS
245+
permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}properties", "read,readlink";
246+
permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}active_config", "read,readlink";
247+
permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}configurations${/}config_default", "read,readlink";
248+
249+
243250
// expanded to a wildcard if set, allows all networking everywhere
244251
permission java.net.SocketPermission "${solr.internal.network.permission}", "accept,listen,connect,resolve";
252+
permission java.net.SocketPermission "metadata.google.internal:80", "connect,resolve";
245253

246254
// Run java
247255
permission java.io.FilePermission "${java.home}${/}-", "execute";

‎solr/CHANGES.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ Deprecation Removals
130130

131131
Dependency Upgrades
132132
---------------------
133-
(No changes)
133+
134+
* SOLR-16984: Upgraded Jetty to 12 (Jakarta EE 10 namespace). Updated related dependencies including amazon-awssdk to 2.28.11. (Sanjay Dutt, David Smiley, Kevin Risden)
134135

135136
Other Changes
136137
---------------------

‎solr/api/gradle.lockfile

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ commons-io:commons-io:2.15.1=jarValidation,testCompileClasspath,testRuntimeClass
5151
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath
5252
io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath
5353
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath
54-
io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,testRuntimeClasspath
54+
io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath
55+
io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath
5556
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,testRuntimeClasspath
5657
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,testRuntimeClasspath
5758
io.github.classgraph:classgraph:4.8.165=swaggerBuild,swaggerDeps
@@ -86,6 +87,7 @@ io.swagger.core.v3:swagger-models:2.2.22=swaggerDeps
8687
jakarta.activation:jakarta.activation-api:1.2.2=swaggerDeps
8788
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath
8889
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath
90+
jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
8991
jakarta.validation:jakarta.validation-api:2.0.2=swaggerDeps
9092
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,swaggerBuild,testRuntimeClasspath
9193
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
@@ -136,24 +138,25 @@ org.apache.zookeeper:zookeeper:3.9.2=jarValidation,testCompileClasspath,testRunt
136138
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
137139
org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
138140
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath
139-
org.eclipse.jetty.http2:http2-client:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
140-
org.eclipse.jetty.http2:http2-common:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
141-
org.eclipse.jetty.http2:http2-hpack:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
142-
org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,testRuntimeClasspath
143-
org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
144-
org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,testCompileClasspath,testRuntimeClasspath
145-
org.eclipse.jetty:jetty-alpn-client:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
146-
org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,testRuntimeClasspath
147-
org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
148-
org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
149-
org.eclipse.jetty:jetty-client:10.0.22=jarValidation,testRuntimeClasspath
150-
org.eclipse.jetty:jetty-http:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
151-
org.eclipse.jetty:jetty-io:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
152-
org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
153-
org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
154-
org.eclipse.jetty:jetty-server:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
155-
org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
156-
org.eclipse.jetty:jetty-util:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
141+
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
142+
org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,testRuntimeClasspath
143+
org.eclipse.jetty.http2:jetty-http2-client:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
144+
org.eclipse.jetty.http2:jetty-http2-common:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
145+
org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
146+
org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
147+
org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,testRuntimeClasspath
148+
org.eclipse.jetty:jetty-alpn-client:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
149+
org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,testRuntimeClasspath
150+
org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
151+
org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
152+
org.eclipse.jetty:jetty-client:12.0.19=jarValidation,testRuntimeClasspath
153+
org.eclipse.jetty:jetty-http:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
154+
org.eclipse.jetty:jetty-io:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
155+
org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
156+
org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
157+
org.eclipse.jetty:jetty-server:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
158+
org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
159+
org.eclipse.jetty:jetty-util:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
157160
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,testRuntimeClasspath
158161
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspath
159162
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspath

0 commit comments

Comments
 (0)