ARIES-2165: Build proxy on Java 11, 17 and 21

.github/workflows/blueprint.yml

@@ -17,10 +17,10 @@ on:
     paths:
       - parent/**
       - testsupport/**
-      - proxy/**
       - versioning/**
       - util/**
       - quiesce/**
+      - proxy/**
       - blueprint/**
       - .github/workflows/blueprint.yml
   push:
@@ -54,9 +54,6 @@ jobs:
     - name: Build testsupport
       shell: bash
       run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport
-    - name: Build proxy
-      shell: bash
-      run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f proxy
     - name: Build versioning
       shell: bash
       run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning
@@ -66,6 +63,9 @@ jobs:
     - name: Build quiesce
       shell: bash
       run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f quiesce
+    - name: Build proxy
+      shell: bash
+      run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f proxy
     - name: Build blueprint
       shell: bash
       run: mvn -U -e -B -ntp clean install -f blueprint

.github/workflows/proxy.yml

@@ -17,6 +17,8 @@ on:
     paths:
       - parent/**
       - testsupport/**
+      - versioning/**
+      - util/**
       - proxy/**
       - .github/workflows/proxy.yml
   push:
@@ -32,24 +34,36 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8 ]
+        java: [ 8, 11, 17, 21 ]
         os: [ ubuntu-latest ]
     name: JDK${{ matrix.java }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
     - name: Git Checkout
       uses: actions/checkout@v5
-    - name: Set up Java
+    - name: Set up Java 8
       uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
-        java-version: ${{ matrix.java }}
+        java-version: 8
     - name: Build parent
       shell: bash
-      run: mvn -U -e -B -ntp clean install -f parent
+      run: mvn -V -U -e -B -ntp clean install -f parent
     - name: Build testsupport
       shell: bash
-      run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport
+      run: mvn -V -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 -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util
+    - name: Set up Java ${{ matrix.java }}
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+      if: ${{ 8 != matrix.java }}
     - name: Build proxy
       shell: bash
-      run: mvn -U -e -B -ntp clean install -f proxy
+      run: mvn -V -U -e -B -ntp clean install -f proxy

blueprint/itests/blueprint-itests/pom.xml

@@ -57,6 +57,7 @@
         <commons-jexl.version>2.1.1</commons-jexl.version>
         <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
         <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
+        <objenesis.version>3.4</objenesis.version>
         <org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version>
         <org.apache.aries.quiesce.api.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.api.version>
         <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
@@ -108,6 +109,12 @@
             <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>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.spring-context</artifactId>

blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java

@@ -65,6 +65,7 @@ public static Option blueprintBundles(boolean startBlueprint) {
                 mvnBundle("org.apache.felix", "org.apache.felix.configadmin"),
                 mvnBundle("org.ops4j.pax.url", "pax-url-aether"),
                 mvnBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
+                mvnBundle("org.objenesis", "objenesis"),
                 mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
                 mvnBundle("org.apache.commons", "commons-jexl"),
                 mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator"),

jmx/jmx-itests/pom.xml

@@ -41,6 +41,7 @@
         <asm.version>9.9</asm.version>
         <commons-jexl.version>2.1.1</commons-jexl.version>
         <javax.inject.version>1</javax.inject.version>
+        <objenesis.version>3.4</objenesis.version>
         <org.apache.aries.blueprint.jexl.evaluator.version>1.1.1-SNAPSHOT</org.apache.aries.blueprint.jexl.evaluator.version>
         <org.apache.aries.blueprint.sample.version>1.0.1-SNAPSHOT</org.apache.aries.blueprint.sample.version>
         <org.apache.aries.blueprint.version>1.3.0-SNAPSHOT</org.apache.aries.blueprint.version>
@@ -144,6 +145,12 @@
             <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>
+        </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>

jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java

@@ -79,6 +79,7 @@ public Option[] configuration() {
 	protected Option blueprint() {
 		return composite(
 				addAsmBundles(),
+                mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
 				mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
 				mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
 				mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator").versionAsInProject(),

proxy/proxy-api/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
-        <version>2.1.1</version>
+        <version>3.0.0</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -51,18 +51,13 @@
         </aries.osgi.export.pkg>
         <aries.osgi.private.pkg/>
         <lastReleaseVersion>1.1.1</lastReleaseVersion>
-
-        <!-- Skip version check for release 1.1.0 as the plugin does not handle the case
-             of removing a dpendency correctly -->
-        <aries.skip.version.check>true</aries.skip.version.check>
-        <osgi.core.version>4.3.1</osgi.core.version>
+        <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>
-            <version>${osgi.core.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>