FELIX-6708 upgrade bnd to 7.0.0 #322

paulrutter · 2024-05-25T16:44:29Z

See https://issues.apache.org/jira/browse/FELIX-6708 and bndtools/bnd#2227 (comment)

To be able to handle Multi-Release jars as dependencies in an OSGi bundle.
This prevents exceptions like:

build	24-May-2024 18:40:01	[ERROR] Bundle com.abc:jersey-bundle:bundle:55.0-SNAPSHOT : Classes found in the wrong directory: {META-INF/versions/21/org/glassfish/jersey/innate/VirtualThreadSupport$NonLoomishExecutors.class=org.glassfish.jersey.innate.VirtualThreadSupport$NonLoomishExecutors, META-INF/versions/21/org/glassfish/jersey/innate/virtual/LoomishExecutors.class=org.glassfish.jersey.innate.virtual.LoomishExecutors, META-INF/versions/21/org/glassfish/jersey/innate/VirtualThreadSupport$Java21LoomishExecutors.class=org.glassfish.jersey.innate.VirtualThreadSupport$Java21LoomishExecutors, META-INF/versions/21/org/glassfish/jersey/innate/VirtualThreadSupport.class=org.glassfish.jersey.innate.VirtualThreadSupport}

To be able to handle Multi-Release jars as dependencies in an OSGi bundle. This prevents exceptions like: ``` build 24-May-2024 18:40:01 [ERROR] Bundle com.abc:jersey-bundle:bundle:55.0-SNAPSHOT : Classes found in the wrong directory: {META-INF/versions/21/org/glassfish/jersey/innate/VirtualThreadSupport$NonLoomishExecutors.class=org.glassfish.jersey.innate.VirtualThreadSupport$NonLoomishExecutors, META-INF/versions/21/org/glassfish/jersey/innate/virtual/LoomishExecutors.class=org.glassfish.jersey.innate.virtual.LoomishExecutors, META-INF/versions/21/org/glassfish/jersey/innate/VirtualThreadSupport$Java21LoomishExecutors.class=org.glassfish.jersey.innate.VirtualThreadSupport$Java21LoomishExecutors, META-INF/versions/21/org/glassfish/jersey/innate/VirtualThreadSupport.class=org.glassfish.jersey.innate.VirtualThreadSupport} ```

Update to java 17 as thats required by bnd

Revert unneeded change

paulrutter · 2024-05-25T18:54:19Z

Probably this code can be removed now as well, as bnd can handle it.

felix-dev/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

Line 2236 in 6bb228d

    
           protected static void includeJava9Fixups(MavenProject currentProject, Analyzer analyzer)

It suppresses the errors as warnings via fixupmessages.
This didn’t work for me due to having this line in a parent pom.xml:

