From 12a6f6e7c752b0a4d2d2b9f1bce80b6175f598fa Mon Sep 17 00:00:00 2001
From: Dominik Przybysz <alien11689@gmail.com>
Date: Tue, 20 Oct 2026 19:43:56 +0200
Subject: [PATCH] [MAINTENANCE] Set stable quiesce and proxy artifacts versions
 after release

---
 blueprint/blueprint-bundle/pom.xml                 | 10 +++++-----
 blueprint/blueprint-core/pom.xml                   | 12 ++++++------
 blueprint/blueprint-repository/pom.xml             |  8 ++++----
 blueprint/itests/blueprint-itests/pom.xml          |  2 +-
 jmx/jmx-itests/pom.xml                             |  2 +-
 jndi/jndi-url-itest/pom.xml                        | 14 +++++++-------
 .../aries/jndi/itests/JndiUrlIntegrationTest.java  |  2 +-
 jndi/jndi-url/pom.xml                              |  2 +-
 proxy/proxy-impl/pom.xml                           |  2 +-
 quiesce/quiesce-manager/pom.xml                    |  2 +-
 samples/blog/blog-itests/pom.xml                   |  5 +++++
 .../blog/itests/AbstractBlogIntegrationTest.java   |  1 +
 .../blueprint/helloworld/helloworld-itests/pom.xml |  7 ++++++-
 .../helloworld/itests/HelloworldSampleTest.java    |  1 +
 samples/pom.xml                                    | 12 +++++++++---
 subsystem/subsystem-bundle/pom.xml                 |  2 +-
 subsystem/subsystem-itests/pom.xml                 |  2 +-
 transaction/transaction-itests/pom.xml             | 13 ++++++++++---
 .../itests/AbstractIntegrationTest.java            |  4 ++--
 tutorials/pom.xml                                  |  6 +++---
 20 files changed, 67 insertions(+), 42 deletions(-)

diff --git a/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml
index 8b2f5d06c4..30337d43d6 100644
--- a/blueprint/blueprint-bundle/pom.xml
+++ b/blueprint/blueprint-bundle/pom.xml
@@ -108,9 +108,9 @@
         <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version>
         <blueprint.cm.version>1.3.3-SNAPSHOT</blueprint.cm.version>
         <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version>
-        <org.apache.aries.proxy.api.version>1.0.0</org.apache.aries.proxy.api.version>
-        <org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version>
-        <org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version>
+        <org.apache.aries.proxy.api.version>1.1.2</org.apache.aries.proxy.api.version>
+        <org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
+        <org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
         <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version>
         <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
         <slf4j.version>2.0.20</slf4j.version>
