Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Dependencies [12.0.x] - March 2024 (#11591) 

* Bump jetty-setuid-jna
* Updating dependencies
* Updating dependencies in jetty-ee10-annotations
* Updating dependencies in jetty-ee10-plus
* Fix jetty-ee8-osgi-boot deps
* Fix jetty-ee9-osgi-boot deps
* Address osgi duplicate resource plugin
This commit is contained in:
Joakim Erdfelt 2024-03-29 12:23:22 -05:00 committed by GitHub
parent 1b05d49fd8
commit 58293ad1f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 980 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build/scripts/dependency-update.sh Executable file
View File

@ -0,0 +1,24 @@
#!/usr/bin/env bash
echo "# This script is meant to be run from the root of the project"
echo "[jetty.project-12.0.x]$ build/scripts/dependency-update.sh"
PWD=$(pwd)
mvn -N -B -Pupdate-dependencies validate -Dmaven.build.cache.enabled=false
pushd jetty-core
mvn -N -B -Pupdate-dependencies-core validate -Dmaven.build.cache.enabled=false
popd
pushd jetty-ee10
mvn -N -B -Pupdate-dependencies-ee10 validate -Dmaven.build.cache.enabled=false
popd
pushd jetty-ee9
mvn -N -B -Pupdate-dependencies-ee9 validate -Dmaven.build.cache.enabled=false
popd
pushd jetty-ee8
mvn -N -B -Pupdate-dependencies-ee8 validate -Dmaven.build.cache.enabled=false
popd

1
javadoc/pom.xml
View File

@ -34,7 +34,6 @@
</dependencyManagement>
<dependencies>
<!-- Necessary dependencies -->
<dependency>
<groupId>jakarta.mail</groupId>

61
jetty-core/pom.xml
View File

@ -123,6 +123,67 @@
</plugins>
</build>
</profile>
<profile>
<!--
$ mvn -Pupdate-dependencies-core validate
-->
<id>update-dependencies-core</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<executions>
<execution>
<id>core-update</id>
<goals>
<goal>update-properties</goal>
</goals>
<phase>validate</phase>
<configuration>
<onlyProjectDependencies>true</onlyProjectDependencies>
<onlyUpgradable>true</onlyUpgradable>
<ruleSet>
<rules>
<rule>
<!-- ignore maven alpha/beta releases -->
<groupId>org.apache.maven</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+-(alpha|beta).?[0-9]+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore jetty core level version changes -->
<groupId>org.eclipse.jetty</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore jetty nested level version changes -->
<groupId>org.eclipse.jetty.*</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

10
jetty-ee10/jetty-ee10-annotations/pom.xml
View File

@ -44,6 +44,16 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>

27
jetty-ee10/jetty-ee10-plus/pom.xml
View File

@ -17,6 +17,18 @@
</properties>
<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.lang-model</artifactId>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
@ -37,21 +49,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.lang-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId>

312
jetty-ee10/pom.xml
View File

@ -39,15 +39,15 @@
</modules>
<properties>
<jakarta.activation.api.version>2.1.2</jakarta.activation.api.version>
<jakarta.activation.api.version>2.1.3</jakarta.activation.api.version>
<jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>
<jakarta.authentication.api.version>3.0.0</jakarta.authentication.api.version>
<jakarta.el.api.version>5.0.1</jakarta.el.api.version>
<jakarta.enterprise.cdi.api.version>4.0.1</jakarta.enterprise.cdi.api.version>
<jakarta.enterprise.lang.model.version>4.0.1</jakarta.enterprise.lang.model.version>
<jakarta.inject.api.version>2.0.1</jakarta.inject.api.version>
<jakarta.inject.api.version>2.0.1.MR</jakarta.inject.api.version>
<jakarta.interceptor.api.version>2.1.0</jakarta.interceptor.api.version>
<jakarta.mail.api.version>2.1.2</jakarta.mail.api.version>
<jakarta.mail.api.version>2.1.3</jakarta.mail.api.version>
<jakarta.servlet.api.version>6.0.0</jakarta.servlet.api.version>
<jakarta.servlet.jsp.api.version>3.1.1</jakarta.servlet.jsp.api.version>
<jakarta.servlet.jsp.jstl.api.version>3.0.0</jakarta.servlet.jsp.jstl.api.version>
@ -55,10 +55,10 @@
<jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
<jakarta.websocket.api.version>2.1.1</jakarta.websocket.api.version>
<jakarta.ws.rs.api.version>3.1.0</jakarta.ws.rs.api.version>
<jakarta.xml.bind.api.version>4.0.0</jakarta.xml.bind.api.version>
<jakarta.xml.bind.impl.version>4.0.1</jakarta.xml.bind.impl.version>
<jakarta.xml.jaxws.impl.version>4.0.0</jakarta.xml.jaxws.impl.version>
<jakarta.xml.ws.api.version>4.0.0</jakarta.xml.ws.api.version>
<jakarta.xml.bind.api.version>4.0.2</jakarta.xml.bind.api.version>
<jakarta.xml.bind.impl.version>4.0.5</jakarta.xml.bind.impl.version>
<jakarta.xml.jaxws.impl.version>4.0.2</jakarta.xml.jaxws.impl.version>
<jakarta.xml.ws.api.version>4.0.1</jakarta.xml.ws.api.version>
<jersey.version>3.1.5</jersey.version>
<jsp.impl.version>10.1.16</jsp.impl.version>
@ -483,5 +483,303 @@
</plugins>
</build>
</profile>
<profile>
<!--
$ mvn -Pupdate-dependencies-ee10 validate
-->
<id>update-dependencies-ee10</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<executions>
<execution>
<id>ee10-update</id>
<goals>
<goal>update-properties</goal>
</goals>
<phase>validate</phase>
<configuration>
<onlyProjectDependencies>true</onlyProjectDependencies>
<onlyUpgradable>true</onlyUpgradable>
<ruleSet>
<rules>
<rule>
<!-- ignore maven alpha/beta releases -->
<groupId>org.apache.maven</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+-(alpha|beta).?[0-9]+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore jetty core/root deps -->
<groupId>org.eclipse.jetty</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore all jetty nested deps -->
<groupId>org.eclipse.jetty.*</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore unstable mina releases -->
<groupId>org.apache.mina</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+-M[0-9]+$</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 2.1.x of activation spec -->
<groupId>jakarta.activation</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 2.1.x of annotation spec -->
<groupId>jakarta.annotation</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 3.0.x of authentication spec -->
<groupId>jakarta.authentication</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 5.0.x of el spec -->
<groupId>jakarta.el</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!5.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 4.0.x of cdi spec -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!4.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 4.0.x of enterprise lang spec -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.lang-model</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!4.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 2.0.x of inject spec -->
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 2.1.x of interceptor spec -->
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 2.1.x of mail spec -->
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 6.0.x of servlet spec -->
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!6.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 3.1.x of jsp spec -->
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 3.0.x of jsp-jstl spec -->
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 3.0.x of jsp-jstl impl -->
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 3.0.x of transaction spec -->
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 2.1.x of websocket spec -->
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 2.1.x of websocket spec -->
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 3.1.x of ws.rs.api spec -->
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.1).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 4.0.x of ws.rs.api impl -->
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!4.0).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 4.0.x of xml.bind impl -->
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!4.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 4.0.x of xml.bind-api -->
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!4.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee10, we need to stay on 4.0.x of xml.ws-api -->
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!4.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

