Merge pull request #589 from apache/FELIX-6875-build-unbuilt-modules

FELIX-6875 - Build and test the modules CI never covered on JDK 21 and 25

Author: paulrutter

.github/workflows/maven-ci.yml

@@ -23,6 +23,16 @@ on:
       - 'log.extension/**'
       - 'examples/**'
       - 'configadmin/**'
+      - 'healthcheck/**'
+      - 'fileinstall/**'
+      - 'inventory/**'
+      - 'configadmin-plugins/**'
+      - 'webconsole-plugins/**'
+      - 'metatype/**'
+      - 'coordinator/**'
+      - 'features/**'
+      - 'scr-ext-anno/**'
+      - 'bundlerepository.osgi-ct/**'
   pull_request:
     branches: [ "master", "feature/**", "maintenance/**" ]
     paths:
@@ -45,6 +55,16 @@ on:
       - 'log.extension/**'
       - 'examples/**'
       - 'configadmin/**'
+      - 'healthcheck/**'
+      - 'fileinstall/**'
+      - 'inventory/**'
+      - 'configadmin-plugins/**'
+      - 'webconsole-plugins/**'
+      - 'metatype/**'
+      - 'coordinator/**'
+      - 'features/**'
+      - 'scr-ext-anno/**'
+      - 'bundlerepository.osgi-ct/**'
 
 # Cancel superseded runs for the same branch. github.head_ref is only set for
 # pull_request events, so pushes fall back to github.ref, which groups per branch:
@@ -118,6 +138,26 @@ jobs:
             - 'log.extension/**'
           examples:
             - 'examples/**'
+          healthcheck:
+            - 'healthcheck/**'
+          fileinstall:
+            - 'fileinstall/**'
+          inventory:
+            - 'inventory/**'
+          configadmin-plugins:
+            - 'configadmin-plugins/**'
+          webconsole-plugins:
+            - 'webconsole-plugins/**'
+          metatype:
+            - 'metatype/**'
+          coordinator:
+            - 'coordinator/**'
+          features:
+            - 'features/**'
+          scr-ext-anno:
+            - 'scr-ext-anno/**'
+          bundlerepository-osgi-ct:
+            - 'bundlerepository.osgi-ct/**'
     - name: Felix Configuration JSON
       if: steps.changes.outputs.cm-json == 'true' || steps.changes.outputs.configurator == 'true'
       run: mvn -B -V -Dstyle.color=always --file cm.json/pom.xml clean install
@@ -196,6 +236,44 @@ jobs:
     - name: Felix examples
       if: steps.changes.outputs.examples == 'true'
       run: mvn -B -V -Dstyle.color=always --file examples/pom.xml clean verify
+    # The modules below are not part of a reactor and each pins the released Felix
+    # bundles it depends on, so they are built one by one. See FELIX-6875.
+    - name: Felix Health Check
+      if: steps.changes.outputs.healthcheck == 'true'
+      run: |
+        for module in annotation api core generalchecks webconsoleplugin; do
+          mvn -B -V -Dstyle.color=always --file healthcheck/$module/pom.xml clean verify || exit 1
+        done
+    - name: Felix File Install
+      if: steps.changes.outputs.fileinstall == 'true'
+      run: mvn -B -V -Dstyle.color=always --file fileinstall/pom.xml clean verify
+    - name: Felix Inventory
+      if: steps.changes.outputs.inventory == 'true'
+      run: mvn -B -V -Dstyle.color=always --file inventory/pom.xml clean verify
+    - name: Felix Config Admin plugins
+      if: steps.changes.outputs.configadmin-plugins == 'true'
+      run: mvn -B -V -Dstyle.color=always --file configadmin-plugins/interpolation/pom.xml clean verify
+    - name: Felix Web Console plugins
+      if: steps.changes.outputs.webconsole-plugins == 'true'
+      run: |
+        for module in ds event memoryusage obr packageadmin; do
+          mvn -B -V -Dstyle.color=always --file webconsole-plugins/$module/pom.xml clean verify || exit 1
+        done
+    - name: Felix Metatype
+      if: steps.changes.outputs.metatype == 'true'
+      run: mvn -B -V -Dstyle.color=always --file metatype/pom.xml clean verify
+    - name: Felix Coordinator
+      if: steps.changes.outputs.coordinator == 'true'
+      run: mvn -B -V -Dstyle.color=always --file coordinator/pom.xml clean verify
+    - name: Felix Features
+      if: steps.changes.outputs.features == 'true'
+      run: mvn -B -V -Dstyle.color=always --file features/pom.xml clean verify
+    - name: Felix SCR extension annotations
+      if: steps.changes.outputs.scr-ext-anno == 'true'
+      run: mvn -B -V -Dstyle.color=always --file scr-ext-anno/pom.xml clean verify
+    - name: Felix bundlerepository OSGi CT
+      if: steps.changes.outputs.bundlerepository-osgi-ct == 'true'
+      run: mvn -B -V -Dstyle.color=always --file bundlerepository.osgi-ct/pom.xml clean verify
     - name: Upload Test Results
       if: always()
       uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1

