-
Notifications
You must be signed in to change notification settings - Fork 746
SOLR-17069: Jetty12 + EE10 #2876
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
Changes from 37 commits
421c095
0b80a80
ed63623
aecec4b
1629241
52d5416
a047f5e
d98b23d
7025003
221c3f5
c813d4a
873bf7d
e4e4540
fdaf430
871b6c4
780c0a2
dbe7c4f
4df91b2
ae91ce6
457fae3
a6d3414
7b12010
7768484
9926414
a6ede81
2529158
e23e4c2
50c1b57
01fa11c
16ff926
4e15552
b532e1b
9b01a18
d477544
1f21673
00e5421
7079a57
22d1508
1f2050c
f5a364b
5da6108
a68fa33
7b75900
ad5f6df
60b6ae3
94f305b
c8cc17d
ad2f247
246cec1
83b95cf
7ba2c76
507e049
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,8 +13,8 @@ | |
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
[versions] | ||
adobe-testing-s3mock = "2.17.0" | ||
amazon-awssdk = "2.26.19" | ||
adobe-testing-s3mock = "3.9.1" | ||
amazon-awssdk = "2.28.11" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does the AWS sdk need to be updated in this MR? Is this just to align with s3mock? |
||
# @keep Antora version used in ref-guide | ||
antora = "3.1.4" | ||
# @keep Most recent commit as of 2022-06-24, this repo does not have tags | ||
|
@@ -80,8 +80,8 @@ decompose = "3.2.2" | |
diffplug-spotless = "6.5.2" | ||
dropwizard-metrics = "4.2.26" | ||
eclipse-ecj = "3.39.0" | ||
eclipse-jetty = "10.0.22" | ||
eclipse-jettytoolchain = "4.0.6" | ||
eclipse-jetty = "12.0.10" | ||
iamsanjay marked this conversation as resolved.
Show resolved
Hide resolved
|
||
eclipse-jettytoolchain = "5.0.2" | ||
# @keep jgit version used by git-status.gradle | ||
eclipse-jgit = "6.7.0.202309050840-r" | ||
essenty = "2.4.0" | ||
|
@@ -122,6 +122,7 @@ immutables-valueannotations = "2.10.1" | |
j256-simplemagic = "1.17" | ||
jakarta-annotation = "2.1.1" | ||
jakarta-inject = "2.0.1" | ||
jakarta-servlet = "6.0.0" | ||
jakarta-ws = "3.1.0" | ||
# @keep This is the minimum required Java version for the project. | ||
java-min = "21" | ||
|
@@ -134,7 +135,7 @@ jayway-jsonpath = "2.9.0" | |
jctools = "4.0.5" | ||
jersey = "3.1.9" | ||
# TODO Sync with jersey versions | ||
jersey-containers = "2.39.1" | ||
jersey-containers = "3.1.0" | ||
iamsanjay marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# @keep for version alignment | ||
jetbrains-annotations = "26.0.2" | ||
# @keep for version alignment | ||
|
@@ -300,7 +301,7 @@ bytebuddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "by | |
carrot2-core = { module = "org.carrot2:carrot2-core", version.ref = "carrot2-core" } | ||
carrotsearch-hppc = { module = "com.carrotsearch:hppc", version.ref = "carrotsearch-hppc" } | ||
carrotsearch-randomizedtesting-runner = { module = "com.carrotsearch.randomizedtesting:randomizedtesting-runner", version.ref = "carrotsearch-randomizedtesting" } | ||
# @keep transitive dependency for version alignment | ||
iamsanjay marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# @keep transitive depenxdency for version alignment | ||
checkerframework-qual = { module = "org.checkerframework:checker-qual", version.ref = "checkerframework" } | ||
codehaus-woodstox-stax2api = { module = "org.codehaus.woodstox:stax2-api", version.ref = "codehaus-woodstox" } | ||
commonscli-commonscli = { module = "commons-cli:commons-cli", version.ref = "commons-cli" } | ||
|
@@ -311,33 +312,38 @@ decompose-decompose = { module = "com.arkivanov.decompose:decompose", version.re | |
decompose-extensions-compose = { module = "com.arkivanov.decompose:extensions-compose", version.ref = "decompose" } | ||
dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core", version.ref = "dropwizard-metrics" } | ||
dropwizard-metrics-graphite = { module = "io.dropwizard.metrics:metrics-graphite", version.ref = "dropwizard-metrics" } | ||
dropwizard-metrics-jetty10 = { module = "io.dropwizard.metrics:metrics-jetty10", version.ref = "dropwizard-metrics" } | ||
dropwizard-metrics-jetty12 = { module = "io.dropwizard.metrics:metrics-jetty12", version.ref = "dropwizard-metrics" } | ||
dropwizard-metrics-jetty12-ee10 = { module = "io.dropwizard.metrics:metrics-jetty12-ee10", version.ref = "dropwizard-metrics" } | ||
dropwizard-metrics-jmx = { module = "io.dropwizard.metrics:metrics-jmx", version.ref = "dropwizard-metrics" } | ||
dropwizard-metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version.ref = "dropwizard-metrics" } | ||
dropwizard-metrics-servlets = { module = "io.dropwizard.metrics:metrics-servlets", version.ref = "dropwizard-metrics" } | ||
dropwizard-metrics-servlets = { module = "io.dropwizard.metrics:metrics-jakarta-servlets", version.ref = "dropwizard-metrics" } | ||
eclipse-jdt-ecj = { module = "org.eclipse.jdt:ecj", version.ref = "eclipse-ecj" } | ||
eclipse-jetty-alpnjavaclient = { module = "org.eclipse.jetty:jetty-alpn-java-client", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-alpnjavaserver = { module = "org.eclipse.jetty:jetty-alpn-java-server", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-alpnserver = { module = "org.eclipse.jetty:jetty-alpn-server", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-client = { module = "org.eclipse.jetty:jetty-client", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-deploy = { module = "org.eclipse.jetty:jetty-deploy", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-ee = { module = "org.eclipse.jetty:jetty-ee", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-ee10-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-ee10-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-ee10-webapp = { module = "org.eclipse.jetty.ee10:jetty-ee10-webapp", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-http = { module = "org.eclipse.jetty:jetty-http", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:http2-client", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-http2-common = { module = "org.eclipse.jetty.http2:http2-common", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-http2-hpack = { module = "org.eclipse.jetty.http2:http2-hpack", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-http2-httpclienttransport = { module = "org.eclipse.jetty.http2:http2-http-client-transport", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-http2-server = { module = "org.eclipse.jetty.http2:http2-server", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:jetty-http2-client", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-http2-common = { module = "org.eclipse.jetty.http2:jetty-http2-common", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-http2-hpack = { module = "org.eclipse.jetty.http2:jetty-http2-hpack", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-http2-httpclienttransport = { module = "org.eclipse.jetty.http2:jetty-http2-client-transport", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-http2-server = { module = "org.eclipse.jetty.http2:jetty-http2-server", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-io = { module = "org.eclipse.jetty:jetty-io", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-jmx = { module = "org.eclipse.jetty:jetty-jmx", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-jndi = { module = "org.eclipse.jetty:jetty-jndi", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-plus = { module = "org.eclipse.jetty:jetty-plus", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-rewrite = { module = "org.eclipse.jetty:jetty-rewrite", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-security = { module = "org.eclipse.jetty:jetty-security", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-session = { module = "org.eclipse.jetty:jetty-session", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-start = { module = "org.eclipse.jetty:jetty-start", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-toolchain-servletapi = { module = "org.eclipse.jetty.toolchain:jetty-servlet-api", version.ref = "eclipse-jettytoolchain" } | ||
eclipse-jetty-toolchain-servletapi = { module = "org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api", version.ref = "eclipse-jettytoolchain" } | ||
eclipse-jetty-util = { module = "org.eclipse.jetty:jetty-util", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-webapp = { module = "org.eclipse.jetty:jetty-webapp", version.ref = "eclipse-jetty" } | ||
eclipse-jetty-xml = { module = "org.eclipse.jetty:jetty-xml", version.ref = "eclipse-jetty" } | ||
eclipse-jgit-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "eclipse-jgit" } | ||
essenty-lifecycle = { module = "com.arkivanov.essenty:lifecycle", version.ref = "essenty" } | ||
|
@@ -399,6 +405,7 @@ immutables-valueannotations = { module = "org.immutables:value-annotations", ver | |
j256-simplemagic = { module = "com.j256.simplemagic:simplemagic", version.ref = "j256-simplemagic" } | ||
jakarta-annotation-api = { module = "jakarta.annotation:jakarta.annotation-api", version.ref = "jakarta-annotation" } | ||
jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version.ref = "jakarta-inject" } | ||
jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version.ref = "jakarta-servlet" } | ||
jakarta-ws-rsapi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "jakarta-ws" } | ||
javacc-javacc = { module = "net.java.dev.javacc:javacc", version.ref = "javacc" } | ||
# @keep transitive dependency for version alignment | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -146,6 +146,7 @@ grant { | |
|
||
// needed by s3mock | ||
permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.fs"; | ||
permission java.lang.RuntimePermission "accessSystemModules"; | ||
|
||
// needed for kafka mockito | ||
permission java.lang.RuntimePermission "manageProcess"; | ||
|
@@ -240,8 +241,15 @@ grant { | |
permission java.io.FilePermission "${aws.configFile}", "read,readlink"; | ||
permission java.io.FilePermission "${user.home}${/}.aws${/}-", "read,readlink"; | ||
|
||
// GCS | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Are these changes supposed to be part of Jetty 12? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @iamsanjay is this still needed? |
||
permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}properties", "read,readlink"; | ||
permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}active_config", "read,readlink"; | ||
permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}configurations${/}config_default", "read,readlink"; | ||
|
||
|
||
// expanded to a wildcard if set, allows all networking everywhere | ||
permission java.net.SocketPermission "${solr.internal.network.permission}", "accept,listen,connect,resolve"; | ||
permission java.net.SocketPermission "metadata.google.internal:80", "connect,resolve"; | ||
|
||
// Run java | ||
permission java.io.FilePermission "${java.home}${/}-", "execute"; | ||
|
Uh oh!
There was an error while loading. Please reload this page.