diff --git a/.github/workflows/jndi.yml b/.github/workflows/jndi.yml
index ea93f2d66a..c0b3d59a8e 100644
--- a/.github/workflows/jndi.yml
+++ b/.github/workflows/jndi.yml
@@ -17,6 +17,7 @@ on:
     paths:
       - parent/**
       - testsupport/**
+      - versioning/**
       - util/**
       - jndi/**
       - .github/workflows/jndi.yml
@@ -51,6 +52,9 @@ jobs:
     - name: Build testsupport
       shell: bash
       run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport
+    - name: Build versioning
+      shell: bash
+      run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning
     - name: Build util
       shell: bash
       run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f util
diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml
index 216db4fa0d..7f09736fbd 100644
--- a/jmx/jmx-itests/pom.xml
+++ b/jmx/jmx-itests/pom.xml
@@ -55,7 +55,7 @@
         <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
         <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
         <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
+        <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
         <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
         <pax-exam.version>4.13.5</pax-exam.version>
         <pax-tinybundles.version>2.1.1</pax-tinybundles.version>
diff --git a/jmx/jmx-whiteboard/pom.xml b/jmx/jmx-whiteboard/pom.xml
index a708507cfb..d4666c11f5 100644
--- a/jmx/jmx-whiteboard/pom.xml
+++ b/jmx/jmx-whiteboard/pom.xml
@@ -85,7 +85,7 @@
         <mockito-core.version>4.11.0</mockito-core.version>
         <org.apache.aries.jmx.core.version>1.1.9-SNAPSHOT</org.apache.aries.jmx.core.version>
         <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
+        <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
         <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
         <osgi.core.version>4.3.1</osgi.core.version>
         <pax-exam.version>4.13.5</pax-exam.version>
diff --git a/jndi/jndi-url-itest/pom.xml b/jndi/jndi-url-itest/pom.xml
index 5bbef0701b..a5bf21759d 100644
--- a/jndi/jndi-url-itest/pom.xml
+++ b/jndi/jndi-url-itest/pom.xml
@@ -60,7 +60,7 @@
         <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
         <org.apache.felix.fileinstall.version>3.7.4</org.apache.felix.fileinstall.version>
         <org.apache.servicemix.bundles.cglib.version>3.3.0_1</org.apache.servicemix.bundles.cglib.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
+        <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
         <osgi.core.version>8.0.0</osgi.core.version>
         <osgi.cmpn.version>7.0.0</osgi.cmpn.version>
         <pax-exam.version>4.13.5</pax-exam.version>
diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml
index 2fc6d53445..16a88842fd 100644
--- a/proxy/proxy-itests/pom.xml
+++ b/proxy/proxy-itests/pom.xml
@@ -50,7 +50,7 @@
         <org.apache.aries.proxy.api.version>1.1.2-SNAPSHOT</org.apache.aries.proxy.api.version>
         <org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version>
         <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
+        <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
         <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
         <pax-exam.version>4.13.5</pax-exam.version>
         <pax-logging.version>2.2.9</pax-logging.version>
diff --git a/quiesce/quiesce-manager-itest/pom.xml b/quiesce/quiesce-manager-itest/pom.xml
index b701ff239d..e1895b1475 100644
--- a/quiesce/quiesce-manager-itest/pom.xml
+++ b/quiesce/quiesce-manager-itest/pom.xml
@@ -46,7 +46,7 @@
         <org.apache.aries.quiesce.manager.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.manager.version>
         <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
         <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
+        <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
         <pax-exam.version>4.13.5</pax-exam.version>
         <pax-url.version>2.6.16</pax-url.version>
     </properties>
diff --git a/samples/ariestrader/assemblies/equinox-test-harness/pom.xml b/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
index bc5d740345..dcf3c1962c 100644
--- a/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
+++ b/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
@@ -31,7 +31,6 @@
 
     <properties>
         <org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
     </properties>
 
     <dependencies>
@@ -42,7 +41,6 @@
         <dependency>
             <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
-            <version>${org.eclipse.osgi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml
index 2ed8504f57..bff464af68 100644
--- a/samples/blog/blog-itests/pom.xml
+++ b/samples/blog/blog-itests/pom.xml
@@ -34,7 +34,6 @@
         <java.source.version>8</java.source.version>
 
         <commons-dbcp.version>1.4</commons-dbcp.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
         <pax-exam.version>4.13.5</pax-exam.version>
         <pax-swissbox.version>1.7.0</pax-swissbox.version>
         <pax-tinybundles.version>2.0.0</pax-tinybundles.version>
@@ -47,7 +46,6 @@
         <dependency>
             <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
-            <version>${org.eclipse.osgi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/samples/blueprint/helloworld/helloworld-assembly/pom.xml b/samples/blueprint/helloworld/helloworld-assembly/pom.xml
index 25fd7e8c6d..1ff3207530 100644
--- a/samples/blueprint/helloworld/helloworld-assembly/pom.xml
+++ b/samples/blueprint/helloworld/helloworld-assembly/pom.xml
@@ -31,14 +31,12 @@
     <properties>
         <cm.version>3.2.0-v20070116</cm.version>
         <org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
-            <version>${org.eclipse.osgi.version}</version>
         </dependency>
 
         <dependency>
diff --git a/samples/blueprint/helloworld/helloworld-itests/pom.xml b/samples/blueprint/helloworld/helloworld-itests/pom.xml
index 37ed57c02f..cef79bc551 100644
--- a/samples/blueprint/helloworld/helloworld-itests/pom.xml
+++ b/samples/blueprint/helloworld/helloworld-itests/pom.xml
@@ -36,7 +36,6 @@
         <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
         <org.apache.aries.proxy.version>1.0.0</org.apache.aries.proxy.version>
         <org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
         <pax-exam.version>4.13.5</pax-exam.version>
         <pax-logging.version>1.12.12</pax-logging.version>
         <pax-url.version>2.6.16</pax-url.version>
@@ -46,7 +45,6 @@
         <dependency>
             <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
-            <version>${org.eclipse.osgi.version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/samples/pom.xml b/samples/pom.xml
index 0351ae66b3..e1c1e264f1 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -78,6 +78,7 @@
         <commons-lang.version>2.6</commons-lang.version>
         <commons-pool.version>1.6</commons-pool.version>
         <org.apache.servicemix.bundles.serp.version>1.15.1_1</org.apache.servicemix.bundles.serp.version>
+        <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
 
         <openjpa.version>2.2.2</openjpa.version>
         <geronimo-jpa_2.0_spec.version>1.1</geronimo-jpa_2.0_spec.version>
@@ -419,6 +420,12 @@
                 <version>${javax.annotation-api.version}</version>
                 <scope>provided</scope>
             </dependency>
+
+            <dependency>
+                <groupId>org.eclipse.platform</groupId>
+                <artifactId>org.eclipse.osgi</artifactId>
+                <version>${org.eclipse.osgi.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml
index 33c54c0ad1..6b367de827 100644
--- a/transaction/transaction-itests/pom.xml
+++ b/transaction/transaction-itests/pom.xml
@@ -61,7 +61,7 @@
         <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
         <org.apache.felix.coordinator.version>1.0.2</org.apache.felix.coordinator.version>
         <org.apache.servicemix.bundles.javax-inject.version>1_3</org.apache.servicemix.bundles.javax-inject.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
+        <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
         <osgi.core.version>6.0.0</osgi.core.version>
         <pax-swissbox.version>1.8.3</pax-swissbox.version>
         <pax-exam.version>4.13.5</pax-exam.version>
diff --git a/tutorials/pom.xml b/tutorials/pom.xml
index 0129ee159f..54efadf9e5 100644
--- a/tutorials/pom.xml
+++ b/tutorials/pom.xml
@@ -59,7 +59,7 @@
         <org.apache.felix.gogo.jline.version>1.1.8</org.apache.felix.gogo.jline.version>
         <org.apache.felix.gogo.runtime.version>1.1.6</org.apache.felix.gogo.runtime.version>
         <org.eclipse.equinox.console.version>1.4.1000</org.eclipse.equinox.console.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
+        <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
         <org.osgi.version>3.0.0</org.osgi.version>
         <pax-logging.version>2.2.9</pax-logging.version>
     </properties>
diff --git a/util/pom.xml b/util/pom.xml
index 52d641e0a6..bde245c974 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -66,7 +66,7 @@
 
         <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
         <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
+        <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
     </properties>
 
     <dependencies>
diff --git a/web/web-itests/pom.xml b/web/web-itests/pom.xml
index c7e139613a..95d0a468c2 100644
--- a/web/web-itests/pom.xml
+++ b/web/web-itests/pom.xml
@@ -49,7 +49,7 @@
         <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
         <org.apache.aries.web.urlhandler.version>1.0.1-SNAPSHOT</org.apache.aries.web.urlhandler.version>
         <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
-        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
+        <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
         <pax-exam.version>4.13.5</pax-exam.version>
         <pax-tinybundles.version>2.1.1</pax-tinybundles.version>
         <pax-url.version>2.6.16</pax-url.version>