<_fixupmessages>^Classes found in the wrong directory: \{META-INF/versions/(9|10|11|12)/</_fixupmessages>

It didn’t cover java 21. Still, it would be nice to move to 7.0.0 as it claims to support multi release jars properly.

paulrutter · 2024-05-30T12:11:28Z

Two integration tests fail still, but one of these also failed on 6.3.1.

[INFO] Building: existing-metadata-no-update\pom.xml
[INFO] run pre-build script prebuild.groovy
[INFO] run post-build script verify.groovy
[INFO]   The post-build script did not succeed. assert manifest.isEmpty()
       |        |
       |        false
       Manifest-Version: 1.0
       Bnd-LastModified: 1717071194581
       Build-Jdk-Spec: 21
       Bundle-Description: This project has been built before (i.e. a cache fil
        e is there), the current pom.xml has not been touched, nor any of the b
        uilt files
       Bundle-DocURL: https://wcm.io
       Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
       Bundle-ManifestVersion: 2
       Bundle-Name: existing-metadata-no-update
       Bundle-SymbolicName: org.apache.felix.bundleits.existing-metadata-no-upd
        ate
       Bundle-Vendor: wcm.io
       Bundle-Version: 1.0.0.SNAPSHOT
       Created-By: Apache Maven Bundle Plugin 5.1.10-SNAPSHOT
       Tool: Bnd-7.0.0.202310060912
[INFO]           existing-metadata-no-update\pom.xml .............. FAILED (28.9 s)
[INFO] Building: no-test-scoped-imports\pom.xml
[INFO] run post-build script verify.groovy
[INFO]   The post-build script did not succeed. Import-Package instruction contains version number from test dependency
[INFO]           no-test-scoped-imports\pom.xml ................... FAILED (8.2 s)

paulrutter · 2024-06-02T07:52:11Z

@hboutemy @rotty3000 any feedback on this pr, as you both worked on upgrading bnd last time it was upgraded.

rotty3000

LGTM

paulrutter · 2024-06-03T15:39:38Z

What do you think about the failing Integration tests?

rotty3000 · 2024-06-03T16:17:43Z

@paulrutter do this to fix the test:

diff --git a/tools/maven-bundle-plugin/src/it/no-test-scoped-imports/pom.xml b/tools/maven-bundle-plugin/src/it/no-test-scoped-imports/pom.xml
index 3a15568ced..2eedf2350c 100644
--- a/tools/maven-bundle-plugin/src/it/no-test-scoped-imports/pom.xml
+++ b/tools/maven-bundle-plugin/src/it/no-test-scoped-imports/pom.xml
@@ -53,6 +53,11 @@ under the License.
                 <artifactId>maven-bundle-plugin</artifactId>
                 <version>@project.version@</version>
                 <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <_noimportjava>true</_noimportjava>
+                    </instructions>
+                </configuration>
             </plugin>
         </plugins>
     </build>

rotty3000 · 2024-06-03T16:20:02Z

In fact, @paulrutter if you want to preserve the original behaviour of maven-bundle-plugin not to import java.* you may wish to set that bnd flag default to true such that users opt-in by setting it to false.

ref: https://bnd.bndtools.org/instructions/noimportjava.html

laeubi · 2024-06-03T16:24:03Z

I think java packages should simply be always imported, I don't see a reason to disable that, especially as its the default for bnd.

rotty3000 · 2024-06-03T16:30:25Z

whatever you prefer! 🤷🏻

paulrutter · 2024-06-03T17:25:08Z

Great, i will adjust the PR and rerun the tests with that instruction.

+ <configuration> + <instructions> + <_noimportjava>true</_noimportjava> + </instructions> + </configuration>

paulrutter · 2024-06-04T07:07:49Z

The only IT still failing was also failing with bnd 6.3.1.

[INFO] --- invoker:3.2.1:run (integration-test) @ maven-bundle-plugin ---
[INFO] Building: archiver\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           archiver\pom.xml ................................. SUCCESS (13.3 s)
[INFO] Building: dep-reduced\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           dep-reduced\pom.xml .............................. SUCCESS (4.9 s)
[INFO] Building: embed-multiple-artifacts\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           embed-multiple-artifacts\pom.xml ................. SUCCESS (4.4 s)
[INFO] Building: existing-metadata-no-update\pom.xml
[INFO] run pre-build script prebuild.groovy
[INFO] run post-build script verify.groovy
[INFO]   The post-build script did not succeed. assert manifest.isEmpty()
       |        |
       |        false
       Manifest-Version: 1.0
       Bnd-LastModified: 1717484827643
       Build-Jdk-Spec: 21
       Bundle-Description: This project has been built before (i.e. a cache fil
        e is there), the current pom.xml has not been touched, nor any of the b
        uilt files
       Bundle-DocURL: https://wcm.io
       Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
       Bundle-ManifestVersion: 2
       Bundle-Name: existing-metadata-no-update
       Bundle-SymbolicName: org.apache.felix.bundleits.existing-metadata-no-upd
        ate
       Bundle-Vendor: wcm.io
       Bundle-Version: 1.0.0.SNAPSHOT
       Created-By: Apache Maven Bundle Plugin 5.1.10-SNAPSHOT
       Tool: Bnd-7.0.0.202310060912
[INFO]           existing-metadata-no-update\pom.xml .............. FAILED (28.2 s)
[INFO] Building: no-test-scoped-imports\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           no-test-scoped-imports\pom.xml ................... SUCCESS (7.9 s)
[INFO] Building: reproducible\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           reproducible\pom.xml ............................. SUCCESS (2.9 s)
[INFO] Building: reproducible-manifest\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           reproducible-manifest\pom.xml .................... SUCCESS (5.7 s)

paulrutter · 2024-06-04T08:51:48Z

I think we should update the major version when we release this, due to the minimum jvm version updated to 17.

laeubi · 2024-06-04T08:59:34Z

I think we should update the major version when we release this, due to the minimum jvm version updated to 17.

bnd major update > felix major update regardless of java version (but plugin minium java version must be set to 17 then)

…proper manifest is created with bnd 7.0.0

rotty3000 · 2024-06-04T13:25:39Z

The only IT still failing was also failing with bnd 6.3.1.

[INFO] --- invoker:3.2.1:run (integration-test) @ maven-bundle-plugin ---
[INFO] Building: archiver\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           archiver\pom.xml ................................. SUCCESS (13.3 s)
[INFO] Building: dep-reduced\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           dep-reduced\pom.xml .............................. SUCCESS (4.9 s)
[INFO] Building: embed-multiple-artifacts\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           embed-multiple-artifacts\pom.xml ................. SUCCESS (4.4 s)
[INFO] Building: existing-metadata-no-update\pom.xml
[INFO] run pre-build script prebuild.groovy
[INFO] run post-build script verify.groovy
[INFO]   The post-build script did not succeed. assert manifest.isEmpty()
       |        |
       |        false
       Manifest-Version: 1.0
       Bnd-LastModified: 1717484827643
       Build-Jdk-Spec: 21
       Bundle-Description: This project has been built before (i.e. a cache fil
        e is there), the current pom.xml has not been touched, nor any of the b
        uilt files
       Bundle-DocURL: https://wcm.io
       Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
       Bundle-ManifestVersion: 2
       Bundle-Name: existing-metadata-no-update
       Bundle-SymbolicName: org.apache.felix.bundleits.existing-metadata-no-upd
        ate
       Bundle-Vendor: wcm.io
       Bundle-Version: 1.0.0.SNAPSHOT
       Created-By: Apache Maven Bundle Plugin 5.1.10-SNAPSHOT
       Tool: Bnd-7.0.0.202310060912
[INFO]           existing-metadata-no-update\pom.xml .............. FAILED (28.2 s)
[INFO] Building: no-test-scoped-imports\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           no-test-scoped-imports\pom.xml ................... SUCCESS (7.9 s)
[INFO] Building: reproducible\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           reproducible\pom.xml ............................. SUCCESS (2.9 s)
[INFO] Building: reproducible-manifest\pom.xml
[INFO] run post-build script verify.groovy
[INFO]           reproducible-manifest\pom.xml .................... SUCCESS (5.7 s)

I did not get this failure when I locally ran the IT tests on your branch yesterday. Could someone else maybe confirm?

paulrutter · 2024-06-04T13:27:01Z

Maybe it's platform related? I'm running on a Windows 11 based machine.

rotty3000 · 2024-06-04T13:39:17Z

Maybe it's platform related? I'm running on a Windows 11 based machine.

.. and I'm running on Ubuntu Linux. Bnd has often had weird windows issues because it's the least tests platform.

paulrutter · 2024-06-04T13:42:11Z

If you don't see the failing test, then i'd say we're good to go.

rotty3000 · 2024-06-04T14:09:29Z

Perhaps you can confirm that src/it/existing-metadata-no-update/prebuild.groovy is actually updating the lastmodified time in Windows. (setLastModified returns a boolean). It could be a windows file locking thing since the file was just written from src to target for the sake of the tests.

paulrutter · 2024-06-04T14:13:02Z

I printed the return value of setLastModified and it returns true:

Running pre-build script: C:\git\felix-dev\tools\maven-bundle-plugin\target\it\existing-metadata-no-update\prebuild.groovy
true

rotty3000 · 2024-06-04T14:15:56Z

.. just a hunch. There are any number of issues it might be. but I just ran again and didn't see that failure. It would be nice if someone else confirmed one way or the other. Barring that, I think you could merge.

paulrutter · 2024-06-04T14:17:34Z

I don't have the power to merge though ;)
And someone should create a release for this, updating the major version as well.

paulrutter · 2024-06-10T14:41:12Z

@tjwatson @cziegeler any feedback on this PR?

paulrutter added 5 commits May 8, 2024 18:31

Update pom.xml

969a5d3

Merge branch 'apache:master' into master

1f1316a

Update pom.xml

93b43b7

Update to java 17 as thats required by bnd

Update pom.xml

efc79a7

Revert unneeded change

paulrutter mentioned this pull request May 25, 2024

3.1.7 OSGi bundle issue eclipse-ee4j/jersey#5661

Closed

paulrutter changed the title ~~FELIX-6708 upgrade bnd~~ FELIX-6708 upgrade bnd to 7.0.0 May 25, 2024

paulrutter added 3 commits May 25, 2024 22:14

Remove fixupmessages

065c1cc

Remove fixup test

6267785

Fix error with conversion

3d7a035

rotty3000 approved these changes Jun 3, 2024

View reviewed changes

Add noimportjava instruction

15ac258

+ <configuration> + <instructions> + <_noimportjava>true</_noimportjava> + </instructions> + </configuration>

paulrutter requested a review from rotty3000 June 4, 2024 08:51

Add integration test that includes multi-release jar and validates a …

f77d087

…proper manifest is created with bnd 7.0.0

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FELIX-6708 upgrade bnd to 7.0.0 #322

FELIX-6708 upgrade bnd to 7.0.0 #322

paulrutter commented May 25, 2024 •

edited

Loading

paulrutter commented May 25, 2024 •

edited

Loading

paulrutter commented May 30, 2024 •

edited

Loading

paulrutter commented Jun 2, 2024

rotty3000 left a comment

paulrutter commented Jun 3, 2024

rotty3000 commented Jun 3, 2024

rotty3000 commented Jun 3, 2024

laeubi commented Jun 3, 2024

rotty3000 commented Jun 3, 2024

paulrutter commented Jun 3, 2024

paulrutter commented Jun 4, 2024

paulrutter commented Jun 4, 2024

laeubi commented Jun 4, 2024

rotty3000 commented Jun 4, 2024

paulrutter commented Jun 4, 2024

rotty3000 commented Jun 4, 2024

paulrutter commented Jun 4, 2024

rotty3000 commented Jun 4, 2024

paulrutter commented Jun 4, 2024

rotty3000 commented Jun 4, 2024

paulrutter commented Jun 4, 2024 •

edited

Loading

paulrutter commented Jun 10, 2024

FELIX-6708 upgrade bnd to 7.0.0 #322

Are you sure you want to change the base?

FELIX-6708 upgrade bnd to 7.0.0 #322

Conversation

paulrutter commented May 25, 2024 • edited Loading

paulrutter commented May 25, 2024 • edited Loading

paulrutter commented May 30, 2024 • edited Loading

paulrutter commented Jun 2, 2024

rotty3000 left a comment

Choose a reason for hiding this comment

paulrutter commented Jun 3, 2024

rotty3000 commented Jun 3, 2024

rotty3000 commented Jun 3, 2024

laeubi commented Jun 3, 2024

rotty3000 commented Jun 3, 2024

paulrutter commented Jun 3, 2024

paulrutter commented Jun 4, 2024

paulrutter commented Jun 4, 2024

laeubi commented Jun 4, 2024

rotty3000 commented Jun 4, 2024

paulrutter commented Jun 4, 2024

rotty3000 commented Jun 4, 2024

paulrutter commented Jun 4, 2024

rotty3000 commented Jun 4, 2024

paulrutter commented Jun 4, 2024

rotty3000 commented Jun 4, 2024

paulrutter commented Jun 4, 2024 • edited Loading

paulrutter commented Jun 10, 2024

paulrutter commented May 25, 2024 •

edited

Loading

paulrutter commented May 25, 2024 •

edited

Loading

paulrutter commented May 30, 2024 •

edited

Loading

paulrutter commented Jun 4, 2024 •

edited

Loading