From 174f8b0bad77e18ba789416772a7dd455f815223 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 13 Aug 2022 16:25:50 +1000 Subject: [PATCH] fix hardcoding versions in mod files Signed-off-by: Olivier Lamy --- .../main/config/modules/ee10-demo-jndi.mod | 4 +-- .../src/main/config/modules/ee10-servlet.mod | 2 +- .../config/modules/ee10-websocket-jakarta.mod | 4 +-- jetty-ee8/jetty-ee8-home/pom.xml | 28 ++----------------- .../src/main/config/modules/ee8-servlet.mod | 3 +- .../config/modules/ee8-websocket-javax.mod | 2 +- .../src/main/config/modules/ee9-demo-jndi.mod | 4 +-- .../src/main/config/modules/ee9-plus.mod | 2 +- .../src/main/config/modules/ee9-servlet.mod | 2 +- .../config/modules/ee9-websocket-jakarta.mod | 2 +- 10 files changed, 14 insertions(+), 39 deletions(-) diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod index 746a0a0f3ee5..2eb7bdc37296 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod @@ -21,7 +21,7 @@ ee10-demo-mock-resources [files] basehome:modules/demo.d/ee10-demo-jndi.xml|webapps/ee10-demo-jndi.xml maven://org.eclipse.jetty.ee10.demos/jetty-ee10-demo-jndi-webapp/${jetty.version}/war|webapps/ee10-demo-jndi.war -maven://jakarta.mail/jakarta.mail-api/2.0.0/jar|lib/ee10/jakarta.mail-api-2.0.0.jar +maven://jakarta.mail/jakarta.mail-api/@jakarta.mail.api.version@/jar|lib/ee10/jakarta.mail-api-@jakarta.mail.api.version@.jar [lib] -lib/ee10/jakarta.mail-api-2.0.0.jar +lib/ee10/jakarta.mail-api-@jakarta.mail.api.version@.jar diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod index 26e1e664a998..2191941a9ef0 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod +++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod @@ -11,5 +11,5 @@ server sessions [lib] -lib/jakarta.servlet-api-6.0.0.jar +lib/jakarta.servlet-api-@jakarta.servlet.api.version@.jar lib/jetty-ee10-servlet-${jetty.version}.jar diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod index 714514cc6397..b7387f7fa449 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod @@ -16,8 +16,8 @@ lib/ee10-websocket/jetty-websocket-core-common-${jetty.version}.jar lib/ee10-websocket/jetty-websocket-core-client-${jetty.version}.jar lib/ee10-websocket/jetty-websocket-core-server-${jetty.version}.jar lib/ee10-websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar -lib/ee10-websocket/jakarta.websocket-client-api-2.1.0.jar -lib/ee10-websocket/jakarta.websocket-api-2.1.0.jar +lib/ee10-websocket/jakarta.websocket-client-api-@jakarta.websocket.api.version@.jar +lib/ee10-websocket/jakarta.websocket-api-@jakarta.websocket.api.version@.jar lib/ee10-websocket/jetty-ee10-websocket-jakarta-client-${jetty.version}.jar lib/ee10-websocket/jetty-ee10-websocket-jakarta-common-${jetty.version}.jar lib/ee10-websocket/jetty-ee10-websocket-jakarta-server-${jetty.version}.jar diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml index ccf7e86bb6a2..55152bc07e55 100644 --- a/jetty-ee8/jetty-ee8-home/pom.xml +++ b/jetty-ee8/jetty-ee8-home/pom.xml @@ -46,7 +46,8 @@ copy-dependencies - org.eclipse.jetty.websocket,org.eclipse.jetty.ee8.websocket + org.eclipse.jetty.toolchain,org.eclipse.jetty.websocket,org.eclipse.jetty.ee8.websocket + jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* jar ${assembly-directory}/lib/ee8-websocket @@ -64,31 +65,6 @@ ${source-assembly-directory}/lib/ee8-websocket - - copy-ee8-lib-jakarta-websocket-deps - generate-resources - - copy-dependencies - - - jakarta.websocket - jar - ${assembly-directory}/lib/ee8-websocket - - - - copy-ee8-lib-jakarta-websocket-src-deps - generate-resources - - copy-dependencies - - - jakarta.websocket - jar - sources - ${source-assembly-directory}/lib/ee8-websocket - - copy-lib-servlet-api-deps generate-resources diff --git a/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod b/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod index ecbf0e7b1ff5..b675250f36d0 100644 --- a/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod +++ b/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod @@ -10,8 +10,7 @@ ee8 server sessions -# FIXME should servlet api version be interpolated [lib] -lib/jetty-servlet-api-4.0.6.jar +lib/jetty-servlet-api-@jetty.servlet.api.version@.jar lib/jetty-ee8-nested-${jetty.version}.jar lib/jetty-ee8-servlet-${jetty.version}.jar diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod index 6e5f224529be..e34fd2a8485a 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod @@ -16,7 +16,7 @@ lib/ee8-websocket/jetty-websocket-core-common-${jetty.version}.jar lib/ee8-websocket/jetty-websocket-core-client-${jetty.version}.jar lib/ee8-websocket/jetty-websocket-core-server-${jetty.version}.jar lib/ee8-websocket/jetty-ee8-websocket-servlet-${jetty.version}.jar -lib/ee8-websocket/jetty-jakarta-websocket-api-2.0.0.jar +lib/ee8-websocket/jetty-jakarta-websocket-api-@jakarta.websocket.api.version@.jar lib/ee8-websocket/jetty-ee8-websocket-javax-client-${jetty.version}.jar lib/ee8-websocket/jetty-ee8-websocket-javax-common-${jetty.version}.jar lib/ee8-websocket/jetty-ee8-websocket-jakarta-server-${jetty.version}.jar diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod index 92929333824a..67552a451767 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod @@ -22,7 +22,7 @@ ee9-demo-mock-resources basehome:modules/demo.d/ee9-demo-jndi.xml|webapps/ee9-demo-jndi.xml basehome:modules/demo.d/ee9-demo-jndi.properties|webapps/ee9-demo-jndi.properties maven://org.eclipse.jetty.ee9.demos/jetty-ee9-demo-jndi-webapp/${jetty.version}/war|webapps/ee9-demo-jndi.war -maven://jakarta.mail/jakarta.mail-api/2.0.0/jar|lib/ee9/jakarta.mail-api-2.0.0.jar +maven://jakarta.mail/jakarta.mail-api/@jakarta.mail.api.version@/jar|lib/ee9/jakarta.mail-api-@jakarta.mail.api.version@.jar [lib] -lib/ee9/jakarta.mail-api-2.0.0.jar +lib/ee9/jakarta.mail-api-@jakarta.mail.api.version@.jar diff --git a/jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod b/jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod index d560d24f518a..57e7adcbada6 100644 --- a/jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod +++ b/jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod @@ -12,4 +12,4 @@ ee9-webapp [lib] lib/jetty-ee9-plus-${jetty.version}.jar -lib/jakarta.transaction-api-2.0.1.jar +lib/jakarta.transaction-api-@jakarta.transaction-api.version@.jar diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod b/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod index a42ac376a92e..424fc24ca953 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod +++ b/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod @@ -12,6 +12,6 @@ sessions # FIXME should servlet api version be interpolated [lib] -lib/jetty-jakarta-servlet-api-5.0.2.jar +lib/jetty-jakarta-servlet-api-@jetty.servlet.api.version@.jar lib/jetty-ee9-nested-${jetty.version}.jar lib/jetty-ee9-servlet-${jetty.version}.jar diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod index d09efb7647ff..745348e64f9f 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod @@ -16,7 +16,7 @@ lib/ee9-websocket/jetty-websocket-core-common-${jetty.version}.jar lib/ee9-websocket/jetty-websocket-core-client-${jetty.version}.jar lib/ee9-websocket/jetty-websocket-core-server-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-servlet-${jetty.version}.jar -lib/ee9-websocket/jetty-jakarta-websocket-api-2.0.0.jar +lib/ee9-websocket/jetty-jakarta-websocket-api-@jakarta.websocket.api.version@.jar lib/ee9-websocket/jetty-ee9-websocket-jakarta-client-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jakarta-common-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jakarta-server-${jetty.version}.jar