diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 3c216581d60b..609422170bd2 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 cdbf126af3b4..bcdc430dda73 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 db0b7f699040..8edfa61fe657 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 9c5b2f8c5dc6..52d1c205d397 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 351562bf7d0e..86acfb048dc9 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 370df19f0643..4953bd409e29 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 88e31557bf25..92efbfe3428c 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 01d84b86c074..a71f8599a965 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 66ff7a677312..e3d0306c6122 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 f706d20c1d8e..d615390905de 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 b237b7e3c23d..ce405fccf6ac 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 9d80fa4c4fb7..add53486c081 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 ad640c25d17e..3f9aecf9730d 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 5c032ab49353..9e2089d18ac2 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 6fb1b10f4fda..24f13b2bbb42 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 f804760974f0..808453336628 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 783c02b413bf..aa41d545e055 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