4
jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/pom.xml
View File

@ -47,6 +47,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.event</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http.whiteboard</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.tracker</artifactId>

140
jetty-ee8/pom.xml
View File

@ -569,5 +569,145 @@
</plugins>
</build>
</profile>
<profile>
<!--
$ mvn -Pupdate-dependencies-ee8 validate
-->
<id>update-dependencies-ee8</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<executions>
<execution>
<id>ee8-update</id>
<goals>
<goal>update-properties</goal>
</goals>
<phase>validate</phase>
<configuration>
<onlyProjectDependencies>true</onlyProjectDependencies>
<onlyUpgradable>true</onlyUpgradable>
<ruleSet>
<rules>
<rule>
<!-- ignore maven alpha/beta releases -->
<groupId>org.apache.maven</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+-(alpha|beta).?[0-9]+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore jetty core/root deps -->
<groupId>org.eclipse.jetty</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore all jetty nested deps -->
<groupId>org.eclipse.jetty.*</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee8, we need to stay on 1.x of annotation spec
ee9 starts with version 2.0.x -->
<groupId>jakarta.annotation</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee8, we need to stay on 2.x of jsp spec
ee9 starts with version 3.x -->
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee8, we need to stay on 1.x of jsp-jstl spec
ee9 starts with version 2.x -->
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee8, we need to stay on 1.x of transaction spec
ee9 starts with version 2.x -->
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee8, we need to stay on 2.1.x of apache directory api+impl (LDAP) -->
<groupId>org.apache.directory.api</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.1.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee8, we need to stay on 9.0.x of mortbay apache-jsp impl
ee10 starts with version 10.0.x -->
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!9.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore unstable mina releases -->
<groupId>org.apache.mina</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+-M[0-9]+$</version>
</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

