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

fix hardcoding versions in mod files (#8459) 

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
This commit is contained in:
Olivier Lamy 2022-08-13 19:43:07 +10:00 committed by GitHub
parent 21fce4ffb9
commit c011126e63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod
View File

@ -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

2
jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
View File

@ -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

4
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod
View File

@ -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

28
jetty-ee8/jetty-ee8-home/pom.xml
View File

@ -46,7 +46,8 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee8.websocket</includeGroupIds>
<includeGroupIds>org.eclipse.jetty.toolchain,org.eclipse.jetty.websocket,org.eclipse.jetty.ee8.websocket</includeGroupIds>
<excludeArtifactIds>jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core*</excludeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee8-websocket</outputDirectory>
</configuration>
@ -64,31 +65,6 @@
<outputDirectory>${source-assembly-directory}/lib/ee8-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee8-lib-jakarta-websocket-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee8-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee8-lib-jakarta-websocket-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee8-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-servlet-api-deps</id>
<phase>generate-resources</phase>

3
jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod
View File

@ -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

2
jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod
View File

@ -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

4
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod
View File

@ -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

2
jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod
View File

@ -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

2
jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod
View File

@ -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

2
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod
View File

@ -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