@@ -143,8 +143,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy.impl</artifactId>
-            <version>${org.apache.aries.proxy.impl.version}</version>
+            <artifactId>org.apache.aries.proxy</artifactId>
+            <version>${org.apache.aries.proxy.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml
index f32ebbaf33..283e3c3ea3 100644
--- a/blueprint/blueprint-core/pom.xml
+++ b/blueprint/blueprint-core/pom.xml
@@ -99,13 +99,13 @@
         <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version>
         <easymock.version>5.7.0</easymock.version>
         <maven-release-plugin.version>3.3.1</maven-release-plugin.version>
+        <org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
         <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version>
         <org.apache.felix.utils.version>1.11.10</org.apache.felix.utils.version>
         <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
         <osgi.core.version>4.3.1</osgi.core.version>
-        <proxy.api.version>1.1.1</proxy.api.version>
-        <proxy.impl.version>1.1.9</proxy.impl.version>
-        <quiesce.api.version>1.0.0</quiesce.api.version>
+        <org.apache.aries.proxy.api.version>1.1.2</org.apache.aries.proxy.api.version>
+        <org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
         <util.version>2.0.0</util.version>
         <slf4j.version>2.0.20</slf4j.version>
     </properties>
@@ -185,7 +185,7 @@
         <dependency>
             <groupId>org.apache.aries.quiesce</groupId>
             <artifactId>org.apache.aries.quiesce.api</artifactId>
-            <version>${quiesce.api.version}</version>
+            <version>${org.apache.aries.quiesce.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
@@ -196,12 +196,12 @@
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy.api</artifactId>
-            <version>${proxy.api.version}</version>
+            <version>${org.apache.aries.proxy.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy</artifactId>
-            <version>${proxy.impl.version}</version>
+            <version>${org.apache.aries.proxy.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/blueprint/blueprint-repository/pom.xml b/blueprint/blueprint-repository/pom.xml
index 2eb897d0a7..da16a761be 100644
--- a/blueprint/blueprint-repository/pom.xml
+++ b/blueprint/blueprint-repository/pom.xml
@@ -40,8 +40,8 @@
         <blueprint.cm.version>1.3.3-SNAPSHOT</blueprint.cm.version>
         <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version>
         <bnd-indexer-maven-plugin.version>6.4.0</bnd-indexer-maven-plugin.version>
-        <org.apache.aries.proxy.api.version>1.0.1</org.apache.aries.proxy.api.version>
-        <org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version>
+        <org.apache.aries.proxy.api.version>1.1.2</org.apache.aries.proxy.api.version>
+        <org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
         <org.apache.aries.util.version>2.0.0</org.apache.aries.util.version>
     </properties>
 
@@ -100,8 +100,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy.impl</artifactId>
-            <version>${org.apache.aries.proxy.impl.version}</version>
+            <artifactId>org.apache.aries.proxy</artifactId>
+            <version>${org.apache.aries.proxy.version}</version>
         </dependency>
 
         <!-- blueprint -->
diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml
index e108c1e25b..017061f2ce 100644
--- a/blueprint/itests/blueprint-itests/pom.xml
+++ b/blueprint/itests/blueprint-itests/pom.xml
@@ -59,7 +59,7 @@
         <maven-surefire-plugin.version>3.6.0</maven-surefire-plugin.version>
         <objenesis.version>3.6</objenesis.version>
         <org.apache.aries.proxy.version>2.0.1-SNAPSHOT</org.apache.aries.proxy.version>
-        <org.apache.aries.quiesce.api.version>1.0.2-SNAPSHOT</org.apache.aries.quiesce.api.version>
+        <org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
         <org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
         <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
         <org.apache.servicemix.bundles.aopalliance.version>1.0_6</org.apache.servicemix.bundles.aopalliance.version>
diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml
index e13fb3ea90..4e83b122d1 100644
--- a/jmx/jmx-itests/pom.xml
+++ b/jmx/jmx-itests/pom.xml
@@ -52,7 +52,7 @@
         <org.apache.aries.jmx.mbeanserver-platform.version>0.0.2-SNAPSHOT</org.apache.aries.jmx.mbeanserver-platform.version>
         <org.apache.aries.jmx.whiteboard.version>1.2.1-SNAPSHOT</org.apache.aries.jmx.whiteboard.version>
         <org.apache.aries.jmx.version>1.1.6-SNAPSHOT</org.apache.aries.jmx.version>
-        <org.apache.aries.proxy.version>2.0.1-SNAPSHOT</org.apache.aries.proxy.version>
+        <org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
         <org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
         <org.apache.aries.util.version>2.0.0</org.apache.aries.util.version>
         <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
diff --git a/jndi/jndi-url-itest/pom.xml b/jndi/jndi-url-itest/pom.xml
index 3347231d71..6676dea307 100644
--- a/jndi/jndi-url-itest/pom.xml
+++ b/jndi/jndi-url-itest/pom.xml
@@ -52,9 +52,9 @@
         <jndi-url-itest-biz.version>1.0.1-SNAPSHOT</jndi-url-itest-biz.version>
         <jndi-url-itest-web.version>1.0.1-SNAPSHOT</jndi-url-itest-web.version>
         <jndi-url.version>1.1.1-SNAPSHOT</jndi-url.version>
+        <objenesis.version>3.6</objenesis.version>
         <org.apache.aries.util.version>2.0.0</org.apache.aries.util.version>
-        <org.apache.aries.proxy.api.version>1.1.1</org.apache.aries.proxy.api.version>
-        <org.apache.aries.proxy.impl.version>1.1.14</org.apache.aries.proxy.impl.version>
+        <org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
         <org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version>
         <org.apache.aries.blueprint.core.version>1.10.3</org.apache.aries.blueprint.core.version>
         <org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
@@ -141,13 +141,13 @@
 
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy.api</artifactId>
-            <version>${org.apache.aries.proxy.api.version}</version>
+            <artifactId>org.apache.aries.proxy</artifactId>
+            <version>${org.apache.aries.proxy.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy</artifactId>
-            <version>${org.apache.aries.proxy.impl.version}</version>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <version>${objenesis.version}</version>
         </dependency>
 
         <!-- pax exam -->
diff --git a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
index b2de9ab8c5..8ee93d3ec3 100644
--- a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
+++ b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
@@ -162,8 +162,8 @@ public Option[] configuration() {
 
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api").versionAsInProject(),
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core").versionAsInProject(),
-                mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api").versionAsInProject(),
                 mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
+                mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
                 mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
                 mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi").versionAsInProject(),
 
diff --git a/jndi/jndi-url/pom.xml b/jndi/jndi-url/pom.xml
index b6fb14d5b5..37eda1cb91 100644
--- a/jndi/jndi-url/pom.xml
+++ b/jndi/jndi-url/pom.xml
@@ -65,7 +65,7 @@
 
         <jndi-api.version>1.1.1-SNAPSHOT</jndi-api.version>
         <jndi-core.version>1.1.0-SNAPSHOT</jndi-core.version>
-        <org.apache.aries.proxy.api.version>1.1.1</org.apache.aries.proxy.api.version>
+        <org.apache.aries.proxy.api.version>1.1.2</org.apache.aries.proxy.api.version>
         <org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
         <osgi.core.version>8.0.0</osgi.core.version>
         <osgi.cmpn.version>7.0.0</osgi.cmpn.version>
diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml
index 987ecb74e8..5a145e9380 100644
--- a/proxy/proxy-impl/pom.xml
+++ b/proxy/proxy-impl/pom.xml
@@ -75,7 +75,7 @@
         <junit.version>4.13.2</junit.version>
         <mockito-core.version>4.11.0</mockito-core.version>
         <objenesis.version>3.6</objenesis.version>
-        <org.apache.aries.proxy.api.version>1.1.3-SNAPSHOT</org.apache.aries.proxy.api.version>
+        <org.apache.aries.proxy.api.version>1.1.2</org.apache.aries.proxy.api.version>
     </properties>
 
     <dependencies>
diff --git a/quiesce/quiesce-manager/pom.xml b/quiesce/quiesce-manager/pom.xml
index 29f76bb805..166d63af3c 100644
--- a/quiesce/quiesce-manager/pom.xml
+++ b/quiesce/quiesce-manager/pom.xml
@@ -58,7 +58,7 @@
         <org.apache.aries.versioning.plugin.version>0.4.0</org.apache.aries.versioning.plugin.version>
         <lastReleaseVersion>1.0.0</lastReleaseVersion>
 
-        <org.apache.aries.quiesce.api.version>1.0.2-SNAPSHOT</org.apache.aries.quiesce.api.version>
+        <org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
         <org.apache.aries.util.version>2.0.0</org.apache.aries.util.version>
     </properties>
 
diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml
index 2180e4a015..46f858714d 100644
--- a/samples/blog/blog-itests/pom.xml
+++ b/samples/blog/blog-itests/pom.xml
@@ -68,6 +68,11 @@
             <artifactId>org.apache.aries.proxy</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.aries</groupId>
diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java
index 239a38638e..baa69f58b4 100644
--- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java
+++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java
@@ -163,6 +163,7 @@ public Option[] configuration() {
                 mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager").versionAsInProject(),
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
                 mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
+                mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
                 mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
                 mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi").versionAsInProject(),
                 mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api").versionAsInProject(),
diff --git a/samples/blueprint/helloworld/helloworld-itests/pom.xml b/samples/blueprint/helloworld/helloworld-itests/pom.xml
index edad913377..026ad36184 100644
--- a/samples/blueprint/helloworld/helloworld-itests/pom.xml
+++ b/samples/blueprint/helloworld/helloworld-itests/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <cm.version>3.2.0-v20070116</cm.version>
         <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.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
         <org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
         <pax-exam.version>4.13.5</pax-exam.version>
         <pax-logging.version>1.12.12</pax-logging.version>
@@ -72,6 +72,11 @@
             <version>${org.apache.aries.proxy.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.aries</groupId>
diff --git a/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java b/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java
index 24f6f66cab..0e135c8f34 100644
--- a/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java
+++ b/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java
@@ -178,6 +178,7 @@ public static Option[] configuration() {
 
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),
                 mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+                mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
                 mavenBundle("org.apache.aries", "org.apache.aries.util" ),
                 mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
                 mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
diff --git a/samples/pom.xml b/samples/pom.xml
index f5db6c63c3..f033e85da3 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -59,8 +59,8 @@
         <org.apache.aries.jpa.container.context.version>1.0.4</org.apache.aries.jpa.container.context.version>
 
         <!-- Aries Quiesce Versions -->
-        <org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version>
-        <org.apache.aries.quiesce.manager.version>1.0.0</org.apache.aries.quiesce.manager.version>
+        <org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
+        <org.apache.aries.quiesce.manager.version>1.0.1</org.apache.aries.quiesce.manager.version>
 
         <!-- Aries Testsupport Versions -->
         <org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
@@ -113,6 +113,7 @@
         <javax.inject.version>1</javax.inject.version>
         <javax.persistence-api.version>2.2</javax.persistence-api.version>
         <javax.transaction-api.version>1.2</javax.transaction-api.version>
+        <objenesis.version>3.6</objenesis.version>
         <osgi.core.version>8.0.0</osgi.core.version>
         <pax-logging.version>2.2.9</pax-logging.version>
 
@@ -122,7 +123,7 @@
         <org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version>
         <org.apache.aries.blueprint.cm.version>1.3.2</org.apache.aries.blueprint.cm.version>
         <org.apache.aries.blueprint.core.version>1.10.3</org.apache.aries.blueprint.core.version>
-        <org.apache.aries.proxy.version>1.1.14</org.apache.aries.proxy.version>
+        <org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
         <org.apache.aries.util.version>1.1.3</org.apache.aries.util.version>
     </properties>
 
@@ -350,6 +351,11 @@
                 <artifactId>org.apache.aries.proxy</artifactId>
                 <version>${org.apache.aries.proxy.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.objenesis</groupId>
+                <artifactId>objenesis</artifactId>
+                <version>${objenesis.version}</version>
+            </dependency>
             <!-- quiesce -->
             <dependency>
                 <groupId>org.apache.aries.quiesce</groupId>
diff --git a/subsystem/subsystem-bundle/pom.xml b/subsystem/subsystem-bundle/pom.xml
index 867ccf062f..2d2a0f0951 100644
--- a/subsystem/subsystem-bundle/pom.xml
+++ b/subsystem/subsystem-bundle/pom.xml
@@ -63,7 +63,7 @@
 
         <org.apache.aries.subsystem.modeller.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.modeller.version>
         <org.apache.aries.blueprint.version>1.10.4-SNAPSHOT</org.apache.aries.blueprint.version>
-        <org.apache.aries.proxy.version>2.0.1-SNAPSHOT</org.apache.aries.proxy.version>
+        <org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
         <org.apache.aries.subsystem.api.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.api.version>
         <org.apache.aries.subsystem.core.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.core.version>
         <org.apache.aries.util.version>2.0.0</org.apache.aries.util.version>
diff --git a/subsystem/subsystem-itests/pom.xml b/subsystem/subsystem-itests/pom.xml
index 57ff0bf646..fc4477f3e4 100644
--- a/subsystem/subsystem-itests/pom.xml
+++ b/subsystem/subsystem-itests/pom.xml
@@ -46,7 +46,7 @@
         <objenesis.version>3.6</objenesis.version>
         <org.apache.aries.subsystem.modeller.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.modeller.version>
         <org.apache.aries.blueprint.version>1.10.4-SNAPSHOT</org.apache.aries.blueprint.version>
-        <org.apache.aries.proxy.version>2.0.1-SNAPSHOT</org.apache.aries.proxy.version>
+        <org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
         <org.apache.aries.subsystem.api.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.api.version>
         <org.apache.aries.subsystem.core.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.core.version>
         <org.apache.aries.subsystem.itest.interfaces.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.itest.interfaces.version>
diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml
index 9a7e68cd00..d02daeb14c 100644
--- a/transaction/transaction-itests/pom.xml
+++ b/transaction/transaction-itests/pom.xml
@@ -48,9 +48,10 @@
         <javax.el-api.version>3.0.0</javax.el-api.version>
         <javax.interceptor-api.version>1.2.2</javax.interceptor-api.version>
         <javax.transaction-api.version>1.2</javax.transaction-api.version>
+        <objenesis.version>3.6</objenesis.version>
         <org.apache.aries.blueprint.api.version>1.0.0</org.apache.aries.blueprint.api.version>
         <org.apache.aries.blueprint.core.version>1.4.4</org.apache.aries.blueprint.core.version>
-        <org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version>
+        <org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
         <org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
         <org.apache.aries.transaction.blueprint.version>2.3.2-SNAPSHOT</org.apache.aries.transaction.blueprint.version>
         <org.apache.aries.transaction.jdbc.version>2.1.4-SNAPSHOT</org.apache.aries.transaction.jdbc.version>
@@ -84,9 +85,15 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy.impl</artifactId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+            <version>${org.apache.aries.proxy.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <version>${objenesis.version}</version>
             <scope>test</scope>
-            <version>${org.apache.aries.proxy.impl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
diff --git a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
index d448f2fcad..e116d52447 100644
--- a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
+++ b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
@@ -86,8 +86,8 @@ public Option[] configuration() {
                 mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api").versionAsInProject(),
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core").versionAsInProject(),
-                mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api").versionAsInProject(),
-                mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl").versionAsInProject(),
+                mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
+                mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
                 jta12Bundles(),
                 mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager").versionAsInProject(),
                 mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint").versionAsInProject(),
diff --git a/tutorials/pom.xml b/tutorials/pom.xml
index c81cb9c9e9..45385599e5 100644
--- a/tutorials/pom.xml
+++ b/tutorials/pom.xml
@@ -50,9 +50,9 @@
         <jline.version>4.4.8</jline.version>
         <org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version>
         <org.apache.aries.blueprint.core.version>1.10.3</org.apache.aries.blueprint.core.version>
-        <org.apache.aries.proxy.version>1.1.14</org.apache.aries.proxy.version>
-        <org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version>
-        <org.apache.aries.quiesce.manager.version>1.0.0</org.apache.aries.quiesce.manager.version>
+        <org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
+        <org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
+        <org.apache.aries.quiesce.manager.version>1.0.1</org.apache.aries.quiesce.manager.version>
         <org.apache.aries.util.version>1.1.3</org.apache.aries.util.version>
         <org.apache.felix.fileinstall.version>3.7.4</org.apache.felix.fileinstall.version>
         <org.apache.felix.gogo.command.version>1.1.2</org.apache.felix.gogo.command.version>