From cd7138131e4f9825c3951059011c337cd95e5a8b Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 12 Sep 2018 10:50:32 +0800 Subject: [PATCH] Fix outdated bundle vendor Signed-off-by: Yanming Zhou --- .../src/main/java/org/eclipse/jetty/start/StartArgs.java | 2 +- jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 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 index 89eeebf0a79..5bf6c404d89 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java @@ -60,7 +60,7 @@ public class StartArgs if (ver == null) { Package pkg = StartArgs.class.getPackage(); - if ((pkg != null) && "Eclipse.org - Jetty".equals(pkg.getImplementationVendor()) && (pkg.getImplementationVersion() != null)) + if ((pkg != null) && "Eclipse Jetty Project".equals(pkg.getImplementationVendor()) && (pkg.getImplementationVersion() != null)) { ver = pkg.getImplementationVersion(); if (tag == 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 index 56a4d4e28ef..d9636250e44 100644 --- 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 index ef3fcf75261..377b426c387 100644 --- a/pom.xml +++ b/pom.xml @@ -307,7 +307,7 @@ 2 ${project.name} ${bundle-symbolic-name}.source - Eclipse.org - Jetty + Eclipse Jetty Project ${parsedVersion.osgiVersion} ${bundle-symbolic-name};version="${parsedVersion.osgiVersion}";roots:="." @@ -494,7 +494,7 @@ ${project.build.outputDirectory}/META-INF/MANIFEST.MF ${project.version} - Eclipse.org - Jetty + Eclipse Jetty Project ${jetty.url}