This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2177-use-application-snapshots-in-subsystem in repository https://gitbox.apache.org/repos/asf/aries.git
commit dcbe756b4f0cf18989adc49b36ef0733eb4fa246 Author: Dominik Przybysz <[email protected]> AuthorDate: Tue Apr 22 21:23:58 2025 +0200 ARIES-2177: Use aries.application snapshots in subsystem --- .github/workflows/subsystem.yml | 4 ++++ subsystem/subsystem-bundle/pom.xml | 12 ++++++------ subsystem/subsystem-core/pom.xml | 4 ++-- subsystem/subsystem-itests/pom.xml | 12 ++++++------ .../aries/subsystem/itests/ModelledResourceManagerTest.java | 2 +- .../org/apache/aries/subsystem/itests/SubsystemTest.java | 2 +- subsystem/subsystem-obr/pom.xml | 2 +- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/workflows/subsystem.yml b/.github/workflows/subsystem.yml index 6cfba845e..e2a068b16 100644 --- a/.github/workflows/subsystem.yml +++ b/.github/workflows/subsystem.yml @@ -17,6 +17,7 @@ on: paths: - parent/** - testsupport/** + - application/** - subsystem/** - .github/workflows/subsystem.yml push: @@ -50,6 +51,9 @@ jobs: - name: Build testsupport shell: bash run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport + - name: Build application + shell: bash + run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f application - name: Build subsystem shell: bash run: mvn -U -e -B -ntp clean install -f subsystem diff --git a/subsystem/subsystem-bundle/pom.xml b/subsystem/subsystem-bundle/pom.xml index 740dc3e33..633441b2d 100644 --- a/subsystem/subsystem-bundle/pom.xml +++ b/subsystem/subsystem-bundle/pom.xml @@ -61,11 +61,11 @@ </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> - <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> - <org.apache.aries.application.modeller.version>1.0.0</org.apache.aries.application.modeller.version> - <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> - <org.apache.aries.blueprint.version>1.0.0</org.apache.aries.blueprint.version> - <org.apache.aries.proxy.version>1.0.1</org.apache.aries.proxy.version> + <org.apache.aries.application.api.version>1.0.1-SNAPSHOT</org.apache.aries.application.api.version> + <org.apache.aries.application.modeller.version>1.0.1-SNAPSHOT</org.apache.aries.application.modeller.version> + <org.apache.aries.application.utils.version>1.0.1-SNAPSHOT</org.apache.aries.application.utils.version> + <org.apache.aries.blueprint.version>1.2.0</org.apache.aries.blueprint.version> + <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version> <org.apache.aries.subsystem.api.version>2.0.10</org.apache.aries.subsystem.api.version> <org.apache.aries.subsystem.core.version>2.0.10</org.apache.aries.subsystem.core.version> <org.apache.aries.util.version>1.1.1</org.apache.aries.util.version> @@ -108,7 +108,7 @@ </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint</artifactId> + <artifactId>org.apache.aries.blueprint.core</artifactId> <version>${org.apache.aries.blueprint.version}</version> </dependency> <dependency> diff --git a/subsystem/subsystem-core/pom.xml b/subsystem/subsystem-core/pom.xml index 827c6acdd..9cdf11208 100644 --- a/subsystem/subsystem-core/pom.xml +++ b/subsystem/subsystem-core/pom.xml @@ -69,8 +69,8 @@ <org.apache.aries.subsystem.api.version>2.0.10</org.apache.aries.subsystem.api.version> <org.apache.aries.util.version>1.1.1</org.apache.aries.util.version> - <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> - <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.application.api.version>1.0.1-SNAPSHOT</org.apache.aries.application.api.version> + <org.apache.aries.application.utils.version>1.0.1-SNAPSHOT</org.apache.aries.application.utils.version> <osgi.core.version>6.0.0</osgi.core.version> <osgi.enterprise.version>5.0.0</osgi.enterprise.version> <org.eclipse.equinox.coordinator.version>1.1.0.v20120522-1841</org.eclipse.equinox.coordinator.version> diff --git a/subsystem/subsystem-itests/pom.xml b/subsystem/subsystem-itests/pom.xml index 550db7701..16946809c 100644 --- a/subsystem/subsystem-itests/pom.xml +++ b/subsystem/subsystem-itests/pom.xml @@ -45,11 +45,11 @@ <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version> <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version> <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version> - <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> - <org.apache.aries.application.modeller.version>1.0.0</org.apache.aries.application.modeller.version> - <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> - <org.apache.aries.blueprint.version>1.0.0</org.apache.aries.blueprint.version> - <org.apache.aries.proxy.version>1.0.1</org.apache.aries.proxy.version> + <org.apache.aries.application.api.version>1.0.1-SNAPSHOT</org.apache.aries.application.api.version> + <org.apache.aries.application.modeller.version>1.0.1-SNAPSHOT</org.apache.aries.application.modeller.version> + <org.apache.aries.application.utils.version>1.0.1-SNAPSHOT</org.apache.aries.application.utils.version> + <org.apache.aries.blueprint.version>1.2.0</org.apache.aries.blueprint.version> + <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version> <org.apache.aries.subsystem.api.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.api.version> <org.apache.aries.subsystem.core.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.core.version> <org.apache.aries.subsystem.itest.interfaces.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.itest.interfaces.version> @@ -161,7 +161,7 @@ </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint</artifactId> + <artifactId>org.apache.aries.blueprint.core</artifactId> <version>${org.apache.aries.blueprint.version}</version> <scope>test</scope> </dependency> diff --git a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ModelledResourceManagerTest.java b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ModelledResourceManagerTest.java index 9f12bb18b..8776ae582 100644 --- a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ModelledResourceManagerTest.java +++ b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ModelledResourceManagerTest.java @@ -40,7 +40,7 @@ public class ModelledResourceManagerTest extends SubsystemTest { super.setUp(); RichBundleContext rootContext = context(getRootSubsystem()); assertNull("Modeller is installed", rootContext.getBundleByName("org.apache.aries.application.modeller")); - assertNull("Blueprint is installed", rootContext.getBundleByName("org.apache.aries.blueprint")); + assertNull("Blueprint is installed", rootContext.getBundleByName("org.apache.aries.blueprint.core")); assertNull("Proxy is installed", rootContext.getBundleByName("org.apache.aries.proxy")); } diff --git a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java index 5536b664d..e27566592 100644 --- a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java +++ b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java @@ -170,7 +170,7 @@ public abstract class SubsystemTest extends AbstractIntegrationTest { private Option modelerBundles() { return CoreOptions.composite( mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller").versionAsInProject(), - mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(), + mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core").versionAsInProject(), mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject()); } diff --git a/subsystem/subsystem-obr/pom.xml b/subsystem/subsystem-obr/pom.xml index 597f3b7a1..15febd176 100644 --- a/subsystem/subsystem-obr/pom.xml +++ b/subsystem/subsystem-obr/pom.xml @@ -53,7 +53,7 @@ </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> - <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.application.utils.version>1.0.1-SNAPSHOT</org.apache.aries.application.utils.version> <org.apache.felix.bundlerepository.version>2.0.10</org.apache.felix.bundlerepository.version> <osgi.core.version>6.0.0</osgi.core.version> <osgi.enterprise.version>5.0.0</osgi.enterprise.version>
