Skip to content

Change TCK bndrun files to automatically use dependency versions from pom#129

Open
amichair wants to merge 1 commit into
apache:masterfrom
amichair:bndrun-dependency-versions
Open

Change TCK bndrun files to automatically use dependency versions from pom#129
amichair wants to merge 1 commit into
apache:masterfrom
amichair:bndrun-dependency-versions

Conversation

@amichair
Copy link
Copy Markdown
Contributor

I'm not a bnd expert, so please make sure the solution is correct...

osgi.identity;filter:='(osgi.identity=org.osgi.test.cases.remoteserviceadmin)'

-runbundles: \
assertj-core;version='[3.27.7,3.27.8)',\
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can we set here less strict versions? I mean [major.minor,major+1] - this file needs also changes when depdnency version is updated so it may make the update less fragile
also the same in the next file

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

if it works as expected, the runbundles property is rewritten by the bnd maven plugin with the versions from the pom - there shouldn't be any need to change versions manually.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ok, I tested locally - when you set the new version

-        <jaxb.version>4.0.8</jaxb.version>
+        <jaxb.version>4.0.9</jaxb.version>

as in #125
then bndrun files are indeed rewritten, but those are not committed:

diff --git i/itests/tck/tck-tcp-tcp.bndrun w/itests/tck/tck-tcp-tcp.bndrun
index c6b68bf1..9052378b 100644
--- i/itests/tck/tck-tcp-tcp.bndrun
+++ w/itests/tck/tck-tcp-tcp.bndrun
@@ -125,8 +125,6 @@
 -runbundles: \
        assertj-core;version='[3.27.7,3.27.8)',\
        com.sun.istack.commons-runtime;version='[4.2.0,4.2.1)',\
- com.sun.xml.bind.jaxb-core;version='[4.0.8,4.0.9)',\
- com.sun.xml.bind.jaxb-impl;version='[4.0.8,4.0.9)',\
        jakarta.activation-api;version='[2.1.4,2.1.5)',\
        jakarta.xml.bind-api;version='[4.0.5,4.0.6)',\
        net.bytebuddy.byte-buddy;version='[1.18.8,1.18.9)',\
@@ -147,4 +145,6 @@
        org.osgi.service.component;version='[1.5.1,1.5.2)',\
        org.osgi.test.cases.remoteserviceadmin;version='[8.1.0,8.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
- org.osgi.util.promise;version='[1.3.0,1.3.1)'
\ No newline at end of file
+       org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+       com.sun.xml.bind.jaxb-core;version='[4.0.9,4.0.10)',\
+       com.sun.xml.bind.jaxb-impl;version='[4.0.9,4.0.10)'
diff --git i/itests/tck/tck-zookeeper-fastbin.bndrun w/itests/tck/tck-zookeeper-fastbin.bndrun
index ade772c5..a99f443f 100644
--- i/itests/tck/tck-zookeeper-fastbin.bndrun
+++ w/itests/tck/tck-zookeeper-fastbin.bndrun
@@ -161,8 +161,6 @@
        net.bytebuddy.byte-buddy;version='[1.18.8,1.18.9)',\
        jakarta.activation-api;version='[2.1.4,2.1.5)',\
        jakarta.xml.bind-api;version='[4.0.5,4.0.6)',\
- com.sun.xml.bind.jaxb-core;version='[4.0.8,4.0.9)',\
- com.sun.xml.bind.jaxb-impl;version='[4.0.8,4.0.9)',\
        com.sun.istack.commons-runtime;version='[4.2.0,4.2.1)',\
        org.fusesource.hawtbuf.hawtbuf;version='[1.11.0,1.11.1)',\
        org.fusesource.hawtdispatch.hawtdispatch;version='[1.22.0,1.22.1)',\
@@ -181,4 +179,6 @@
        org.apache.aries.rsa.core;version='[2.0.0,2.0.1)',\
        org.apache.aries.rsa.topology-manager;version='[2.0.0,2.0.1)',\
        org.osgi.test.cases.remoteserviceadmin;version='[8.1.0,8.1.1)',\
- org.xerial.snappy.snappy-java;version='[1.1.10,1.1.11)'
+       org.xerial.snappy.snappy-java;version='[1.1.10,1.1.11)',\
+       com.sun.xml.bind.jaxb-core;version='[4.0.9,4.0.10)',\
+       com.sun.xml.bind.jaxb-impl;version='[4.0.9,4.0.10)'

I think we can live with it.
When you merge I will update #125 and #111
You can close after reading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants