diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 9aff50a15c7..a121bbd2934 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -17,7 +17,7 @@ 3.0.0-M2 3.4.0 3.0.0 - 3.0.0-M5 + 3.0.0-M8 true true diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index e9d6b0d99d6..f94d8e4195d 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -20,7 +20,9 @@ maven-surefire-plugin - @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.annotations.resources=org.eclipse.jetty.plus + @{argLine} ${jetty.surefire.argLine} + --add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.annotations.resources=org.eclipse.jetty.plus + --add-reads org.eclipse.jetty.annotations=org.eclipse.jetty.logging diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index b3a77ebe9ad..4ee929012ea 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -23,6 +23,7 @@ @{argLine} ${jetty.surefire.argLine} --add-modules java.security.jgss --add-modules org.eclipse.jetty.jmx + --add-reads org.eclipse.jetty.client=org.eclipse.jetty.logging diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 2ba27f4efbe..0181b2cd2d4 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -21,7 +21,10 @@ maven-surefire-plugin - @{argLine} ${jetty.surefire.argLine} --add-modules org.eclipse.jetty.jmx --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http,jetty.servlet.api + @{argLine} ${jetty.surefire.argLine} + --add-modules org.eclipse.jetty.jmx + --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http,jetty.servlet.api + --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.logging diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 5f03dd0e71d..93e6209f314 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -14,6 +14,20 @@ ${project.groupId}.server + + + + maven-surefire-plugin + + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging + + + + + + org.slf4j diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 4ec013f8fa3..5dcfa278150 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -98,6 +98,15 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http=org.eclipse.jetty.logging + + + diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 742d894a2eb..4233d1866f1 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -22,6 +22,7 @@ @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.http2.hpack + --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.logging diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 618b481b291..cb78d6a60a3 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -21,7 +21,10 @@ maven-surefire-plugin - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http2.server=jetty.servlet.api --add-modules jetty.servlet.api + @{argLine} ${jetty.surefire.argLine} + --add-modules jetty.servlet.api + --add-reads org.eclipse.jetty.http2.server=jetty.servlet.api + --add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 70f76e4b3c8..cf094652de0 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -37,4 +37,17 @@ test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging + + + + + diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 37247a21dfd..70e82537271 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -15,6 +15,20 @@ org.eclipse.jetty.proxy.* + + + + maven-surefire-plugin + + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.proxy=org.eclipse.jetty.logging + + + + + + org.slf4j diff --git a/jetty-quic/quic-server/pom.xml b/jetty-quic/quic-server/pom.xml index 3c6646b8b3e..2327c4a5655 100644 --- a/jetty-quic/quic-server/pom.xml +++ b/jetty-quic/quic-server/pom.xml @@ -42,7 +42,7 @@ jdk17 - [17,) + 17 diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 69fd44ffb9a..4ff8686cc83 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -21,7 +21,9 @@ maven-surefire-plugin - @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED + @{argLine} ${jetty.surefire.argLine} + --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED + --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index b154210c46f..799ee789f06 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -24,6 +24,7 @@ @{argLine} ${jetty.surefire.argLine} --add-modules org.eclipse.jetty.util.ajax + --add-reads org.eclipse.jetty.servlet=org.eclipse.jetty.logging diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index e89f410d2c5..e52ab12c63d 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -22,7 +22,16 @@ maven-surefire-plugin - @{argLine} ${jetty.surefire.argLine} --add-modules jetty.servlet.api --add-modules org.eclipse.jetty.util --add-modules org.eclipse.jetty.io --add-modules org.eclipse.jetty.http --add-modules org.eclipse.jetty.server --add-reads org.eclipse.jetty.servlets=java.management --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.jmx + @{argLine} ${jetty.surefire.argLine} + --add-modules jetty.servlet.api + --add-modules org.eclipse.jetty.util + --add-modules org.eclipse.jetty.io + --add-modules org.eclipse.jetty.http + --add-modules org.eclipse.jetty.server + --add-modules org.eclipse.jetty.jmx + --add-reads org.eclipse.jetty.servlets=java.management + --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.jmx + --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.logging diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 1fe263a1ea5..af1faea51a5 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -65,6 +65,9 @@ ${settings.localRepository} + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.util=org.eclipse.jetty.logging + diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 796f663a024..8ccac361c10 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -25,6 +25,15 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.xml=org.eclipse.jetty.logging + + + diff --git a/pom.xml b/pom.xml index d5484d8589a..3d61b21c3c7 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ 3.0.0 3.3.0 3.4.1 - 3.0.0-M5 + 3.0.0-M8 3.2.1 3.3.2 4.7.2.0