1
jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml
View File

@ -121,5 +121,4 @@
</plugin>
</plugins>
</build>
</project>

23
jetty-ee9/jetty-ee9-osgi/pom.xml
View File

@ -67,5 +67,28 @@
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>default</id>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
<configuration>
<!-- Additional ignoredResourcePatterns are not additive, you have to replace the whole list -->
<ignoredResourcePatterns>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>.api_description</ignoredResourcePattern>
<ignoredResourcePattern>/?javax/servlet/resources/.*$</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

1
jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java
View File

@ -193,6 +193,7 @@ public class TestOSGiUtil
res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.tracker").versionAsInProject());
res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.xml").versionAsInProject());
res.add(mavenBundle().groupId("org.eclipse.platform").artifactId("org.eclipse.osgi.services").versionAsInProject());
res.add(mavenBundle().groupId("org.eclipse.platform").artifactId("org.eclipse.equinox.http.service.api").versionAsInProject());
res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm").versionAsInProject().start());
res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").versionAsInProject().start());
res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-tree").versionAsInProject().start());

285
jetty-ee9/pom.xml
View File

@ -47,7 +47,7 @@
<jakarta.authentication.api.version>2.0.0</jakarta.authentication.api.version>
<jakarta.el.api.version>4.0.0</jakarta.el.api.version>
<jakarta.enterprise.cdi.api.version>3.0.1</jakarta.enterprise.cdi.api.version>
<jakarta.inject.api.version>2.0.1</jakarta.inject.api.version>
<jakarta.inject.api.version>2.0.1.MR</jakarta.inject.api.version>
<jakarta.interceptor.api.version>2.0.1</jakarta.interceptor.api.version>
<jakarta.mail.api.version>2.0.1</jakarta.mail.api.version>
<jakarta.servlet.api.version>5.0.0</jakarta.servlet.api.version>
@ -668,5 +668,288 @@
</plugins>
</build>
</profile>
<profile>
<!--
$ mvn -Pupdate-dependencies-ee9 validate
-->
<id>update-dependencies-ee9</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<executions>
<execution>
<id>ee9-update</id>
<goals>
<goal>update-properties</goal>
</goals>
<phase>validate</phase>
<configuration>
<onlyProjectDependencies>true</onlyProjectDependencies>
<onlyUpgradable>true</onlyUpgradable>
<ruleSet>
<rules>
<rule>
<!-- ignore maven alpha/beta releases -->
<groupId>org.apache.maven</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+-(alpha|beta).?[0-9]+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore jetty core/root deps -->
<groupId>org.eclipse.jetty</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore all jetty nested deps -->
<groupId>org.eclipse.jetty.*</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 2.0.x of activation spec
ee10 starts with version 2.1.x -->
<groupId>jakarta.activation</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 2.0.x of annotation spec
ee10 starts with version 2.1.x -->
<groupId>jakarta.annotation</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 2.x of authentication spec
ee10 starts with version 3.x -->
<groupId>jakarta.authentication</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 4.x of el spec
ee10 starts with version 5.x -->
<groupId>jakarta.el</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!4.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 3.x of cdi spec
ee10 starts with version 4.x -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 2.0.x of interceptor spec
ee10 starts with version 2.1.x -->
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 2.0.x of inject spec
ee10 starts with version 2.1.x -->
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 2.0.x of mail spec
ee10 starts with version 2.1.x -->
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 5.x of servlet spec
ee10 starts with version 6.x -->
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!5.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 3.0.x of jsp spec
ee10 starts with version 3.1.x -->
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 2.x of jsp-jstl spec
ee10 starts with version 3.x -->
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!2.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 3.0.x of ws.rs.api spec
ee10 starts with version 3.1.x -->
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.0).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 3.0.x of xml.bind-api
ee10 starts with version 4.0.x -->
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 3.0.x of xml.bind implementation
ee10 starts with version 4.0.x -->
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 3.0.x of jaxws implementation
ee10 starts with version 4.0.x -->
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 3.0.x of xml.ws api
ee10 starts with version 4.0.x -->
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 10.0.x of mortbay apache-jsp impl
ee10 starts with version 10.1.x -->
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!10.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- for ee9, we need to stay on 10.0.x of mortbay apache-el impl
ee10 starts with version 10.1.x -->
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!10.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore unstable mina releases -->
<groupId>org.apache.mina</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+-M[0-9]+$</version>
</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