bundlerepository.osgi-ct/pom.xml

@@ -20,8 +20,8 @@
   <parent>
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
-    <version>2.1</version>
-    <relativePath>../../pom/pom.xml</relativePath>
+    <version>9</version>
+    <relativePath />
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>org.apache.felix.bundlerepository</artifactId>
-      <version>${project.version}</version>
+      <version>2.0.10</version>
     </dependency>
   </dependencies>
   <build>
@@ -61,15 +61,15 @@
         <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>
 
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.4</version>
+        <version>6.2.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

configadmin-plugins/interpolation/pom.xml

@@ -22,8 +22,8 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>7</version>
-        <relativePath>../../../pom/pom.xml</relativePath>
+        <version>9</version>
+        <relativePath />
     </parent>
 
     <artifactId>org.apache.felix.configadmin.plugin.interpolation</artifactId>
@@ -133,8 +133,8 @@
         </dependency>
         <dependency>
             <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>
         <dependency>

coordinator/pom.xml

@@ -22,8 +22,8 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>6</version>
-        <relativePath>../pom/pom.xml</relativePath>
+        <version>9</version>
+        <relativePath />
     </parent>
 
     <artifactId>org.apache.felix.coordinator</artifactId>

features/pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>7</version>
+        <version>9</version>
         <relativePath />
     </parent>
 

fileinstall/pom.xml

@@ -20,8 +20,8 @@
   <parent>
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
-    <version>6</version>
-    <relativePath>../pom/pom.xml</relativePath>
+    <version>9</version>
+    <relativePath />
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java

@@ -237,39 +237,42 @@ public void testIsFragment() throws Exception
 
     public void testInvalidTempDir() throws Exception
     {
-        String oldTmpDir = System.getProperty("java.io.tmpdir");
-        
-        try 
+        // java.io.tmpdir is read once when the JVM starts (JDK 12 and later), so setting it
+        // here would have no effect. Point File Install at the invalid directory through its
+        // own setting instead.
+        File parent = new File("target/tmp");
+        parent.mkdirs();
+        parent.setWritable(false, false);
+        try
         {
-            File parent = new File("target/tmp");
-            parent.mkdirs();
-            parent.setWritable(false, false);
             File tmp = new File(parent, "tmp");
-            System.setProperty("java.io.tmpdir", tmp.toString());
+            props.put(DirectoryWatcher.TMPDIR, tmp.toString());
 
             mockBundleContext.addBundleListener((BundleListener) org.easymock.EasyMock.anyObject());
             EasyMock.expect(mockBundleContext.createFilter((String) EasyMock.anyObject()))
                     .andReturn(null);
+            // Creating the folder fails, which is logged; the logger asks for a LogService.
+            EasyMock.expect(mockBundleContext.getServiceReference(LogService.class)).andReturn(null).anyTimes();
 
             BundleRevision mockBundleRevision = EasyMock.createNiceMock(BundleRevision.class);
             EasyMock.expect(mockBundle.adapt(BundleRevision.class)).andReturn(mockBundleRevision);
             EasyMock.expect(mockBundleRevision.getTypes())
                     .andReturn(BundleRevision.TYPE_FRAGMENT);
             EasyMock.replay(mockBundleContext, mockBundle, mockBundleRevision, mockSysBundle, mockStartLevel);
-    
+
             try
             {
                 dw = new DirectoryWatcher( new FileInstall(), props, mockBundleContext );
-                fail("Expected an IllegalStateException");
-            } 
-            catch (IllegalStateException e)
+                fail("Expected an exception for a temp directory that cannot be created");
+            }
+            catch (RuntimeException e)
             {
-                // expected
+                assertTrue(e.getMessage(), e.getMessage().contains("Cannot create folder"));
             }
         }
         finally
         {
-            System.setProperty("java.io.tmpdir", oldTmpDir);
+            parent.setWritable(true, false);
         }
     }
 

healthcheck/annotation/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>6</version>
+        <version>9</version>
         <relativePath />
     </parent>
 

healthcheck/api/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>6</version>
+        <version>9</version>
         <relativePath />
     </parent>
 
@@ -50,7 +50,7 @@
             <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-maven-plugin</artifactId>
-                <version>4.1.0</version>
+                <version>7.1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>4.1.0</version>
+                <version>5.1.8</version>
                 <executions>
                     <execution>
                         <id>baseline</id>
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.9.5</version>
+            <version>5.18.0</version>
             <scope>test</scope>
         </dependency>
 

healthcheck/api/src/test/java/org/apache/felix/hc/api/execution/HealthCheckMetadataTest.java

@@ -19,7 +19,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 
 import java.util.Arrays;
 import java.util.Vector;
@@ -38,7 +38,7 @@ public class HealthCheckMetadataTest {
 
     @Before
     public void setup() {
-        initMocks(this);
+        openMocks(this);
         when(hcServiceRef.getProperty(Constants.SERVICE_ID)).thenReturn(1L);
     }