Merge pull request #2899 from quaff/jetty-9.4.x

Fix outdated bundle vendor
jetty · Oct 19, 2018 · edc4781 · edc4781
2 parents 9e84c1e + d048dd3
commit edc4781
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -68,7 +68,7 @@ public class StartArgs
         {
             ver = ManifestUtils.getManifest(StartArgs.class)
                     .map(Manifest::getMainAttributes)
-                    .filter(attributes -> "Eclipse.org - Jetty".equals(attributes.getValue("Implementation-Vendor")))
+                    .filter(attributes -> "Eclipse Jetty Project".equals(attributes.getValue("Implementation-Vendor")))
                     .map(attributes -> attributes.getValue("Implementation-Version"))
                     .orElse(null);
         }

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java
@@ -66,7 +66,7 @@ public class Jetty
 
         Package pkg = Jetty.class.getPackage();
         if (pkg != null &&
-                "Eclipse.org - Jetty".equals(pkg.getImplementationVendor()) &&
+                "Eclipse Jetty Project".equals(pkg.getImplementationVendor()) &&
                 pkg.getImplementationVersion() != null)
             VERSION = pkg.getImplementationVersion();
         else

diff --git a/pom.xml b/pom.xml
@@ -309,7 +309,7 @@
                   <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
                   <Bundle-Name>${project.name}</Bundle-Name>
                   <Bundle-SymbolicName>${bundle-symbolic-name}.source</Bundle-SymbolicName>
-                  <Bundle-Vendor>Eclipse.org - Jetty</Bundle-Vendor>
+                  <Bundle-Vendor>Eclipse Jetty Project</Bundle-Vendor>
                   <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
                   <Eclipse-SourceBundle>${bundle-symbolic-name};version="${parsedVersion.osgiVersion}";roots:="."</Eclipse-SourceBundle>
                 </manifestEntries>
@@ -490,7 +490,7 @@
               <manifestEntries>
                 <Automatic-Module-Name>${jpms-module-name}</Automatic-Module-Name>
                 <Implementation-Version>${project.version}</Implementation-Version>
-                <Implementation-Vendor>Eclipse.org - Jetty</Implementation-Vendor>
+                <Implementation-Vendor>Eclipse Jetty Project</Implementation-Vendor>
                 <url>${jetty.url}</url>
               </manifestEntries>
             </archive>