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

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

Fix outdated bundle vendor
This commit is contained in:
Joakim Erdfelt 2018-10-19 10:45:42 -05:00 committed by GitHub
parent 9e84c1ee93 d048dd321e
commit edc47818e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -68,7 +68,7 @@ public class StartArgs
{ {
ver = ManifestUtils.getManifest(StartArgs.class) ver = ManifestUtils.getManifest(StartArgs.class)
.map(Manifest::getMainAttributes) .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")) .map(attributes -> attributes.getValue("Implementation-Version"))
.orElse(null); .orElse(null);
} }

2
jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java
View File

@ -66,7 +66,7 @@ public class Jetty
Package pkg = Jetty.class.getPackage(); Package pkg = Jetty.class.getPackage();
if (pkg != null && if (pkg != null &&
"Eclipse.org - Jetty".equals(pkg.getImplementationVendor()) && "Eclipse Jetty Project".equals(pkg.getImplementationVendor()) &&
pkg.getImplementationVersion() != null) pkg.getImplementationVersion() != null)
VERSION = pkg.getImplementationVersion(); VERSION = pkg.getImplementationVersion();
else else

4
pom.xml
View File

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