Skip to content

Fix OSGi metadata generation to work on JavaSE < 9#1603

Merged
inder123 merged 3 commits intogoogle:masterfrom
briandealwis:i1601
Nov 4, 2019
Merged

Fix OSGi metadata generation to work on JavaSE < 9#1603
inder123 merged 3 commits intogoogle:masterfrom
briandealwis:i1601

Conversation

@briandealwis
Copy link
Copy Markdown
Contributor

@briandealwis briandealwis commented Oct 31, 2019

Fixes #1601 #1602

  • explicitly specifies Require-Capability: osgi.ee for 1.6 or greater to disable bnd's autogeneration which is deceived by the module-info.class file
  • drop the JavaSE 1.5 reference since it hasn't been true for years (Build Gson for Java 1.6. #790)
  • remove the unused org.apache.felix:maven-bundle-plugin plugin reference

Here are the differences in the resulting manifests:

--- gson-manifest-2.8.6	2019-10-31 12:24:51.000000000 -0400
+++ gson-manifest-2.8.7-SNAPSHOT	2019-10-31 11:49:39.000000000 -0400
@@ -1,23 +1,22 @@
 Manifest-Version: 1.0
 Archiver-Version: Plexus Archiver
-Created-By: 11.0.4 (Oracle Corporation)
-Built-By: inder
+Created-By: 11.0.4 (AdoptOpenJDK)
+Built-By: bsd
 Build-Jdk: 11.0.4
-Bnd-LastModified: 1570215293550
+Bnd-LastModified: 1572539070059
 Bundle-ContactAddress: https://github.com/google/gson
 Bundle-Description: Gson JSON library
 Bundle-ManifestVersion: 2
 Bundle-Name: Gson
-Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6, JavaSE-1.7, J
- avaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7, JavaSE-1.8
 Bundle-SymbolicName: com.google.gson
 Bundle-Vendor: Google Gson Project
-Bundle-Version: 2.8.6
+Bundle-Version: 2.8.7.201910311624
 Export-Package: com.google.gson;uses:="com.google.gson.reflect,com.googl
- e.gson.stream";version="2.8.6",com.google.gson.annotations;version="2.8
- .6",com.google.gson.reflect;version="2.8.6",com.google.gson.stream;vers
- ion="2.8.6"
+ e.gson.stream";version="2.8.7",com.google.gson.annotations;version="2.8
+ .7",com.google.gson.reflect;version="2.8.7",com.google.gson.stream;vers
+ ion="2.8.7"
 Import-Package: com.google.gson.annotations
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=9.0))"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.6))"
 Tool: Bnd-4.0.0.201805111645

@briandealwis
Explicitly specify Require-Capability: osgi.ee to require 1.5+
324185e 
Specifying disables bnd's auto-generated value which is determined from
the minimum versions of the .class files, including `module-info.class`
@briandealwis
Drop unused org.apache.felix:maven-bundle-plugin plugin
a73a5f5
@briandealwis
Drop JavaSE-1.5 since that boat sailed a long time ago
186846f
elharo
elharo reviewed Nov 2, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@elharo elharo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test failure might be flaky:

[FATAL] Non-resolvable parent POM for com.google.code.gson:gson-parent:2.8.7-SNAPSHOT: Could not transfer artifact org.sonatype.oss:oss-parent:pom:7 from/to google-maven-central (https://maven-central.storage-download.googleapis.com/repos/central/data/): sun.security.validator.ValidatorException: PKIX path building failed: sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target and 'parent.relativePath' points at wrong local POM @ com.google.code.gson:gson-parent:2.8.7-SNAPSHOT, /home/travis/build/google/gson/pom.xml, line 6, column 11
@

@briandealwis
Copy link
Copy Markdown
Contributor Author

briandealwis commented Nov 2, 2019

Oh! I didn’t receive an email from Travis so I assumed it had passed :-(

@elharo
Copy link
Copy Markdown
Contributor

elharo commented Nov 2, 2019

#1605

@inder123 inder123 merged commit 521fab2 into google:master Nov 4, 2019
@elharo elharo mentioned this pull request Nov 7, 2019
Closed
@chanseokoh chanseokoh mentioned this pull request Nov 8, 2019
Closed
@MrMarkW MrMarkW mentioned this pull request Nov 19, 2019
Closed
@Marcono1234 Marcono1234 mentioned this pull request Feb 3, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@elharo elharo elharo left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla: yes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

OSGi metadata on 2.8.6 requires Java 9 or greater

4 participants

@briandealwis @elharo @inder123 @googlebot