Changes from review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Sep 22, 2021 · a63005a · a63005a
1 parent c18d059
commit a63005a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml
@@ -8,9 +8,8 @@
   </parent>
 
   <artifactId>jetty-bom</artifactId>
-  <name>Jetty :: Bom</name>
+  <name>Jetty :: BOM</name>
   <description>Jetty BOM artifact</description>
-  <url>https://eclipse.org/jetty</url>
   <packaging>pom</packaging>
 
   <build>

diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
@@ -300,10 +300,10 @@
                 <artifactItem>
                   <groupId>org.eclipse.jetty.toolchain</groupId>
                   <artifactId>jetty-servlet-api</artifactId>
-                  <version>${jakarta.servlet.api.version}</version>
+                  <version>${jetty.servlet.api.version}</version>
                   <overWrite>true</overWrite>
                   <outputDirectory>${assembly-directory}/lib</outputDirectory>
-                  <destFileName>jetty-servlet-api-${jakarta.servlet.api.version}.jar</destFileName>
+                  <destFileName>jetty-servlet-api-${jetty.servlet.api.version}.jar</destFileName>
                 </artifactItem>
               </artifactItems>
             </configuration>

diff --git 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
@@ -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
@@ -73,8 +73,8 @@
             compilation time. -->
             <_nouses>true</_nouses>
             <Import-Package>
-              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,