This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2181-remove-indirect-aries-parent-relation-in-blueprint in repository https://gitbox.apache.org/repos/asf/aries.git
commit b199d3e2e56fba31c00abfc8fd7cef0278d5bd10 Author: Dominik Przybysz <[email protected]> AuthorDate: Tue May 6 20:12:33 2025 +0200 ARIES-2181: Remove indirect aries parent in examples and itests in blueprint --- blueprint/examples/blueprint-sample-war/pom.xml | 8 ++-- blueprint/examples/blueprint-sample/pom.xml | 8 ++-- blueprint/examples/pom.xml | 8 ++-- blueprint/itests/blueprint-itests/pom.xml | 10 ++-- blueprint/itests/blueprint-testbundlea/pom.xml | 31 ++++++++++-- blueprint/itests/blueprint-testbundleb/pom.xml | 14 ++++-- blueprint/itests/blueprint-testbundlee/pom.xml | 10 ++-- blueprint/itests/blueprint-testbundles/pom.xml | 10 ++-- .../itests/blueprint-testquiescebundle/pom.xml | 17 +++++-- blueprint/itests/pom.xml | 56 ++-------------------- 10 files changed, 84 insertions(+), 88 deletions(-) diff --git a/blueprint/examples/blueprint-sample-war/pom.xml b/blueprint/examples/blueprint-sample-war/pom.xml index fd79b988d..59f7000ad 100644 --- a/blueprint/examples/blueprint-sample-war/pom.xml +++ b/blueprint/examples/blueprint-sample-war/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>3.0.1-SNAPSHOT</version> + <relativePath>../../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/examples/blueprint-sample/pom.xml b/blueprint/examples/blueprint-sample/pom.xml index f1a4cd708..8e91c95d9 100644 --- a/blueprint/examples/blueprint-sample/pom.xml +++ b/blueprint/examples/blueprint-sample/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>3.0.1-SNAPSHOT</version> + <relativePath>../../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/examples/pom.xml b/blueprint/examples/pom.xml index c502c7b93..681625841 100644 --- a/blueprint/examples/pom.xml +++ b/blueprint/examples/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.0</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>3.0.1-SNAPSHOT</version> + <relativePath>../../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index f3d9a5877..4570c50a2 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/pom.xml @@ -22,13 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-itests-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>3.0.1-SNAPSHOT</version> + <relativePath>../../../parent/pom.xml</relativePath> </parent> + <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.itests</artifactId> + <version>1.0.0-SNAPSHOT</version> <name>Apache Aries Blueprint iTests</name> <description> Integration tests using the standalone blueprint-bundle for the implementation diff --git a/blueprint/itests/blueprint-testbundlea/pom.xml b/blueprint/itests/blueprint-testbundlea/pom.xml index 008e589c4..80c523822 100644 --- a/blueprint/itests/blueprint-testbundlea/pom.xml +++ b/blueprint/itests/blueprint-testbundlea/pom.xml @@ -22,14 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-itests-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>3.0.1-SNAPSHOT</version> + <relativePath>../../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.testbundlea</artifactId> + <version>1.0.0-SNAPSHOT</version> <name>Apache Aries Blueprint Test Bundle A</name> <packaging>bundle</packaging> <description>Blueprint Test Bundle A, provides NamespaceHandler, BeanProcessor etc implementations for Test Bundle B</description> @@ -40,6 +41,28 @@ </aries.osgi.activator> <aries.osgi.private.pkg/> <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg> + <aries.skip.version.check>true</aries.skip.version.check> + + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.api</artifactId> + <version>${blueprint.api.version}</version> + </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.core</artifactId> + <version>${blueprint.core.version}</version> + </dependency> + </dependencies> + </project> diff --git a/blueprint/itests/blueprint-testbundleb/pom.xml b/blueprint/itests/blueprint-testbundleb/pom.xml index f1c2430eb..775731c83 100644 --- a/blueprint/itests/blueprint-testbundleb/pom.xml +++ b/blueprint/itests/blueprint-testbundleb/pom.xml @@ -22,14 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-itests-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>3.0.1-SNAPSHOT</version> + <relativePath>../../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.testbundleb</artifactId> + <version>1.0.0-SNAPSHOT</version> <name>Apache Aries Blueprint Test Bundle B</name> <packaging>bundle</packaging> <description>Blueprint Test Bundle B, tests namespace handlers, bean processors etc provided by Test Bundle A</description> @@ -40,13 +41,16 @@ </aries.osgi.activator> <aries.osgi.private.pkg/> <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg> + <aries.skip.version.check>true</aries.skip.version.check> + + <org.apache.aries.blueprint.testbundlea.version>1.0.0-SNAPSHOT</org.apache.aries.blueprint.testbundlea.version> </properties> <dependencies> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.testbundlea</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${org.apache.aries.blueprint.testbundlea.version}</version> </dependency> </dependencies> diff --git a/blueprint/itests/blueprint-testbundlee/pom.xml b/blueprint/itests/blueprint-testbundlee/pom.xml index 0f86b6cd4..2904e41fd 100644 --- a/blueprint/itests/blueprint-testbundlee/pom.xml +++ b/blueprint/itests/blueprint-testbundlee/pom.xml @@ -22,14 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-itests-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>3.0.1-SNAPSHOT</version> + <relativePath>../../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.testbundlee</artifactId> + <version>1.0.0-SNAPSHOT</version> <name>Apache Aries Blueprint Test Bundle E</name> <packaging>bundle</packaging> <description>Blueprint Test Bundle E, provides Spring Extender test</description> @@ -37,6 +38,7 @@ <properties> <aries.osgi.private.pkg/> <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg> + <aries.skip.version.check>true</aries.skip.version.check> <spring.version>5.3.39</spring.version> </properties> diff --git a/blueprint/itests/blueprint-testbundles/pom.xml b/blueprint/itests/blueprint-testbundles/pom.xml index 7401e3620..d1aa754cc 100644 --- a/blueprint/itests/blueprint-testbundles/pom.xml +++ b/blueprint/itests/blueprint-testbundles/pom.xml @@ -22,14 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-itests-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>3.0.1-SNAPSHOT</version> + <relativePath>../../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.testbundles</artifactId> + <version>1.0.0-SNAPSHOT</version> <name>Apache Aries Blueprint Test Bundle S</name> <packaging>bundle</packaging> <description>Blueprint Test Bundle S, provides Spring test</description> @@ -37,6 +38,7 @@ <properties> <aries.osgi.private.pkg/> <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg> + <aries.skip.version.check>true</aries.skip.version.check> <spring.version>5.3.39</spring.version> </properties> diff --git a/blueprint/itests/blueprint-testquiescebundle/pom.xml b/blueprint/itests/blueprint-testquiescebundle/pom.xml index 251b297dd..56149549e 100644 --- a/blueprint/itests/blueprint-testquiescebundle/pom.xml +++ b/blueprint/itests/blueprint-testquiescebundle/pom.xml @@ -22,14 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-itests-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>3.0.1-SNAPSHOT</version> + <relativePath>../../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId> + <version>1.0.0-SNAPSHOT</version> <name>Apache Aries Blueprint Test Quiesce Bundle</name> <packaging>bundle</packaging> <description>Blueprint Test Quiesce Bundle, tests the blueprint participant for the quiesce functionality.</description> @@ -44,7 +45,15 @@ </aries.osgi.import.pkg> <aries.osgi.private.pkg/> <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg> + <aries.skip.version.check>true</aries.skip.version.check> </properties> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + </dependency> + </dependencies> + </project> diff --git a/blueprint/itests/pom.xml b/blueprint/itests/pom.xml index 9ae59a961..1f7a2ea88 100644 --- a/blueprint/itests/pom.xml +++ b/blueprint/itests/pom.xml @@ -22,17 +22,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> - <relativePath>../blueprint-parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>3.0.1-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.blueprint</groupId> <artifactId>blueprint-itests-parent</artifactId> <name>Apache Aries Blueprint</name> <packaging>pom</packaging> - <version>1.1.0-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <description> Aries Blueprint Integration tests </description> @@ -45,51 +45,5 @@ <module>blueprint-testquiescebundle</module> <module>blueprint-itests</module> </modules> - - <properties> - <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> - <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> - <osgi.core.version>4.3.1</osgi.core.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> - <version>${osgi.core.version}</version> - </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.api</artifactId> - <version>${blueprint.api.version}</version> - </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.core</artifactId> - <version>${blueprint.core.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.aries.versioning</groupId> - <artifactId>org.apache.aries.versioning.plugin</artifactId> - <executions> - <execution> - <id>default-verify</id> - <phase>verify</phase> - <goals> - <goal>version-check</goal> - </goals> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project>
