This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 5ef245705f FELIX-6705 Upgrade to jetty 12.0.10 (#318)
5ef245705f is described below
commit 5ef245705f1fbef46cb0a2d6e8a6befb53fc00a8
Author: Paul <[email protected]>
AuthorDate: Wed Jun 5 07:54:54 2024 +0200
FELIX-6705 Upgrade to jetty 12.0.10 (#318)
* Update jetty to 12.0.9
* Update jetty to 12.0.9
* Update tests
* Update JettyUriComplianceModeDefaultIT.java
* Use variable instead of duplicating value
* - Add new
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-ee/12.0.9 package to
test
- Export the classes in org.eclipse.jetty.ee.*,
* Update pom.xml
Move to 12.0.10
* Update AbstractJettyTestSupport.java
Move to 12.0.10
* Update pom.xml
Move to 12.0.10
---
.../org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java | 1 +
.../apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java | 2 +-
.../org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java | 2 +-
.../java/org/apache/felix/http/jetty/it/LightClassifierIT.java | 2 +-
http/jetty12/pom.xml | 8 ++++++--
.../org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java | 3 ++-
.../apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java | 3 ++-
.../org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java | 3 ++-
.../felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java | 5 +++--
.../java/org/apache/felix/http/jetty/it/LightClassifierIT.java | 3 ++-
http/samples/whiteboard/pom.xml | 2 +-
11 files changed, 22 insertions(+), 12 deletions(-)
diff --git
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
index 58b2c39e3f..27d00e0458 100644
---
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
+++
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
@@ -45,6 +45,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractJettyTestSupport {
+ protected static final String JETTY_VERSION = "11.0.20";
protected final Logger logger = LoggerFactory.getLogger(getClass());
diff --git
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
index 984ce7cfb4..3a44dffee0 100644
---
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
+++
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
@@ -67,7 +67,7 @@ public class JakartaSpecificWebsocketIT extends
AbstractJettyTestSupport {
@Override
protected Option[] additionalOptions() throws IOException {
- String jettyVersion = System.getProperty("jetty.version", "11.0.20");
+ String jettyVersion = System.getProperty("jetty.version",
JETTY_VERSION);
return new Option[] {
spifly(),
diff --git
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
index 1a3e42eca2..7dfca19917 100644
---
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
+++
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
@@ -69,7 +69,7 @@ public class JettySpecificWebsocketIT extends
AbstractJettyTestSupport {
@Override
protected Option[] additionalOptions() throws IOException {
- String jettyVersion = System.getProperty("jetty.version", "11.0.20");
+ String jettyVersion = System.getProperty("jetty.version",
JETTY_VERSION);
return new Option[] {
spifly(),
diff --git
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
index e93aee6962..fd46d14d54 100644
---
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
+++
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
@@ -51,7 +51,7 @@ public class LightClassifierIT extends
AbstractJettyTestSupport {
@Override
protected Option[] additionalOptions() throws IOException {
- String jettyVersion = System.getProperty("jetty.version", "11.0.20");
+ String jettyVersion = System.getProperty("jetty.version",
JETTY_VERSION);
return new Option[] {
spifly(),
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 50b35582dd..af06b6fcce 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -42,7 +42,7 @@
<properties>
<felix.java.version>17</felix.java.version>
- <jetty.version>12.0.8</jetty.version>
+ <jetty.version>12.0.10</jetty.version>
<baseline.skip>true</baseline.skip>
<org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
<!-- To debug the pax process, override this with -D -->
@@ -78,7 +78,8 @@
&&
!"org.eclipse.jetty.ee10.websocket".equals(artifact.getGroupId()) // skip the
optional websocket artifacts
&&
!"jetty-annotations".equals(artifact.getArtifactId()) // skip the transitive
artifacts from the optional websocket artifacts
&&
!"jetty-plus".equals(artifact.getArtifactId())
- &&
!"jetty-webapp".equals(artifact.getArtifactId())) {
+ &&
!"jetty-webapp".equals(artifact.getArtifactId())
+ &&
!"jetty-ee".equals(artifact.getArtifactId())) {
def jar;
try {
jar = new
java.util.jar.JarFile(artifact.file)
@@ -182,6 +183,7 @@
org.eclipse.jetty.session.*,
org.eclipse.jetty.server.*,
org.eclipse.jetty.util.*,
+ org.eclipse.jetty.ee.*,
!org.eclipse.jetty.ee10.websocket.*,
org.eclipse.jetty.ee10.servlet.*,
org.apache.felix.http.jetty,
@@ -370,6 +372,7 @@
org.eclipse.jetty.session.*,
org.eclipse.jetty.server.*,
org.eclipse.jetty.util.*,
+ org.eclipse.jetty.ee.*,
org.eclipse.jetty.ee10.servlet.*,
!org.eclipse.jetty.ee10.websocket.jakarta.*,
org.eclipse.jetty.ee10.websocket.*,
@@ -476,6 +479,7 @@
org.eclipse.jetty.session.*,
org.eclipse.jetty.server.*,
org.eclipse.jetty.util.*,
+ org.eclipse.jetty.ee.*,
!org.eclipse.jetty.ee10.websocket.server.*,
!org.eclipse.jetty.ee10.websocket.servlet.*,
org.eclipse.jetty.ee10.websocket.jakarta.*,
diff --git
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
index 862ee429df..01c3a1d6c8 100644
---
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
+++
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
@@ -45,6 +45,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractJettyTestSupport {
+ protected static final String JETTY_VERSION = "12.0.10";
protected final Logger logger = LoggerFactory.getLogger(getClass());
@@ -182,4 +183,4 @@ public abstract class AbstractJettyTestSupport {
mavenBundle().groupId("org.ow2.asm").artifactId("asm").version("9.7")
);
}
-}
\ No newline at end of file
+}
diff --git
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
index 20950f4e3b..1c2ec9e613 100644
---
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
+++
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
@@ -66,7 +66,7 @@ public class JakartaSpecificWebsocketIT extends
AbstractJettyTestSupport {
@Override
protected Option[] additionalOptions() throws IOException {
- String jettyVersion = System.getProperty("jetty.version", "12.0.8");
+ String jettyVersion = System.getProperty("jetty.version",
JETTY_VERSION);
return new Option[]{
spifly(),
@@ -76,6 +76,7 @@ public class JakartaSpecificWebsocketIT extends
AbstractJettyTestSupport {
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-client").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion),
+
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-ee").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-client").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-common").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-server").version(jettyVersion),
diff --git
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
index 46ae710087..63503f6e2b 100644
---
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
+++
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
@@ -68,7 +68,7 @@ public class JettySpecificWebsocketIT extends
AbstractJettyTestSupport {
@Override
protected Option[] additionalOptions() throws IOException {
- String jettyVersion = System.getProperty("jetty.version", "12.0.8");
+ String jettyVersion = System.getProperty("jetty.version",
JETTY_VERSION);
return new Option[] {
spifly(),
@@ -82,6 +82,7 @@ public class JettySpecificWebsocketIT extends
AbstractJettyTestSupport {
mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-jetty-server").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion),
+
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-ee").version(jettyVersion),
// additional bundles for the client side
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").version(jettyVersion),
diff --git
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java
index 591aa51e5b..b6595191e1 100644
---
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java
+++
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java
@@ -54,12 +54,13 @@ public class JettyUriComplianceModeDefaultIT extends
AbstractJettyTestSupport {
@Override
protected Option[] additionalOptions() throws IOException {
- String jettyVersion = System.getProperty("jetty.version", "12.0.8");
+ String jettyVersion = System.getProperty("jetty.version",
JETTY_VERSION);
return new Option[] {
spifly(),
// bundles for the server side
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion),
+
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-ee").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion),
@@ -111,4 +112,4 @@ public class JettyUriComplianceModeDefaultIT extends
AbstractJettyTestSupport {
resp.getWriter().write("OK");
}
}
-}
\ No newline at end of file
+}
diff --git
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
index 12bea36137..97a0994ba9 100644
---
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
+++
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
@@ -51,7 +51,7 @@ public class LightClassifierIT extends
AbstractJettyTestSupport {
@Override
protected Option[] additionalOptions() throws IOException {
- String jettyVersion = System.getProperty("jetty.version", "12.0.8");
+ String jettyVersion = System.getProperty("jetty.version",
JETTY_VERSION);
return new Option[] {
spifly(),
@@ -73,6 +73,7 @@ public class LightClassifierIT extends
AbstractJettyTestSupport {
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-session").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-util").version(jettyVersion),
+
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-ee").version(jettyVersion),
// additional dependencies to verify FELIX-6700
mavenBundle().groupId("org.owasp.encoder").artifactId("encoder").version("1.2.3"),
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index d17d2c432d..724564ae3f 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -39,7 +39,7 @@
</scm>
<properties>
- <jetty.version>12.0.8</jetty.version>
+ <jetty.version>12.0.10</jetty.version>
</properties>
<build>
