FELIX-6759 Follow-up: Make the remaining module builds work on modern JDKs

.github/workflows/maven-ci.yml

@@ -14,6 +14,13 @@ on:
       - 'gogo/**'
       - 'framework.tck/**'
       - 'main/**'
+      - 'utils/**'
+      - 'connect/**'
+      - 'resolver/**'
+      - 'bundlerepository/**'
+      - 'log.extension/**'
+      - 'examples/**'
+      - 'configadmin/**'
   pull_request:
     branches: [ "master", "feature/**", "maintenance/**" ]
     paths:
@@ -27,6 +34,13 @@ on:
       - 'gogo/**'
       - 'framework.tck/**'
       - 'main/**'
+      - 'utils/**'
+      - 'connect/**'
+      - 'resolver/**'
+      - 'bundlerepository/**'
+      - 'log.extension/**'
+      - 'examples/**'
+      - 'configadmin/**'
 
 # Cancel superseded runs when a branch is pushed again. github.head_ref is only set
 # for pull_request events, so pushes to master fall back to the unique run_id and are
@@ -80,6 +94,20 @@ jobs:
             - 'gogo/**'
           main:
             - 'main/**'
+          configadmin:
+            - 'configadmin/**'
+          utils:
+            - 'utils/**'
+          connect:
+            - 'connect/**'
+          resolver:
+            - 'resolver/**'
+          bundlerepository:
+            - 'bundlerepository/**'
+          logextension:
+            - 'log.extension/**'
+          examples:
+            - 'examples/**'
     - name: Felix SCR
       if: steps.changes.outputs.scr == 'true'
       run: mvn -B -V -Dstyle.color=always --file scr/pom.xml clean verify
@@ -114,6 +142,27 @@ jobs:
     - name: Felix Gogo Shell
       if: steps.changes.outputs.gogo == 'true'
       run: mvn -B -V -Dstyle.color=always --file gogo/pom.xml clean verify
+    - name: Felix utils
+      if: steps.changes.outputs.utils == 'true'
+      run: mvn -B -V -Dstyle.color=always --file utils/pom.xml clean verify
+    - name: Felix connect
+      if: steps.changes.outputs.connect == 'true'
+      run: mvn -B -V -Dstyle.color=always --file connect/pom.xml clean verify
+    - name: Felix resolver
+      if: steps.changes.outputs.resolver == 'true'
+      run: mvn -B -V -Dstyle.color=always --file resolver/pom.xml clean verify
+    - name: Felix bundlerepository
+      if: steps.changes.outputs.bundlerepository == 'true'
+      run: mvn -B -V -Dstyle.color=always --file bundlerepository/pom.xml clean verify
+    - name: Felix log.extension
+      if: steps.changes.outputs.logextension == 'true'
+      run: mvn -B -V -Dstyle.color=always --file log.extension/pom.xml clean verify
+    - name: Felix examples
+      if: steps.changes.outputs.examples == 'true'
+      run: mvn -B -V -Dstyle.color=always --file examples/pom.xml clean verify
+    - name: Felix Config Admin
+      if: steps.changes.outputs.configadmin == 'true'
+      run: mvn -B -V -Dstyle.color=always --file configadmin/pom.xml clean verify
     - name: Upload Test Results
       if: always()
       uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1

bundlerepository/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
-    <version>2.1</version>
+    <version>9</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -100,15 +100,30 @@
         <version>3.4</version>
         <scope>test</scope>
     </dependency>
+    <!-- felix-parent 2.1 supplied junit and mockito-all to every module; from
+         felix-parent 9 on they have to be declared here. mockito-all 1.x could not
+         generate classes on JDK 25 anyway, so mockito-core is used instead. -->
+    <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.13.2</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>5.18.0</version>
+        <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <target>1.5</target>
-          <source>1.5</source>
+          <target>8</target>
+          <source>8</source>
         </configuration>
       </plugin>
 

configadmin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>6</version>
+        <version>9</version>
         <relativePath />
     </parent>
 
@@ -257,6 +257,17 @@
                                 <exclude>**/cm/*</exclude>
                                 <exclude>**/cm/file/*</exclude>
                                 <exclude>**/cm/impl/**</exclude>
+                                <!--
+                                    ConfigAdminSecurityTest launches a framework with
+                                    org.osgi.framework.security set, so Felix.init calls
+                                    System.setSecurityManager. That has thrown
+                                    UnsupportedOperationException since Java 18 unless
+                                    -Djava.security.manager=allow is passed, and passing
+                                    that flag is itself a fatal startup error from Java 24
+                                    on (JEP 486). The test therefore cannot run on any JDK
+                                    this project builds with apart from 17.
+                                -->
+                                <exclude>**/integration/ConfigAdminSecurityTest.java</exclude>
                             </excludes>
                             <includes>
                                 <include>**/integration/*</include>

connect/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>5</version>
+        <version>9</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -97,8 +97,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <target>1.6</target>
-                    <source>1.6</source>
+                    <target>8</target>
+                    <source>8</source>
                 </configuration>
             </plugin>
             <plugin>

examples/extenderbased.circle/pom.xml

@@ -60,8 +60,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>8</source>
+          <target>8</target>
         </configuration>
       </plugin>
     </plugins>

examples/extenderbased.square/pom.xml

@@ -60,8 +60,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>8</source>
+          <target>8</target>
         </configuration>
       </plugin>
     </plugins>

examples/extenderbased.triangle/pom.xml

@@ -60,8 +60,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>8</source>
+          <target>8</target>
         </configuration>
       </plugin>
     </plugins>

log.extension/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
-    <version>5</version>
+    <version>9</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -33,8 +33,8 @@
   <artifactId>org.apache.felix.log.extension</artifactId>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
   </properties>
 
   <scm>

resolver/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
-    <version>5</version>
+    <version>9</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -61,14 +61,14 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <!-- mockito-all 1.x bundles a cglib that cannot generate classes on JDK 25 -->
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.10.19</version>
+      <artifactId>mockito-core</artifactId>
+      <version>5.18.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
   <properties>
-    <felix.java.version>6</felix.java.version>
   </properties>
   <build>
     <plugins>

utils/pom.xml

@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.felix</groupId>
 		<artifactId>felix-parent</artifactId>
-		<version>5</version>
+		<version>9</version>
 		<relativePath />
 	</parent>
 
@@ -38,7 +38,6 @@
   </scm>
 
     <properties>
-        <felix.java.version>7</felix.java.version>
     </properties>
 
     <dependencies>
@@ -83,8 +82,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
         </plugins>