From 8dd62838f719ae320ed7ba83422da6275bd58e5c Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 22 Sep 2021 09:54:52 -0500 Subject: [PATCH 1/5] Initial cleanup / reorg of dependencies + All plugins and dependencies are alphabetized now + All plugins and dependency versions have properties now Signed-off-by: Joakim Erdfelt --- build-resources/pom.xml | 18 +- demos/demo-jetty-webapp/pom.xml | 6 +- demos/demo-jsp-webapp/pom.xml | 6 +- demos/demo-proxy-webapp/pom.xml | 6 +- documentation/jetty-documentation/pom.xml | 6 +- jetty-bom/pom.xml | 13 +- jetty-client/pom.xml | 2 - jetty-home/pom.xml | 4 +- jetty-http-spi/pom.xml | 3 - jetty-jaspi/pom.xml | 3 - jetty-jmx/pom.xml | 1 - jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-maven-plugin/pom.xml | 6 +- .../src/it/it-parent-pom/pom.xml | 4 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 133 +-- jetty-osgi/jetty-osgi-boot/pom.xml | 4 +- jetty-osgi/test-jetty-osgi-context/pom.xml | 4 +- jetty-osgi/test-jetty-osgi/pom.xml | 35 +- jetty-runner/pom.xml | 2 +- .../pom.xml | 2 +- .../src/it/demo-simple-webapp-runner/pom.xml | 2 +- jetty-websocket/websocket-core-tests/pom.xml | 2 - pom.xml | 1033 +++++++++-------- .../test-cdi-common-webapp/pom.xml | 5 +- tests/test-webapps/test-felix-webapp/pom.xml | 2 - .../test-webapps/test-owb-cdi-webapp/pom.xml | 4 - 26 files changed, 655 insertions(+), 653 deletions(-) diff --git a/build-resources/pom.xml b/build-resources/pom.xml index d81965454ca8..278df59a7178 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -1,5 +1,10 @@ 4.0.0 + org.eclipse.jetty build-resources 10.0.7-SNAPSHOT @@ -8,6 +13,11 @@ UTF-8 + + 3.0.0-M1 + 3.3.1 + 1.6.0 + 3.0.0-M5 @@ -29,7 +39,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven.javadoc.plugin.version} true @@ -41,7 +51,7 @@ org.apache.maven.plugins maven-remote-resources-plugin - 1.6.0 + ${maven.remote-resources.plugin.version} create-shared-resources @@ -62,7 +72,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + ${maven.surefire.plugin.version} true @@ -70,7 +80,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} true diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml index dd7b77375bff..b7f3c0e0aff4 100644 --- a/demos/demo-jetty-webapp/pom.xml +++ b/demos/demo-jetty-webapp/pom.xml @@ -160,15 +160,13 @@ provided - javax.servlet.jsp - jsp-api - 2.2 + jakarta.servlet.jsp + jakarta.servlet.jsp-api provided jakarta.servlet.jsp.jstl jakarta.servlet.jsp.jstl-api - 1.2.7 provided diff --git a/demos/demo-jsp-webapp/pom.xml b/demos/demo-jsp-webapp/pom.xml index 4e66b77b5a62..030e7efd5378 100644 --- a/demos/demo-jsp-webapp/pom.xml +++ b/demos/demo-jsp-webapp/pom.xml @@ -72,15 +72,13 @@ provided - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.3 + jakarta.servlet.jsp + jakarta.servlet.jsp-api provided jakarta.servlet.jsp.jstl jakarta.servlet.jsp.jstl-api - 1.2.7 provided diff --git a/demos/demo-proxy-webapp/pom.xml b/demos/demo-proxy-webapp/pom.xml index 6f6e1afab09b..b2566ac87978 100644 --- a/demos/demo-proxy-webapp/pom.xml +++ b/demos/demo-proxy-webapp/pom.xml @@ -85,15 +85,13 @@ test - javax.servlet.jsp - jsp-api - 2.2 + jakarta.servlet.jsp + jakarta.servlet.jsp-api provided jakarta.servlet.jsp.jstl jakarta.servlet.jsp.jstl-api - 1.2.7 provided diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index eb6358c97ed1..aa0b3f05c7ef 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -20,7 +20,7 @@ org.asciidoctor asciidoctorj-diagram - 2.2.1 + ${asciidoctorj-diagram.version} org.eclipse.jetty.documentation @@ -30,12 +30,12 @@ org.apache.httpcomponents httpcore - 4.4.14 + ${apache.httpcore.version} org.apache.httpcomponents httpclient - 4.5.13 + ${apache.httpclient.version} diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index a4f09ec42b62..6185bb730156 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -1,10 +1,5 @@ 4.0.0 - jetty-bom - Jetty :: Bom - Jetty BOM artifact - https://eclipse.org/jetty - pom org.eclipse.jetty @@ -12,12 +7,18 @@ 10.0.7-SNAPSHOT + jetty-bom + Jetty :: Bom + Jetty BOM artifact + https://eclipse.org/jetty + pom + org.codehaus.mojo flatten-maven-plugin - 1.2.7 + ${flatten.maven.plugin.version} ${project.build.directory} flattened-pom.xml diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 3e1b6ae2453d..1aa8d83f227a 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -137,14 +137,12 @@ org.apache.kerby kerb-simplekdc - 2.0.1 test net.minidev json-smart - 2.4.7 test diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 61256cda1a3b..ec384598fb8d 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -300,10 +300,10 @@ org.eclipse.jetty.toolchain jetty-servlet-api - ${servlet.api.version} + ${jakarta.servlet.api.version} true ${assembly-directory}/lib - jetty-servlet-api-${servlet.api.version}.jar + jetty-servlet-api-${jakarta.servlet.api.version}.jar diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index c66bcf7c5d60..00301cf3e32c 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -47,19 +47,16 @@ javax.xml jaxws-api - 2.0EA3 test com.sun.xml.ws jaxws-rt - 2.3.5 test javax.activation javax.activation-api - 1.2.0 test diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index b79011fc8cd5..62abeba43cf0 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -65,19 +65,16 @@ javax.xml.bind jaxb-api - 2.3.1 test org.glassfish.jaxb jaxb-runtime - 2.3.3 test javax.activation javax.activation-api - 1.2.0 test diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 2abc8b219104..fcd093033094 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -47,7 +47,6 @@ com.openpojo openpojo - 0.9.1 test diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index c63dd4316b9e..ef87965d8ce5 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -58,7 +58,7 @@ true - ${maven.surefire.version} + ${maven.surefire.plugin.version} clean diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index a29e7f005f23..c360c9375522 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -102,8 +102,8 @@ ${jetty.stopKey} ${jetty.stopPort} - ${maven.surefire.version} - ${servlet.api.version} + ${maven.surefire.plugin.version} + ${jakarta.servlet.api.version} clean @@ -123,7 +123,7 @@ org.apache.maven.shared maven-artifact-transfer - 0.13.1 + ${maven-artifact-transfer.version} org.apache.maven diff --git a/jetty-maven-plugin/src/it/it-parent-pom/pom.xml b/jetty-maven-plugin/src/it/it-parent-pom/pom.xml index 72cac69f64bb..fed635421fcc 100644 --- a/jetty-maven-plugin/src/it/it-parent-pom/pom.xml +++ b/jetty-maven-plugin/src/it/it-parent-pom/pom.xml @@ -113,7 +113,7 @@ org.apache.maven.plugins maven-failsafe-plugin - @maven.surefire.version@ + @maven.surefire.plugin.version@ org.apache.maven.plugins @@ -133,7 +133,7 @@ org.apache.maven.plugins maven-surefire-plugin - @maven.surefire.version@ + @maven.surefire.plugin.version@ org.apache.maven.plugins diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index d04aa831af43..c714190c204e 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -58,74 +58,75 @@ org.eclipse.jetty.osgi.boot !org.eclipse.jetty.osgi.boot.* - ${osgi.slf4j.import.packages}, - org.eclipse.jdt.*;resolution:=optional, - org.eclipse.jdt.core.compiler.*;resolution:=optional, - com.sun.el;resolution:=optional, - com.sun.el.lang;resolution:=optional, - com.sun.el.parser;resolution:=optional, - com.sun.el.util;resolution:=optional, - javax.el;version="[3.0,3.1)", - javax.servlet;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))", - javax.servlet.resources;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))", - javax.servlet.jsp.resources;version="[2.3,4.1)", - javax.servlet.jsp;version="[2.3,2.4.1)", - javax.servlet.jsp.el;version="[2.3,2.4.1)", - javax.servlet.jsp.tagext;version="[2.3,2.4.1)", - javax.servlet.jsp.jstl.core;version="1.2";resolution:=optional, - javax.servlet.jsp.jstl.fmt;version="1.2";resolution:=optional, - javax.servlet.jsp.jstl.sql;version="1.2";resolution:=optional, - javax.servlet.jsp.jstl.tlv;version="1.2";resolution:=optional, - org.apache.el;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.el.lang;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.el.stream;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.el.util;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.el.parser;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.jasper;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.jasper.compiler;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.jasper.compiler.tagplugin;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.jasper.runtime;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.jasper.security;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.jasper.servlet;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.jasper.tagplugins.jstl;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.jasper.util;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.jasper.xmlparser;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.apache.taglibs.standard;version="1.2";resolution:=optional, - org.apache.taglibs.standard.extra.spath;version="1.2";resolution:=optional, - org.apache.taglibs.standard.functions;version="1.2";resolution:=optional, - org.apache.taglibs.standard.lang.jstl;version="1.2";resolution:=optional, - org.apache.taglibs.standard.lang.jstl.parser;version="1.2";resolution:=optional, - org.apache.taglibs.standard.lang.jstl.test;version="1.2";resolution:=optional, - org.apache.taglibs.standard.lang.jstl.test.beans;version="1.2";resolution:=optional, - org.apache.taglibs.standard.lang.support;version="1.2";resolution:=optional, - org.apache.taglibs.standard.resources;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.common.core;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.common.fmt;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.common.sql;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.common.xml;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.el.core;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.el.fmt;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.el.sql;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.el.xml;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.rt.core;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.rt.fmt;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.rt.sql;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.rt.xml;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tei;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tlv;version="1.2";resolution:=optional, - org.apache.tomcat;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional, - org.eclipse.jetty.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional, - org.osgi.*, - org.xml.*;resolution:=optional, - org.xml.sax.*;resolution:=optional, - javax.xml.*;resolution:=optional, - org.w3c.dom;resolution:=optional, - org.w3c.dom.ls;resolution:=optional, - javax.xml.parser;resolution:=optional + ${osgi.slf4j.import.packages}, + org.eclipse.jdt.*;resolution:=optional, + org.eclipse.jdt.core.compiler.*;resolution:=optional, + com.sun.el;resolution:=optional, + com.sun.el.lang;resolution:=optional, + com.sun.el.parser;resolution:=optional, + com.sun.el.util;resolution:=optional, + javax.el;version="[3.0,3.1)", + javax.servlet;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", + javax.servlet.resources;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", + javax.servlet.jsp.resources;version="[2.3,4.1)", + javax.servlet.jsp;version="[2.3,2.4.1)", + javax.servlet.jsp.el;version="[2.3,2.4.1)", + javax.servlet.jsp.tagext;version="[2.3,2.4.1)", + javax.servlet.jsp.jstl.core;version="1.2";resolution:=optional, + javax.servlet.jsp.jstl.fmt;version="1.2";resolution:=optional, + javax.servlet.jsp.jstl.sql;version="1.2";resolution:=optional, + javax.servlet.jsp.jstl.tlv;version="1.2";resolution:=optional, + org.apache.el;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.el.lang;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.el.stream;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.el.util;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.el.parser;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.compiler;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.compiler.tagplugin;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.runtime;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.security;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.servlet;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.tagplugins.jstl;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.util;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.xmlparser;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.taglibs.standard;version="1.2";resolution:=optional, + org.apache.taglibs.standard.extra.spath;version="1.2";resolution:=optional, + org.apache.taglibs.standard.functions;version="1.2";resolution:=optional, + org.apache.taglibs.standard.lang.jstl;version="1.2";resolution:=optional, + org.apache.taglibs.standard.lang.jstl.parser;version="1.2";resolution:=optional, + org.apache.taglibs.standard.lang.jstl.test;version="1.2";resolution:=optional, + org.apache.taglibs.standard.lang.jstl.test.beans;version="1.2";resolution:=optional, + org.apache.taglibs.standard.lang.support;version="1.2";resolution:=optional, + org.apache.taglibs.standard.resources;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.common.core;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.common.fmt;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.common.sql;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.common.xml;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.el.core;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.el.fmt;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.el.sql;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.el.xml;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.rt.core;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.rt.fmt;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.rt.sql;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.rt.xml;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tei;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tlv;version="1.2";resolution:=optional, + org.apache.tomcat;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.eclipse.jetty.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional, + org.osgi.*, + org.xml.*;resolution:=optional, + org.xml.sax.*;resolution:=optional, + javax.xml.*;resolution:=optional, + org.w3c.dom;resolution:=optional, + org.w3c.dom.ls;resolution:=optional, + javax.xml.parser;resolution:=optional org.eclipse.jetty.jsp.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", - org.apache.jasper.*;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))", - org.apache.el.*;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))" + org.apache.jasper.*;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))", + org.apache.el.*;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))" + diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 305d2d1e930a..96186ec1eb7a 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -82,8 +82,8 @@ javax.mail.internet;version="1.4.0";resolution:=optional, javax.mail.search;version="1.4.0";resolution:=optional, javax.mail.util;version="1.4.0";resolution:=optional, - javax.servlet;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))", - javax.servlet.http;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))", + javax.servlet;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", + javax.servlet.http;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", javax.transaction;version="1.1.0";resolution:=optional, javax.transaction.xa;version="1.1.0";resolution:=optional, org.objectweb.asm;version="$(version;=;${asm.version})";resolution:=optional, diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 5e966750a1f8..7eebfefe845b 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -73,8 +73,8 @@ compilation time. --> <_nouses>true - javax.servlet;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))", - javax.servlet.resources;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))", + javax.servlet;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", + javax.servlet.resources;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", org.osgi.framework, org.osgi.service.cm;version="1.2.0", org.osgi.service.packageadmin, diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index ddecfd6b999a..b6b961307464 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -195,7 +195,6 @@ org.apache.geronimo.specs geronimo-jta_1.1_spec - 1.1.1 test @@ -219,46 +218,16 @@ com.sun.activation javax.activation - 1.2.0 + ${javax.activation.api.version} test org.glassfish.web javax.servlet.jsp.jstl - 1.2.5 - - - javax.servlet.jsp.jstl - jstl-api - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - - - javax.el - el-api - - org.eclipse.jetty.orbit javax.servlet.jsp.jstl - 1.2.0.v201105211821 - - - org.eclipse.jetty.orbit - javax.servlet - - - org.eclipse.jetty.orbit - javax.servlet.jsp - - @@ -570,7 +539,7 @@ org.apache.maven.surefire surefire-junit47 - ${maven.surefire.version} + ${maven.surefire.plugin.version} diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index ba78c514d2b1..309d9fbcb14f 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -79,7 +79,7 @@ true ${maven.dependency.plugin.version} - ${maven.surefire.version} + ${maven.surefire.plugin.version} ${hamcrest.version} diff --git a/jetty-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml b/jetty-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml index 44b419977fba..bb2e6f7bc335 100644 --- a/jetty-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml +++ b/jetty-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-surefire-plugin - @maven.surefire.version@ + @maven.surefire.plugin.version@ IntegrationTest*.java diff --git a/jetty-runner/src/it/demo-simple-webapp-runner/pom.xml b/jetty-runner/src/it/demo-simple-webapp-runner/pom.xml index df7e6d8e0dcf..a457f92bc276 100644 --- a/jetty-runner/src/it/demo-simple-webapp-runner/pom.xml +++ b/jetty-runner/src/it/demo-simple-webapp-runner/pom.xml @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-surefire-plugin - @maven.surefire.version@ + @maven.surefire.plugin.version@ IntegrationTest*.java diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml index 0a04bb782e2f..65e51dc530d6 100644 --- a/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-websocket/websocket-core-tests/pom.xml @@ -54,13 +54,11 @@ com.googlecode.json-simple json-simple - 1.1.1 test org.codehaus.plexus plexus-utils - 3.3.0 test diff --git a/pom.xml b/pom.xml index 1da7e209cd43..3c0966e93086 100644 --- a/pom.xml +++ b/pom.xml @@ -12,92 +12,162 @@ 1995 - /tmp + 11 11 11 https://www.eclipse.org/jetty/ + benchmarks + 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)" UTF-8 + + + 2.0.10 + 1.10.11 + 4.5.13 + 4.4.14 + 2.5.2 + 2.2.1 + 9.2 + 4.1.0 + 5.3.0 1.5 9.0 - 2.0.0-alpha5 - 1.2.17 - 2.14.0 - 1.3.0-alpha9 + 1.15 + 3.12.0 + 2.5.2 3.4.2 - 1.2 - 4.0.6 - 1.1.2 - 9.0.52 - 11.0.11.Final - 4.3.4.Final - 2.8.8 + 7.0.1 + 3.0.2 + 1.3 + 1.2 + 1.2 + 1.3 + 1.1.1 + 2.9.0 1.40.1 + 2.8.8 + 30.1.1-jre + 5.0.1 + 2.2 2.13.5 + 4.2.2 + 11.0.11.Final + 4.3.4.Final + 2.9.10.7 + 1.3.5 + 1.3.3 + 4.0.4 + 2.3.6 + 1.2.7 + 1.2.0.v201105211821 + 2.0EA3 + 2.3.5 + 1.1.2 2.81 - 1.3.3 + 1.2.0 + 1.1.0.v201105071233 + 2.0 1.4.1.v201005082020 - 1.3.3 - 2.9.0 - 2.0.10 - 4.2.2 - 2.5.2 - 9.2 + 1.0.0.v201108011116 + 1.2.5 + 2.3.1 + 2.3.5 + 3.4.2.Final + 2.2.1.Final + 2.1.15.Final + 3.1.0.Final + 1.1 + 1.0.7 + 4.0.6 + 1.2 + 5.8 1.33 - benchmarks + 5.9.0 0.10.2 0.32.9 2.2.7 3.1.10 0.38.11 + 1.3.3 + 1.1.1 + 2.4.7 + 9.0.52 5.8.0 + 2.0.1 + 1.2.17 + 2.14.0 + 1.3.0-alpha9 + 2.7.4 + 10.3.6 3.8.2 + 0.13.1 1.7.2 - 3.1.8.Final + 2.13.2 + 0.9.1 + 8.0.0 + 6.0.0 + 2.1.0 3.4.1 - 3.4.2.Final - 1.0.7 - 1.10.11 + 2.0.0-alpha5 + 2.1.1.RELEASE + 1.2.5 + 1.2.5 + 1.16.0 2.4.7 - 2.13.2 - - 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)" - - - false - -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx4g -Xms2g -Xlog:gc:stderr:time,level,tags + 3.1.8.Final - 3.2.2 - 3.0.0-M5 + 2.1.0 + 2.2.1 + 3.2.0 + 1.4 + 1.4.0 + 2.0.17 + 1.2.7 + 1.0.7 + 0.8.7 + 2.7 + 4.1 + 3.0.0 + 3.3.0 + 5.1.2 + 3.1.0 + 3.1.2 3.8.1 3.2.0 + 3.0.0-M1 + 3.0.0 + 3.0.0 + 3.0.1 + 3.0.0-M1 + 3.2.2 + 3.2.0 + 3.3.1 + 3.1.1 + 3.6.1 + 3.6.1 + 3.1.2 + 2.5.3 + 1.7.0 3.2.0 + 3.2.4 + 3.9.1 + 3.0.0-M5 3.2.1 3.3.2 - 3.6.1 - 3.0.0-M1 - 3.0.0-M1 - 3.0.0 + 4.4.1 + 2.8.1 + false false - 5.8 - 2.2 - 10.3.6 - - - 2.1.1.RELEASE - 1.3.5 - 2.9.10.7 ${project.build.directory}/local-repo + -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx4g -Xms2g -Xlog:gc:stderr:time,level,tags + false + /tmp src/it/settings.xml - false 0 - 1.16.0 - 5.9.0 - 2.7.4 @@ -434,7 +504,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 + ${maven.checkstyle.plugin.version} jetty-checkstyle.xml true @@ -475,7 +545,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.0.0 + ${maven.antrun.plugin.version} org.apache.ant @@ -487,19 +557,19 @@ org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + ${maven.assembly.plugin.version} org.eclipse.jetty.toolchain jetty-assembly-descriptors - 1.1 + ${jetty-assembly-descriptors.version} org.apache.maven.plugins maven-clean-plugin - 3.1.0 + ${maven.clean.plugin.version} org.apache.maven.plugins @@ -529,25 +599,20 @@ 10 - - org.apache.maven.plugins - maven-eclipse-plugin - 2.10 - org.apache.maven.plugins maven-enforcer-plugin - 3.0.0 + ${maven.enforcer.plugin.version} org.apache.maven.plugins maven-failsafe-plugin - ${maven.surefire.version} + ${maven.surefire.plugin.version} org.apache.maven.plugins maven-invoker-plugin - ${maven.invoker.version} + ${maven.invoker.plugin.version} ${invoker.mergeUserSettings} true @@ -586,7 +651,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + ${maven.jar.plugin.version} ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -601,7 +666,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + ${maven.javadoc.plugin.version} true true @@ -623,27 +688,27 @@ org.apache.maven.plugins maven-jxr-plugin - 3.1.1 + ${maven.jxr.plugin.version} org.apache.maven.plugins maven-plugin-plugin - 3.6.1 + ${maven-plugin.plugin.version} org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.2 + ${maven.project-info-reports.plugin.version} org.apache.maven.plugins maven-release-plugin - 2.5.3 + ${maven.release.plugin.version} org.apache.maven.plugins maven-remote-resources-plugin - 1.7.0 + ${maven.remote-resources-plugin.version} org.apache.maven.plugins @@ -656,12 +721,12 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.4 + ${maven.shade.plugin.version} org.apache.maven.plugins maven-site-plugin - 3.9.1 + ${maven.site.plugin.version} org.apache.maven.plugins @@ -683,7 +748,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven.surefire.version} + ${maven.surefire.plugin.version} false ${surefire.rerunFailingTestsCount} @@ -723,27 +788,27 @@ org.eclipse.jetty.toolchain jetty-version-maven-plugin - 2.7 + ${jetty-version.maven.plugin.version} org.jacoco jacoco-maven-plugin - 0.8.7 + ${jacoco.maven.plugin.version} com.agilejava.docbkx docbkx-maven-plugin - 2.0.17 + ${docbkx.maven.plugin.version} com.mycila license-maven-plugin - 4.1 + ${license.maven.plugin.version} org.apache.felix maven-bundle-plugin - 5.1.2 + ${maven.bundle.plugin.version} true @@ -771,17 +836,17 @@ org.apache.servicemix.tooling depends-maven-plugin - 1.4.0 + ${depends.maven.plugin.version} org.asciidoctor asciidoctor-maven-plugin - 2.2.1 + ${asciidoctor.maven.plugin.version} org.asciidoctor asciidoctorj-diagram - 2.2.1 + ${asciidoctorj-diagram.version} @@ -819,186 +884,32 @@ org.codehaus.mojo appassembler-maven-plugin - 2.1.0 + ${appassembler.maven.plugin.version} org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + ${build-helper.maven.plugin.version} org.codehaus.mojo buildnumber-maven-plugin - 1.4 + ${buildnumber.maven.plugin.version} org.codehaus.mojo exec-maven-plugin ${maven.exec.plugin.version} - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.eclipse.jetty.toolchain - jetty-version-maven-plugin - [1.0.3,) - - attach-version-text - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [2.1,) - - unpack - unpack-dependencies - copy-dependencies - copy - - - - - - - - - org.ops4j.pax.exam - maven-paxexam-plugin - [1.2.0,) - - - generate-depends-file - - generate-config - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - [1.4,) - - run - - - - - - - - - org.sonatype.maven.plugin - emma-maven-plugin - [1.1,) - - instrument - - - - - - - - - org.apache.maven.plugins - maven-plugin-plugin - [2.5,) - - default-descriptor - descriptor - xdoc - helpmojo - - - - - - - - - org.codehaus.mojo - native-maven-plugin - [1.0-alpha-7,) - - initialize - javah - compile - unzipinc - link - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - [2.8,) - - jar - - - - - - - - - org.apache.maven.plugins - maven-remote-resources-plugin - [1.0,) - - process - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - [1.0,) - - enforce - - - - - - - - - - org.mortbay.jetty h2spec-maven-plugin - 1.0.7 + ${h2spec.maven.plugin.version} org.codehaus.mojo versions-maven-plugin - 2.8.1 + ${versions.maven.plugin.version} true true @@ -1026,307 +937,443 @@ - org.eclipse.jetty - jetty-server - ${project.version} + biz.aQute.bnd + biz.aQute.bndlib + ${bndlib.version} - org.eclipse.jetty - jetty-io - ${project.version} + ch.qos.logback + logback-core + ${logback.version} - org.eclipse.jetty - jetty-http - ${project.version} + com.github.jnr + jnr-constants + ${jnr-constants.version} - org.eclipse.jetty - jetty-plus - ${project.version} + com.github.jnr + jnr-enxio + ${jnr-enxio.version} - org.eclipse.jetty - jetty-slf4j-impl - ${project.version} - test + com.github.jnr + jnr-ffi + ${jnr-ffi.version} - org.eclipse.jetty.toolchain - jetty-servlet-api - ${servlet.api.version} + com.github.jnr + jnr-posix + ${jnr-posix.version} - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - ${websocket.api.version} + com.github.jnr + jnr-unixsocket + ${jnr-unixsocket.version} - jakarta.annotation - jakarta.annotation-api - ${annotation-api.version} + com.google.code.findbugs + jsr305 + ${findbugs.jsr305.version} - org.ow2.asm - asm - ${asm.version} + com.google.errorprone + error_prone_annotations + ${google.errorprone.version} - org.ow2.asm - asm-commons - ${asm.version} + com.google.guava + guava + ${guava.version} - org.ow2.asm - asm-tree - ${asm.version} + com.google.inject + guice + ${guice.version} - org.ow2.asm - asm-analysis - ${asm.version} + com.googlecode.json-simple + json-simple + ${json-simple.version} - org.eclipse.jetty.orbit - javax.security.auth.message - 1.0.0.v201108011116 + com.jamonapi + jamon + ${jamon.version} + + + javax.servlet + servlet-api + + - - org.mortbay.jasper - apache-jsp - ${jsp.version} + com.jamonapi + jamon_war + ${jamon.version} + war + + + javax.servlet + servlet-api + + - - org.apache.taglibs - taglibs-standard-impl - 1.2.5 + org.jolokia + jolokia-war + ${jolokia.version} + war - - org.apache.taglibs - taglibs-standard-spec - 1.2.5 + com.openpojo + openpojo + ${openpojo.version} - org.eclipse.jetty.orbit - javax.activation - 1.1.0.v201105071233 + com.sun.xml.ws + jaxws-rt + ${jakarta.xml.jaxws.impl.version} - org.eclipse.jetty.orbit - javax.mail.glassfish - ${javax.mail.glassfish.version} + commons-codec + commons-codec + ${commons-codec.version} - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} + io.grpc + grpc-core + ${grpc.version} + + + io.hawt + hawtio-default + ${hawtio.version} + war javax.enterprise cdi-api - 2.0 + ${javax.cdi.api.version} + javax.el javax.el-api - - org.codehaus.plexus - plexus-component-annotations - 2.1.0 + javax.activation + javax.activation-api + ${javax.activation.api.version} - org.codehaus.plexus - plexus-utils - ${plexus-utils.version} + javax.xml + jaxws-api + ${jakarta.xml.jaxws.api.version} - org.apache.maven - maven-plugin-api - ${maven.version} + javax.xml.bind + jaxb-api + ${javax.xml.jaxb.api.version} - org.apache.maven - maven-artifact - ${maven.version} + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.api.version} - org.apache.maven - maven-core - ${maven.version} + jakarta.inject + jakarta.inject-api + 1.0 - org.apache.maven - maven-settings - ${maven.version} + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.api.version} - org.apache.maven.plugin-tools - maven-plugin-tools-api - ${maven.plugin-tools.version} + jakarta.servlet.jsp + jakarta.servlet.jsp-api + ${jakarta.servlet.jsp.api.version} - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven.plugin-tools.version} - provided + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + ${jakarta.servlet.jsp.jstl.api.version} - org.junit - junit-bom - ${junit.version} - pom - import + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} - - org.hamcrest - hamcrest - ${hamcrest.version} + log4j + log4j + ${log4j.version} - org.awaitility - awaitility - 4.1.0 + net.java.dev.jna + jna + ${jna.version} - org.testcontainers - testcontainers-bom - ${testcontainers.version} - pom - import + net.minidev + json-smart + ${json-smart.version} - org.mariadb.jdbc - mariadb-java-client - ${mariadb.version} + org.apache.ant + ant + ${ant.version} - net.java.dev.jna - jna - ${jna.version} + org.apache.ant + ant-launcher + ${ant.version} - com.google.guava - guava - 30.1.1-jre + org.apache.commons + commons-lang3 + ${commons-lang3.version} - com.google.inject - guice - 5.0.1 + org.apache.felix + org.apache.felix.framework + ${felix.version} - com.google.errorprone - error_prone_annotations - ${google.errorprone.version} + org.apache.geronimo.specs + geronimo-annotation_1.3_spec + ${geronimo.annotation.spec.version} - com.google.code.findbugs - jsr305 - 3.0.2 + org.apache.geronimo.specs + geronimo-jcdi_2.0_spec + ${geronimo.jcdi.spec.version} - org.osgi - org.osgi.core - 6.0.0 + org.apache.geronimo.specs + geronimo-atinject_1.0_spec + ${geronimo.atinject.spec.version} - org.osgi - osgi.annotation - 8.0.0 + org.apache.geronimo.specs + geronimo-interceptor_1.2_spec + ${geronimo.interceptor.spec.version} - biz.aQute.bnd - biz.aQute.bndlib - 5.3.0 + org.apache.geronimo.specs + geronimo-jta_1.1_spec + ${geronimo.jta.spec.version} - org.infinispan - infinispan-bom - ${infinispan.version} - pom - import + org.apache.kerby + kerb-simplekdc + ${kerb-simplekdc.version} - - org.jboss.logging - jboss-logging - ${jboss.logging.version} + org.apache.logging.log4j + log4j-api + ${log4j2.version} - org.jboss.logging - jboss-logging-processor - 2.2.1.Final + org.apache.maven + maven-artifact + ${maven.version} - org.jboss.logging - jboss-logging-annotations - 2.2.1.Final + org.apache.maven + maven-core + ${maven.version} - org.jboss.logmanager - jboss-logmanager - 2.1.15.Final + org.apache.maven + maven-plugin-api + ${maven.version} - org.jboss.threads - jboss-threads - 3.1.0.Final + org.apache.maven + maven-settings + ${maven.version} + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${maven.plugin-tools.version} + provided + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + ${maven.plugin-tools.version} + + + org.apache.taglibs + taglibs-standard-impl + ${taglibs-standard-impl.version} + + + + javax.servlet.jsp + jsp-api + + + + + org.apache.taglibs + taglibs-standard-spec + ${taglibs-standard-spec.version} + + + + javax.servlet.jsp + jsp-api + + + + + org.awaitility + awaitility + ${awaitility.version} + + + org.asciidoctor + asciidoctorj + ${asciidoctorj.version} + + + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctor.maven.plugin.version} + + + org.codehaus.plexus + plexus-component-annotations + ${plexus-component-annotations.version} + + + org.codehaus.plexus + plexus-utils + ${plexus-utils.version} + + + org.eclipse.jetty + jetty-http + ${project.version} + + + org.eclipse.jetty + jetty-io + ${project.version} + + + org.eclipse.jetty + jetty-plus + ${project.version} + + + org.eclipse.jetty + jetty-server + ${project.version} + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + + + org.eclipse.jetty.orbit + javax.activation + ${javax.activation.impl.version} + + + org.eclipse.jetty.orbit + javax.mail.glassfish + ${javax.mail.glassfish.version} + + + org.eclipse.jetty.orbit + javax.security.auth.message + ${javax.security.auth.message.version} + + + org.eclipse.jetty.orbit + javax.servlet.jsp.jstl + ${jakarta.servlet.jsp.jstl.impl.version} + + + org.eclipse.jetty.orbit + javax.servlet + + + org.eclipse.jetty.orbit + javax.servlet.jsp + + - org.eclipse.jetty.toolchain - jetty-test-helper - ${jetty.test.version} + jetty-javax-websocket-api + ${jakarta.websocket.api.version} org.eclipse.jetty.toolchain jetty-perf-helper ${jetty.perf-helper.version} - - - org.slf4j - jcl104-over-slf4j - ${slf4j.version} - - org.slf4j - log4j-over-slf4j - ${slf4j.version} + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} - org.slf4j - slf4j-api - ${slf4j.version} + org.eclipse.jetty.toolchain + jetty-test-helper + ${jetty.test.version} - org.slf4j - slf4j-simple - ${slf4j.version} + org.glassfish.jaxb + jaxb-runtime + ${javax.xml.jaxb.impl.version} - org.slf4j - jul-to-slf4j - ${slf4j.version} - test + org.glassfish.web + javax.servlet.jsp.jstl + ${javax.servlet.jsp.jstl.impl.version} + + + + javax.servlet.jsp.jstl + jstl-api + + + javax.servlet + servlet-api + + + javax.servlet.jsp + jsp-api + + + javax.el + el-api + + - log4j - log4j - ${log4j.version} + org.hamcrest + hamcrest + ${hamcrest.version} - org.apache.logging.log4j - log4j-api - ${log4j2.version} + org.infinispan + infinispan-bom + ${infinispan.version} + pom + import org.jboss.logging @@ -1334,106 +1381,104 @@ ${jboss.logging.version} - ch.qos.logback - logback-core - ${logback.version} + org.jboss.logging + jboss-logging-annotations + ${jboss-logging.version} - org.asciidoctor - asciidoctor-maven-plugin - 2.2.1 + org.jboss.logging + jboss-logging-processor + ${jboss-logging.version} - org.asciidoctor - asciidoctorj - 2.5.2 + org.jboss.logmanager + jboss-logmanager + ${jboss-logmanager.version} - com.github.jnr - jnr-constants - ${jnr-constants.version} + org.jboss.threads + jboss-threads + ${jboss-threads.version} - com.github.jnr - jnr-enxio - ${jnr-enxio.version} + org.junit + junit-bom + ${junit.version} + pom + import - com.github.jnr - jnr-ffi - ${jnr-ffi.version} + org.mariadb.jdbc + mariadb-java-client + ${mariadb.version} - com.github.jnr - jnr-posix - ${jnr-posix.version} + org.mortbay.jasper + apache-jsp + ${jsp.impl.version} - com.github.jnr - jnr-unixsocket - ${jnr-unixsocket.version} + org.osgi + org.osgi.core + ${org.osgi.core.version} - - io.grpc - grpc-core - ${grpc.version} + org.osgi + osgi.annotation + ${org.osgi.annotation.version} - org.apache.ant - ant - ${ant.version} + org.ow2.asm + asm + ${asm.version} - org.apache.ant - ant-launcher - ${ant.version} + org.ow2.asm + asm-analysis + ${asm.version} - commons-codec - commons-codec - 1.15 + org.ow2.asm + asm-commons + ${asm.version} - org.apache.commons - commons-lang3 - 3.12.0 + org.ow2.asm + asm-tree + ${asm.version} - - io.hawt - hawtio-default - ${hawtio.version} - war + org.slf4j + jcl104-over-slf4j + ${slf4j.version} - com.jamonapi - jamon - ${jamon.version} - - - javax.servlet - servlet-api - - + org.slf4j + jul-to-slf4j + ${slf4j.version} + test - com.jamonapi - jamon_war - ${jamon.version} - war - - - javax.servlet - servlet-api - - + org.slf4j + log4j-over-slf4j + ${slf4j.version} - org.jolokia - jolokia-war - ${jolokia.version} - war + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + org.testcontainers + testcontainers-bom + ${testcontainers.version} + pom + import @@ -1484,7 +1529,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.2 + ${maven.project-info-reports.plugin.version} org.apache.maven.plugins @@ -1504,7 +1549,7 @@ org.apache.maven.plugins maven-site-plugin - 3.9.1 + ${maven.site.plugin.version} build-site @@ -1687,7 +1732,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + ${maven.gpg.plugin.version} sign-artifacts @@ -1723,12 +1768,12 @@ com.github.spotbugs spotbugs-maven-plugin - 4.4.1 + ${spotbugs.maven.plugin.version} org.apache.maven.plugins maven-surefire-plugin - ${maven.surefire.version} + ${maven.surefire.plugin.version} external, large-disk-resource diff --git a/tests/test-webapps/test-cdi-common-webapp/pom.xml b/tests/test-webapps/test-cdi-common-webapp/pom.xml index dd69cf56e999..c43b4ab17de7 100644 --- a/tests/test-webapps/test-cdi-common-webapp/pom.xml +++ b/tests/test-webapps/test-cdi-common-webapp/pom.xml @@ -25,9 +25,8 @@ - javax.inject - javax.inject - 1 + jakarta.inject + jakarta.inject-api provided diff --git a/tests/test-webapps/test-felix-webapp/pom.xml b/tests/test-webapps/test-felix-webapp/pom.xml index 3c4d7730617a..6f1c0bae331f 100644 --- a/tests/test-webapps/test-felix-webapp/pom.xml +++ b/tests/test-webapps/test-felix-webapp/pom.xml @@ -39,13 +39,11 @@ jakarta.servlet jakarta.servlet-api - 4.0.4 provided org.apache.felix org.apache.felix.framework - 7.0.1 diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index 9547527030d4..b0b16a4705fe 100644 --- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml @@ -40,22 +40,18 @@ org.apache.geronimo.specs geronimo-annotation_1.3_spec - 1.3 org.apache.geronimo.specs geronimo-jcdi_2.0_spec - 1.3 org.apache.geronimo.specs geronimo-atinject_1.0_spec - 1.2 org.apache.geronimo.specs geronimo-interceptor_1.2_spec - 1.2 org.apache.openwebbeans From 5b6c3f145c5c51d854661b6910bad167d0b23857 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 22 Sep 2021 10:41:30 -0500 Subject: [PATCH 2/5] More artifact cleanup javax.* to jakarta.* Signed-off-by: Joakim Erdfelt --- javadoc/pom.xml | 1 - jetty-http-spi/pom.xml | 8 +- .../infinispan-remote-query/pom.xml | 6 -- jetty-jaspi/pom.xml | 8 +- .../src/it/jetty-start-war-mojo-it/pom.xml | 12 +-- jetty-osgi/test-jetty-osgi/pom.xml | 5 +- .../TestJettyOSGiBootWithAnnotations.java | 2 +- pom.xml | 93 +++++++++++-------- tests/test-distribution/pom.xml | 1 - .../test-cdi-common-webapp/pom.xml | 10 +- 10 files changed, 75 insertions(+), 71 deletions(-) diff --git a/javadoc/pom.xml b/javadoc/pom.xml index c13fe70ff619..c006e2894cc3 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -373,7 +373,6 @@ org.eclipse.jetty.orbit javax.mail.glassfish - 1.4.1.v201005082020 provided diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 00301cf3e32c..6aeb2e84d560 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -45,8 +45,8 @@ test - javax.xml - jaxws-api + jakarta.xml.ws + jakarta.xml.ws-api test @@ -55,8 +55,8 @@ test - javax.activation - javax.activation-api + jakarta.activation + jakarta.activation-api test diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index 633b46dc8c32..823052c475a7 100644 --- a/jetty-infinispan/infinispan-remote-query/pom.xml +++ b/jetty-infinispan/infinispan-remote-query/pom.xml @@ -111,12 +111,6 @@ com.google.code.gson gson - ${gson.version} - - - com.google.code.gson - gson - ${gson.version} org.slf4j diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 62abeba43cf0..3c01f5b1cdfe 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -63,8 +63,8 @@ javax.security.auth.message - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api test @@ -73,8 +73,8 @@ test - javax.activation - javax.activation-api + jakarta.activation + jakarta.activation-api test diff --git a/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/pom.xml index 479aa35257ee..de5cc7c3b06d 100644 --- a/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/pom.xml @@ -95,14 +95,14 @@ - javax.xml.bind - jaxb-api - 2.4.0-b180830.0359 + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.3 - javax.activation - javax.activation-api - 1.2.0 + jakarta.activation + jakarta.activation-api + 1.2.2 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index b6b961307464..8c715b5929e6 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -216,9 +216,8 @@ - com.sun.activation - javax.activation - ${javax.activation.api.version} + jakarta.activation + jakarta.activation-api test diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java index 2bb0249addc6..61af5459b97c 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java @@ -79,7 +79,7 @@ public static List + + com.google.code.gson + gson + ${gson.version} + com.google.guava guava @@ -1052,31 +1055,14 @@ war - javax.enterprise - cdi-api - ${javax.cdi.api.version} - - - - javax.el - javax.el-api - - - - - javax.activation - javax.activation-api - ${javax.activation.api.version} + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi.api.version} - javax.xml - jaxws-api - ${jakarta.xml.jaxws.api.version} - - - javax.xml.bind - jaxb-api - ${javax.xml.jaxb.api.version} + jakarta.activation + jakarta.activation-api + ${jakarta.activation.api.version} jakarta.annotation @@ -1108,6 +1094,16 @@ jakarta.transaction-api ${jakarta.transaction-api.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.api.version} + + + jakarta.xml.ws + jakarta.xml.ws-api + ${jakarta.xml.ws.api.version} + log4j log4j @@ -1187,11 +1183,34 @@ org.apache.maven maven-core ${maven.version} + + + javax.inject + javax.inject + + org.apache.maven maven-plugin-api ${maven.version} + + + javax.enterprise + cdi-api + + + + + org.apache.maven + maven-resolver-provider + ${maven.version} + + + javax.inject + javax.inject + + org.apache.maven @@ -1337,7 +1356,7 @@ org.glassfish.jaxb jaxb-runtime - ${javax.xml.jaxb.impl.version} + ${jakarta.xml.bind.impl.version} org.glassfish.web diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index ff1ed3ae41bc..618abb47637b 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -32,7 +32,6 @@ org.apache.maven maven-resolver-provider - ${maven.version} org.apache.maven.resolver diff --git a/tests/test-webapps/test-cdi-common-webapp/pom.xml b/tests/test-webapps/test-cdi-common-webapp/pom.xml index c43b4ab17de7..04d8ea024dde 100644 --- a/tests/test-webapps/test-cdi-common-webapp/pom.xml +++ b/tests/test-webapps/test-cdi-common-webapp/pom.xml @@ -31,15 +31,9 @@ - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api provided - - - javax.el - javax.el-api - - From 9c17fbe0b53380bbc59a999fa6dae60b35415436 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 22 Sep 2021 10:47:41 -0500 Subject: [PATCH 3/5] Revert accidental indentation change Signed-off-by: Joakim Erdfelt --- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 128 ++++++++++++------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index c714190c204e..473cd1d37a05 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -58,70 +58,70 @@ org.eclipse.jetty.osgi.boot !org.eclipse.jetty.osgi.boot.* - ${osgi.slf4j.import.packages}, - org.eclipse.jdt.*;resolution:=optional, - org.eclipse.jdt.core.compiler.*;resolution:=optional, - com.sun.el;resolution:=optional, - com.sun.el.lang;resolution:=optional, - com.sun.el.parser;resolution:=optional, - com.sun.el.util;resolution:=optional, - javax.el;version="[3.0,3.1)", - javax.servlet;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", - javax.servlet.resources;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", - javax.servlet.jsp.resources;version="[2.3,4.1)", - javax.servlet.jsp;version="[2.3,2.4.1)", - javax.servlet.jsp.el;version="[2.3,2.4.1)", - javax.servlet.jsp.tagext;version="[2.3,2.4.1)", - javax.servlet.jsp.jstl.core;version="1.2";resolution:=optional, - javax.servlet.jsp.jstl.fmt;version="1.2";resolution:=optional, - javax.servlet.jsp.jstl.sql;version="1.2";resolution:=optional, - javax.servlet.jsp.jstl.tlv;version="1.2";resolution:=optional, - org.apache.el;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.el.lang;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.el.stream;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.el.util;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.el.parser;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.jasper;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.jasper.compiler;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.jasper.compiler.tagplugin;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.jasper.runtime;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.jasper.security;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.jasper.servlet;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.jasper.tagplugins.jstl;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.jasper.util;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.jasper.xmlparser;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.apache.taglibs.standard;version="1.2";resolution:=optional, - org.apache.taglibs.standard.extra.spath;version="1.2";resolution:=optional, - org.apache.taglibs.standard.functions;version="1.2";resolution:=optional, - org.apache.taglibs.standard.lang.jstl;version="1.2";resolution:=optional, - org.apache.taglibs.standard.lang.jstl.parser;version="1.2";resolution:=optional, - org.apache.taglibs.standard.lang.jstl.test;version="1.2";resolution:=optional, - org.apache.taglibs.standard.lang.jstl.test.beans;version="1.2";resolution:=optional, - org.apache.taglibs.standard.lang.support;version="1.2";resolution:=optional, - org.apache.taglibs.standard.resources;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.common.core;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.common.fmt;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.common.sql;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.common.xml;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.el.core;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.el.fmt;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.el.sql;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.el.xml;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.rt.core;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.rt.fmt;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.rt.sql;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tag.rt.xml;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tei;version="1.2";resolution:=optional, - org.apache.taglibs.standard.tlv;version="1.2";resolution:=optional, - org.apache.tomcat;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, - org.eclipse.jetty.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional, - org.osgi.*, - org.xml.*;resolution:=optional, - org.xml.sax.*;resolution:=optional, - javax.xml.*;resolution:=optional, - org.w3c.dom;resolution:=optional, - org.w3c.dom.ls;resolution:=optional, - javax.xml.parser;resolution:=optional + ${osgi.slf4j.import.packages}, + org.eclipse.jdt.*;resolution:=optional, + org.eclipse.jdt.core.compiler.*;resolution:=optional, + com.sun.el;resolution:=optional, + com.sun.el.lang;resolution:=optional, + com.sun.el.parser;resolution:=optional, + com.sun.el.util;resolution:=optional, + javax.el;version="[3.0,3.1)", + javax.servlet;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", + javax.servlet.resources;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", + javax.servlet.jsp.resources;version="[2.3,4.1)", + javax.servlet.jsp;version="[2.3,2.4.1)", + javax.servlet.jsp.el;version="[2.3,2.4.1)", + javax.servlet.jsp.tagext;version="[2.3,2.4.1)", + javax.servlet.jsp.jstl.core;version="1.2";resolution:=optional, + javax.servlet.jsp.jstl.fmt;version="1.2";resolution:=optional, + javax.servlet.jsp.jstl.sql;version="1.2";resolution:=optional, + javax.servlet.jsp.jstl.tlv;version="1.2";resolution:=optional, + org.apache.el;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.el.lang;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.el.stream;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.el.util;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.el.parser;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.compiler;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.compiler.tagplugin;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.runtime;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.security;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.servlet;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.tagplugins.jstl;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.util;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.jasper.xmlparser;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.apache.taglibs.standard;version="1.2";resolution:=optional, + org.apache.taglibs.standard.extra.spath;version="1.2";resolution:=optional, + org.apache.taglibs.standard.functions;version="1.2";resolution:=optional, + org.apache.taglibs.standard.lang.jstl;version="1.2";resolution:=optional, + org.apache.taglibs.standard.lang.jstl.parser;version="1.2";resolution:=optional, + org.apache.taglibs.standard.lang.jstl.test;version="1.2";resolution:=optional, + org.apache.taglibs.standard.lang.jstl.test.beans;version="1.2";resolution:=optional, + org.apache.taglibs.standard.lang.support;version="1.2";resolution:=optional, + org.apache.taglibs.standard.resources;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.common.core;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.common.fmt;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.common.sql;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.common.xml;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.el.core;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.el.fmt;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.el.sql;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.el.xml;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.rt.core;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.rt.fmt;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.rt.sql;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tag.rt.xml;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tei;version="1.2";resolution:=optional, + org.apache.taglibs.standard.tlv;version="1.2";resolution:=optional, + org.apache.tomcat;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional, + org.eclipse.jetty.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional, + org.osgi.*, + org.xml.*;resolution:=optional, + org.xml.sax.*;resolution:=optional, + javax.xml.*;resolution:=optional, + org.w3c.dom;resolution:=optional, + org.w3c.dom.ls;resolution:=optional, + javax.xml.parser;resolution:=optional org.eclipse.jetty.jsp.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.apache.jasper.*;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))", From c18d059f44ade8467512e89639b035efe9496c23 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 22 Sep 2021 13:09:25 -0500 Subject: [PATCH 4/5] Fixing jetty-maven-plugin IT tests Signed-off-by: Joakim Erdfelt --- jetty-maven-plugin/pom.xml | 2 +- jetty-maven-plugin/src/it/it-parent-pom/pom.xml | 2 +- jetty-maven-plugin/src/it/javax-annotation-api/pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index c360c9375522..d043a17963b8 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -103,7 +103,7 @@ ${jetty.stopKey} ${jetty.stopPort} ${maven.surefire.plugin.version} - ${jakarta.servlet.api.version} + ${jetty.servlet.api.version} clean diff --git a/jetty-maven-plugin/src/it/it-parent-pom/pom.xml b/jetty-maven-plugin/src/it/it-parent-pom/pom.xml index fed635421fcc..970d24c7e4e7 100644 --- a/jetty-maven-plugin/src/it/it-parent-pom/pom.xml +++ b/jetty-maven-plugin/src/it/it-parent-pom/pom.xml @@ -22,7 +22,7 @@ org.eclipse.jetty.toolchain jetty-servlet-api - @servlet.api.version@ + @jetty.servlet.api.version@ provided diff --git a/jetty-maven-plugin/src/it/javax-annotation-api/pom.xml b/jetty-maven-plugin/src/it/javax-annotation-api/pom.xml index 4d2af3f1b78a..aa540904d3db 100644 --- a/jetty-maven-plugin/src/it/javax-annotation-api/pom.xml +++ b/jetty-maven-plugin/src/it/javax-annotation-api/pom.xml @@ -26,13 +26,13 @@ org.eclipse.jetty.toolchain jetty-servlet-api - @servlet.api.version@ + @jetty.servlet.api.version@ provided jakarta.annotation jakarta.annotation-api - @annotation-api.version@ + @jakarta.annotation.api.version@ org.springframework.boot @@ -104,7 +104,7 @@ jakarta.annotation jakarta.annotation-api - @annotation-api.version@ + @jakarta.annotation.api.version@ From a63005a907ba1916297268984e4f6c05b07a3139 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 22 Sep 2021 14:39:38 -0500 Subject: [PATCH 5/5] Changes from review Signed-off-by: Joakim Erdfelt --- jetty-bom/pom.xml | 3 +-- jetty-home/pom.xml | 4 ++-- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 4 ++-- jetty-osgi/jetty-osgi-boot/pom.xml | 4 ++-- jetty-osgi/test-jetty-osgi-context/pom.xml | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 6185bb730156..330bafe537b5 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -8,9 +8,8 @@ jetty-bom - Jetty :: Bom + Jetty :: BOM Jetty BOM artifact - https://eclipse.org/jetty pom diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index ec384598fb8d..be19d931d77c 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -300,10 +300,10 @@ org.eclipse.jetty.toolchain jetty-servlet-api - ${jakarta.servlet.api.version} + ${jetty.servlet.api.version} true ${assembly-directory}/lib - jetty-servlet-api-${jakarta.servlet.api.version}.jar + jetty-servlet-api-${jetty.servlet.api.version}.jar diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 473cd1d37a05..9b0110832a4d 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -66,8 +66,8 @@ com.sun.el.parser;resolution:=optional, com.sun.el.util;resolution:=optional, javax.el;version="[3.0,3.1)", - javax.servlet;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", - javax.servlet.resources;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", + javax.servlet;version="[$(version;==;${jetty.servlet.api.version}),$(version;+;${jetty.servlet.api.version}))", + javax.servlet.resources;version="[$(version;==;${jetty.servlet.api.version}),$(version;+;${jetty.servlet.api.version}))", javax.servlet.jsp.resources;version="[2.3,4.1)", javax.servlet.jsp;version="[2.3,2.4.1)", javax.servlet.jsp.el;version="[2.3,2.4.1)", diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 96186ec1eb7a..0cf84077e859 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -82,8 +82,8 @@ javax.mail.internet;version="1.4.0";resolution:=optional, javax.mail.search;version="1.4.0";resolution:=optional, javax.mail.util;version="1.4.0";resolution:=optional, - javax.servlet;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", - javax.servlet.http;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", + javax.servlet;version="[$(version;==;${jetty.servlet.api.version}),$(version;+;${jetty.servlet.api.version}))", + javax.servlet.http;version="[$(version;==;${jetty.servlet.api.version}),$(version;+;${jetty.servlet.api.version}))", javax.transaction;version="1.1.0";resolution:=optional, javax.transaction.xa;version="1.1.0";resolution:=optional, org.objectweb.asm;version="$(version;=;${asm.version})";resolution:=optional, diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 7eebfefe845b..7055925129f3 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -73,8 +73,8 @@ compilation time. --> <_nouses>true - javax.servlet;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", - javax.servlet.resources;version="[$(version;==;${jakarta.servlet.api.version}),$(version;+;${jakarta.servlet.api.version}))", + javax.servlet;version="[$(version;==;${jetty.servlet.api.version}),$(version;+;${jetty.servlet.api.version}))", + javax.servlet.resources;version="[$(version;==;${jetty.servlet.api.version}),$(version;+;${jetty.servlet.api.version}))", org.osgi.framework, org.osgi.service.cm;version="1.2.0", org.osgi.service.packageadmin,