diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml
index e501beb07c..7914aac4ec 100644
--- a/.github/workflows/maven-ci.yml
+++ b/.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
diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index be6c3ebf8a..d030e2e680 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -20,7 +20,7 @@
org.apache.felix
felix-parent
- 2.1
+ 9
../pom/pom.xml
4.0.0
@@ -100,6 +100,21 @@
3.4
test
+
+
+ junit
+ junit
+ 4.13.2
+ test
+
+
+ org.mockito
+ mockito-core
+ 5.18.0
+ test
+
@@ -107,8 +122,8 @@
org.apache.maven.plugins
maven-compiler-plugin
- 1.5
- 1.5
+ 8
+ 8
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index 4536c104e2..fa0f0312e9 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -22,7 +22,7 @@
org.apache.felix
felix-parent
- 6
+ 9
@@ -257,6 +257,17 @@
**/cm/*
**/cm/file/*
**/cm/impl/**
+
+ **/integration/ConfigAdminSecurityTest.java
**/integration/*
diff --git a/connect/pom.xml b/connect/pom.xml
index 8cbf5d093f..a71ec78d29 100644
--- a/connect/pom.xml
+++ b/connect/pom.xml
@@ -19,7 +19,7 @@
org.apache.felix
felix-parent
- 5
+ 9
../pom/pom.xml
4.0.0
@@ -97,8 +97,8 @@
org.apache.maven.plugins
maven-compiler-plugin
- 1.6
- 1.6
+ 8
+ 8
diff --git a/examples/extenderbased.circle/pom.xml b/examples/extenderbased.circle/pom.xml
index 1afccaaab2..98ea05d538 100644
--- a/examples/extenderbased.circle/pom.xml
+++ b/examples/extenderbased.circle/pom.xml
@@ -60,8 +60,8 @@
org.apache.maven.plugins
maven-compiler-plugin
- 1.5
- 1.5
+ 8
+ 8
diff --git a/examples/extenderbased.square/pom.xml b/examples/extenderbased.square/pom.xml
index 02723f4f83..7fb5872664 100644
--- a/examples/extenderbased.square/pom.xml
+++ b/examples/extenderbased.square/pom.xml
@@ -60,8 +60,8 @@
org.apache.maven.plugins
maven-compiler-plugin
- 1.5
- 1.5
+ 8
+ 8
diff --git a/examples/extenderbased.triangle/pom.xml b/examples/extenderbased.triangle/pom.xml
index b0895a7d8d..78eff1a5f6 100644
--- a/examples/extenderbased.triangle/pom.xml
+++ b/examples/extenderbased.triangle/pom.xml
@@ -60,8 +60,8 @@
org.apache.maven.plugins
maven-compiler-plugin
- 1.5
- 1.5
+ 8
+ 8
diff --git a/log.extension/pom.xml b/log.extension/pom.xml
index 111884fac8..724c77a38c 100644
--- a/log.extension/pom.xml
+++ b/log.extension/pom.xml
@@ -20,7 +20,7 @@
org.apache.felix
felix-parent
- 5
+ 9
../pom/pom.xml
4.0.0
@@ -33,8 +33,8 @@
org.apache.felix.log.extension
- 1.7
- 1.7
+ 8
+ 8
diff --git a/resolver/pom.xml b/resolver/pom.xml
index cc2844dfd9..1355825d5a 100644
--- a/resolver/pom.xml
+++ b/resolver/pom.xml
@@ -20,7 +20,7 @@
org.apache.felix
felix-parent
- 5
+ 9
../pom/pom.xml
4.0.0
@@ -61,14 +61,14 @@
test
+
org.mockito
- mockito-all
- 1.10.19
+ mockito-core
+ 5.18.0
test
- 6
diff --git a/utils/pom.xml b/utils/pom.xml
index 7b028dbe04..b591157659 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -20,7 +20,7 @@
org.apache.felix
felix-parent
- 5
+ 9
@@ -38,7 +38,6 @@
- 7
@@ -83,8 +82,8 @@
maven-compiler-plugin
- 1.7
- 1.7
+ 8
+ 8