From 9135fd01844efdccd9fa272e55e91cc934269b1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Oct 2026 17:09:00 +0000
Subject: [PATCH 1/3] build(deps): bump
 org.apache.aries.proxy:org.apache.aries.proxy

Bumps [org.apache.aries.proxy:org.apache.aries.proxy](https://github.com/apache/aries) from 1.1.14 to 2.0.0.
- [Release notes](https://github.com/apache/aries/releases)
- [Commits](https://github.com/apache/aries/compare/org.apache.aries.proxy-1.1.14...util-2.0.0)

---
updated-dependencies:
- dependency-name: org.apache.aries.proxy:org.apache.aries.proxy
  dependency-version: 2.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ff314e82deb..607264a257d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -261,7 +261,7 @@
         <aries.jndi.api.version>1.1.0</aries.jndi.api.version>
         <aries.jndi.core.version>1.0.2</aries.jndi.core.version>
         <aries.jndi.url.version>1.1.0</aries.jndi.url.version>
-        <aries.proxy.version>1.1.14</aries.proxy.version>
+        <aries.proxy.version>2.0.0</aries.proxy.version>
         <aries.proxy.api.version>1.1.2</aries.proxy.api.version>
         <aries.spifly.version>1.3.8</aries.spifly.version>
         <aries.subsystem.api.version>2.0.10</aries.subsystem.api.version>

From 3b7a7d751101eaeed52f39065016f306c5442007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Tue, 20 Oct 2026 11:33:58 +0200
Subject: [PATCH 2/3] fix(features): add objenesis bundle required by
 aries-proxy 2.0.0

---
 assemblies/features/standard/src/main/feature/feature.xml | 1 +
 bom/pom.xml                                               | 5 +++++
 pom.xml                                                   | 1 +
 3 files changed, 7 insertions(+)

diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 06bb632a515..12b35e86a3e 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -37,6 +37,7 @@
         <bundle dependency="false" start-level="20">mvn:org.ow2.asm/asm-tree/${asm.version}</bundle>
         <bundle dependency="false" start-level="20">mvn:org.ow2.asm/asm-analysis/${asm.version}</bundle>
         <bundle dependency="false" start-level="20">mvn:org.ow2.asm/asm-commons/${asm.version}</bundle>
+        <bundle dependency="false" start-level="20">mvn:org.objenesis/objenesis/${objenesis.version}</bundle>
         <bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries.proxy.version}</bundle>
     </feature>
 
diff --git a/bom/pom.xml b/bom/pom.xml
index 282e8aee53a..0dc2a9cec8c 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -929,6 +929,11 @@
                 <artifactId>org.apache.aries.proxy</artifactId>
                 <version>${aries.proxy.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.objenesis</groupId>
+                <artifactId>objenesis</artifactId>
+                <version>${objenesis.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>org.apache.aries.util</artifactId>
diff --git a/pom.xml b/pom.xml
index 607264a257d..4c48aeb0535 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,6 +167,7 @@
         <aopalliance.version>1.0</aopalliance.version>
         <aspectj.version>1.9.21.1</aspectj.version>
         <asm.version>9.11.1</asm.version>
+        <objenesis.version>3.6</objenesis.version>
         <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
         <awaitility.version>4.3.0</awaitility.version>
         <bouncycastle.version>1.86</bouncycastle.version>

From 07845fef726952eb83c8d90745b981682fe43bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Fri, 30 Oct 2026 05:43:14 +0100
Subject: [PATCH 3/3] fix(itests): add objenesis bundle to the aries-proxy test
 feature

Keep the itests copy of the aries-proxy feature in sync with the
standard one, as aries-proxy 2.0.0 requires objenesis.
---
 itests/test/src/test/filtered-resources/etc/feature.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/itests/test/src/test/filtered-resources/etc/feature.xml b/itests/test/src/test/filtered-resources/etc/feature.xml
index b4c139af3d0..7a0c9d69ab5 100644
--- a/itests/test/src/test/filtered-resources/etc/feature.xml
+++ b/itests/test/src/test/filtered-resources/etc/feature.xml
@@ -37,6 +37,7 @@
         <bundle dependency="false" start-level="20">mvn:org.ow2.asm/asm-tree/${asm.version}</bundle>
         <bundle dependency="false" start-level="20">mvn:org.ow2.asm/asm-analysis/${asm.version}</bundle>
         <bundle dependency="false" start-level="20">mvn:org.ow2.asm/asm-commons/${asm.version}</bundle>
+        <bundle dependency="false" start-level="20">mvn:org.objenesis/objenesis/${objenesis.version}</bundle>
         <bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries.proxy.version}</bundle>
     </feature>