6
jetty-home/pom.xml
View File

@ -13,7 +13,7 @@
<properties>
<assembly-directory>${basedir}/target/jetty-home</assembly-directory>
<jetty-setuid-version>2.0.2</jetty-setuid-version>
<jetty-setuid-version>2.0.3</jetty-setuid-version>
<source-assembly-directory>${basedir}/target/jetty-home-sources</source-assembly-directory>
<spotbugs.skip>true</spotbugs.skip>
</properties>
@ -218,6 +218,10 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- jetty deps -->
<dependency>

10
jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml
View File

@ -43,11 +43,21 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-query</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-remote-query-client</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>

119
pom.xml
View File

@ -159,32 +159,32 @@
<asciidoctor.skip>false</asciidoctor.skip>
<asciidoctorj-diagram.version>2.3.0</asciidoctorj-diagram.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<asm.version>9.6</asm.version>
<awaitility.version>4.2.0</awaitility.version>
<asm.version>9.7</asm.version>
<awaitility.version>4.2.1</awaitility.version>
<bndlib.version>6.4.1</bndlib.version>
<build-helper.maven.plugin.version>3.5.0</build-helper.maven.plugin.version>
<build-support.version>1.5</build-support.version>
<buildnumber.maven.plugin.version>3.2.0</buildnumber.maven.plugin.version>
<checkstyle.version>10.14.0</checkstyle.version>
<checkstyle.version>10.14.2</checkstyle.version>
<commons-codec.version>1.16.1</commons-codec.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons.compress.version>1.26.0</commons.compress.version>
<commons.compress.version>1.26.1</commons.compress.version>
<commons.io.version>2.15.1</commons.io.version>
<compiler.release>17</compiler.release>
<compiler.source>17</compiler.source>
<compiler.target>17</compiler.target>
<conscrypt.version>2.5.2</conscrypt.version>
<cyclonedx.maven.plugin.version>2.7.10</cyclonedx.maven.plugin.version>
<cyclonedx.maven.plugin.version>2.8.0</cyclonedx.maven.plugin.version>
<depends.maven.plugin.version>1.5.0</depends.maven.plugin.version>
<eclipse.jdt.ecj.version>3.33.0</eclipse.jdt.ecj.version>
<eclipse.jdt.ecj.version>3.37.0</eclipse.jdt.ecj.version>
<felix.version>7.0.5</felix.version>
<findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
<flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version>
<google.errorprone.version>2.25.0</google.errorprone.version>
<google.errorprone.version>2.26.1</google.errorprone.version>
<groovy.version>4.0.6</groovy.version>
<grpc.version>1.62.2</grpc.version>
<gson.version>2.10.1</gson.version>
<guava.version>33.0.0-jre</guava.version>
<guava.version>33.1.0-jre</guava.version>
<guice.version>7.0.0</guice.version>
<h2spec.maven.plugin.version>1.0.11</h2spec.maven.plugin.version>
<hamcrest.version>2.2</hamcrest.version>
@ -195,7 +195,7 @@
<injection.bundle.version>1.2</injection.bundle.version>
<invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<it.debug>false</it.debug>
<jackson.version>2.16.1</jackson.version>
<jackson.version>2.17.0</jackson.version>
<jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version>
<javadoc.verbose>false</javadoc.verbose>
<jboss-logmanager.version>3.0.4.Final</jboss-logmanager.version>
@ -221,7 +221,7 @@
<jmhjar.name>benchmarks</jmhjar.name>
<jna.version>5.14.0</jna.version>
<json-simple.version>1.1.1</json-simple.version>
<json-smart.version>2.5.0</json-smart.version>
<json-smart.version>2.5.1</json-smart.version>
<junit.jupiter.execution.parallel.config.fixed.parallelism>2</junit.jupiter.execution.parallel.config.fixed.parallelism>
<junit.jupiter.execution.parallel.config.strategy>fixed</junit.jupiter.execution.parallel.config.strategy>
<junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
@ -233,22 +233,22 @@
<license.maven.plugin.version>4.3</license.maven.plugin.version>
<localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<log4j2.version>2.23.0</log4j2.version>
<logback.version>1.5.1</logback.version>
<logback.version>1.5.3</logback.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
<mariadb.version>3.3.3</mariadb.version>
<maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
<maven-build-cache.version>1.1.0</maven-build-cache.version>
<maven-plugin.plugin.version>3.11.0</maven-plugin.plugin.version>
<maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version>
<maven.assembly.plugin.version>3.6.0</maven.assembly.plugin.version>
<maven.assembly.plugin.version>3.7.1</maven.assembly.plugin.version>
<maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
<maven.checkstyle.plugin.version>3.3.1</maven.checkstyle.plugin.version>
<maven.clean.plugin.version>3.3.2</maven.clean.plugin.version>
<maven.compiler.createMissingPackageInfoClass>false</maven.compiler.createMissingPackageInfoClass>
<maven.compiler.plugin.version>3.12.1</maven.compiler.plugin.version>
<maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
<maven.dependency.plugin.version>3.6.1</maven.dependency.plugin.version>
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
<maven.deps.version>3.9.4</maven.deps.version>
<maven.deps.version>3.9.6</maven.deps.version>
<maven.enforcer.plugin.version>3.4.1</maven.enforcer.plugin.version>
<maven.exec.plugin.version>3.2.0</maven.exec.plugin.version>
<maven.gpg.plugin.version>3.1.0</maven.gpg.plugin.version>
@ -256,15 +256,15 @@
<maven.invoker.plugin.version>3.6.0</maven.invoker.plugin.version>
<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
<maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
<maven.plugin-tools.version>3.10.2</maven.plugin-tools.version>
<maven.plugin-tools.version>3.11.0</maven.plugin-tools.version>
<maven.release.plugin.version>3.0.1</maven.release.plugin.version>
<maven.remote-resources-plugin.version>3.1.0</maven.remote-resources-plugin.version>
<maven.remote-resources-plugin.version>3.2.0</maven.remote-resources-plugin.version>
<maven.resolver.version>1.9.18</maven.resolver.version>
<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
<maven.shade.plugin.version>3.5.2</maven.shade.plugin.version>
<maven.source.plugin.version>3.3.0</maven.source.plugin.version>
<!-- do not upgrade as jpms issue with ee10 annotations -->
<maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
<maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
<maven.version>3.9.0</maven.version>
<maven.war.plugin.version>3.4.0</maven.war.plugin.version>
<mina.core.version>2.2.3</mina.core.version>
@ -276,33 +276,35 @@
<org.osgi.core.version>8.0.0</org.osgi.core.version>
<org.osgi.util.function.version>1.2.0</org.osgi.util.function.version>
<org.osgi.util.promise.version>1.3.0</org.osgi.util.promise.version>
<osgi-http-service-api>1.2.2</osgi-http-service-api>
<osgi-service-cm-version>1.6.1</osgi-service-cm-version>
<osgi-service-component-version>1.5.1</osgi-service-component-version>
<osgi-service-event-version>1.4.1</osgi-service-event-version>
<osgi-services-version>3.11.100</osgi-services-version>
<osgi-service-http-whiteboard>1.1.1</osgi-service-http-whiteboard>
<osgi-services-version>3.12.0</osgi-services-version>
<osgi-util-function-version>1.2.0</osgi-util-function-version>
<osgi-util-measurement-version>1.0.2</osgi-util-measurement-version>
<osgi-util-position-version>1.0.1</osgi-util-position-version>
<osgi-util-tracker-version>1.5.4</osgi-util-tracker-version>
<osgi-util-version>3.7.200</osgi-util-version>
<osgi-util-version>3.7.300</osgi-util-version>
<osgi-util-xml-version>1.0.2</osgi-util-xml-version>
<osgi-version>3.18.500</osgi-version>
<osgi-version>3.19.0</osgi-version>
<osgi.slf4j.import.packages>org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)"</osgi.slf4j.import.packages>
<pax.exam.version>4.13.5</pax.exam.version>
<pax.url.version>2.6.14</pax.url.version>
<plexus-component-annotations.version>2.1.1</plexus-component-annotations.version>
<plexus-component-annotations.version>2.2.0</plexus-component-annotations.version>
<plexus-utils.version>4.0.0</plexus-utils.version>
<plexus-xml.version>4.0.3</plexus-xml.version>
<project.build.outputTimestamp>2023-06-05T23:12:49Z</project.build.outputTimestamp>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<settingsPath>src/it/settings.xml</settingsPath>
<slf4j.version>2.0.9</slf4j.version>
<spifly.version>1.3.6</spifly.version>
<slf4j.version>2.0.12</slf4j.version>
<spifly.version>1.3.7</spifly.version>
<spotbugs.maven.plugin.version>4.8.3.1</spotbugs.maven.plugin.version>
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<swissbox.version>1.8.3</swissbox.version>
<testcontainers.version>1.19.6</testcontainers.version>
<testcontainers.version>1.19.7</testcontainers.version>
<tinybundles.version>3.0.0</tinybundles.version>
<versions.maven.plugin.version>2.16.2</versions.maven.plugin.version>
<wildfly.common.version>1.7.0.Final</wildfly.common.version>
@ -937,6 +939,11 @@
<artifactId>jetty-websocket-jetty-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.http.service.api</artifactId>
<version>${osgi-http-service-api}</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
@ -1077,6 +1084,11 @@
<artifactId>org.osgi.service.event</artifactId>
<version>${osgi-service-event-version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http.whiteboard</artifactId>
<version>${osgi-service-http-whiteboard}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
@ -2480,6 +2492,65 @@
</plugins>
</build>
</profile>
<profile>
<!--
$ mvn -Pupdate-dependencies validate
-->
<id>update-dependencies</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<executions>
<execution>
<id>root-report</id>
<goals>
<goal>update-properties</goal>
</goals>
<phase>validate</phase>
<configuration>
<ruleSet>
<rules>
<rule>
<!-- ignore maven alpha/beta releases -->
<groupId>org.apache.maven</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+-(alpha|beta).?[0-9]+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore jetty core level version changes -->
<groupId>org.eclipse.jetty</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore jetty nested level version changes -->
<groupId>org.eclipse.jetty.*</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!-- This profile is used exclusively on Eclipse CBI.
Various plugins and artifacts declared here only

6
tests/jetty-testers/pom.xml
View File

@ -13,9 +13,15 @@
<properties>
<bundle-symbolic-name>${project.groupId}.testers</bundle-symbolic-name>
<maven.model.builder.version>3.9.6</maven.model.builder.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>
<version>${maven.model.builder.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-supplier</artifactId>