This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2170-exclude-spring-and-pax-cdi-from-blueprint-maven-plugin in repository https://gitbox.apache.org/repos/asf/aries.git
commit a7a4b4871d9bdbeee89833c178057d76fb62da8b Author: Dominik Przybysz <[email protected]> AuthorDate: Mon Mar 17 16:47:10 2025 +0100 AREIS-2170: Exclude sprint and pax-cdi annotation from Blueprint Maven Plugin --- .../blueprint-maven-plugin-itest/pom.xml | 12 +++++ .../src/it/pax-cdi/pom.xml | 7 +++ .../src/it/spring/pom.xml | 7 +++ .../blueprint-maven-plugin/pom.xml | 53 ++++++++++++---------- .../aries/blueprint/plugin/model/Introspector.java | 7 ++- .../ReferenceListenerBeanWithName.java | 2 +- 6 files changed, 60 insertions(+), 28 deletions(-) diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml index e8729e260..a493081ec 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml +++ b/blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml @@ -38,6 +38,8 @@ <aries.skip.version.check>true</aries.skip.version.check> <blueprint-maven-plugin.version>1.10.1-SNAPSHOT</blueprint-maven-plugin.version> + <blueprint-maven-plugin-pax-cdi-handlers.version>1.0.1-SNAPSHOT</blueprint-maven-plugin-pax-cdi-handlers.version> + <blueprint-maven-plugin-spring-handlers.version>1.0.1-SNAPSHOT</blueprint-maven-plugin-spring-handlers.version> <groovy.version>4.0.26</groovy.version> <javax.enterprise.cdi-api.version>2.0.SP1</javax.enterprise.cdi-api.version> <javax.inject.version>1</javax.inject.version> @@ -109,6 +111,16 @@ <version>${spring.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-maven-plugin-pax-cdi-handlers</artifactId> + <version>${blueprint-maven-plugin-pax-cdi-handlers.version}</version> + </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-maven-plugin-spring-handlers</artifactId> + <version>${blueprint-maven-plugin-spring-handlers.version}</version> + </dependency> </dependencies> <build> diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml index c38e30bba..a4ce17c63 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml +++ b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml @@ -53,6 +53,13 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-maven-plugin-pax-cdi-handlers</artifactId> + <version>@blueprint-maven-plugin-pax-cdi-handlers.version@</version> + </dependency> + </dependencies> </plugin> </plugins> </build> diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml index 84c869b46..7f43af282 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml +++ b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml @@ -75,6 +75,13 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-maven-plugin-spring-handlers</artifactId> + <version>@blueprint-maven-plugin-spring-handlers.version@</version> + </dependency> + </dependencies> </plugin> </plugins> </build> diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml index 33db9801d..e4e2db38c 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml +++ b/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml @@ -42,6 +42,8 @@ <blueprint-maven-plugin-pax-cdi-handlers.version>1.0.0</blueprint-maven-plugin-pax-cdi-handlers.version> <blueprint-maven-plugin-spi.version>1.1.0</blueprint-maven-plugin-spi.version> <blueprint-maven-plugin-spring-handlers.version>1.0.0</blueprint-maven-plugin-spring-handlers.version> + <commons-io.version>2.18.0</commons-io.version> + <guava.version>33.4.0-jre</guava.version> <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version> <jakarta.enterprise.cdi-api.version>3.0.1</jakarta.enterprise.cdi-api.version> <jakarta.inject.version>2.0.1.MR</jakarta.inject.version> @@ -53,7 +55,6 @@ <javax.persistence-api.version>2.2</javax.persistence-api.version> <javax.transaction-api.version>1.2</javax.transaction-api.version> <javax.transaction.cdi-api.version>1.2-b03</javax.transaction.cdi-api.version> - <maven-filtering.version>3.4.0</maven-filtering.version> <maven-plugin-plugin.version>3.15.1</maven-plugin-plugin.version> <maven.version>3.9.9</maven.version> <org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version> @@ -63,7 +64,7 @@ <org.apache.aries.transaction.blueprint.version>1.1.1</org.apache.aries.transaction.blueprint.version> <osgi.cmpn.version>7.0.0</osgi.cmpn.version> <plexus-build-api.version>1.2.0</plexus-build-api.version> - <plexus-utils.version>4.0.2</plexus-utils.version> + <plexus-classworlds.version>2.8.0</plexus-classworlds.version> <xbean-finder-shaded.version>4.26</xbean-finder-shaded.version> </properties> @@ -123,16 +124,6 @@ <artifactId>blueprint-maven-plugin-spi</artifactId> <version>${blueprint-maven-plugin-spi.version}</version> </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-maven-plugin-spring-handlers</artifactId> - <version>${blueprint-maven-plugin-spring-handlers.version}</version> - </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint-maven-plugin-pax-cdi-handlers</artifactId> - <version>${blueprint-maven-plugin-pax-cdi-handlers.version}</version> - </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -215,13 +206,13 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> + <artifactId>maven-model</artifactId> <version>${maven.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> + <artifactId>maven-core</artifactId> <version>${maven.version}</version> <scope>provided</scope> </dependency> @@ -229,13 +220,6 @@ <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> </dependency> - - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-filtering</artifactId> - <version>${maven-filtering.version}</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-build-api</artifactId> @@ -243,14 +227,19 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>${plexus-utils.version}</version> + <artifactId>plexus-classworlds</artifactId> + <version>${plexus-classworlds.version}</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-finder-shaded</artifactId> <version>${xbean-finder-shaded.version}</version> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> <!-- For the CDI annotations --> <dependency> @@ -295,5 +284,23 @@ <version>${org.apache.aries.blueprint.cm.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-maven-plugin-spring-handlers</artifactId> + <version>${blueprint-maven-plugin-spring-handlers.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-maven-plugin-pax-cdi-handlers</artifactId> + <version>${blueprint-maven-plugin-pax-cdi-handlers.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java index 9cbf1fe13..2d81e7485 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java @@ -19,15 +19,14 @@ package org.apache.aries.blueprint.plugin.model; import com.google.common.collect.HashMultimap; -import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -53,7 +52,7 @@ final class Introspector { @SafeVarargs final List<Field> fieldsWith(Class<? extends Annotation>... requiredAnnotations) { Multimap<String, Field> fieldsByName = HashMultimap.create(); - Set<String> acceptedFieldNames = Sets.newHashSet(); + Set<String> acceptedFieldNames = new HashSet<>(); Class<?> clazz = originalClazz; // For each parent class of clazz... @@ -71,7 +70,7 @@ final class Introspector { } // Add all accepted fields to acceptedFields - List<Field> acceptedFields = Lists.newArrayList(); + List<Field> acceptedFields = new ArrayList<>(); for (String fieldName : acceptedFieldNames) { Collection<Field> fields = fieldsByName.get(fieldName); validateOnlyOneFieldWithName(fieldName, fields); diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java index 8f996f4f3..136dba66e 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java @@ -18,12 +18,12 @@ */ package org.apache.aries.blueprint.plugin.test.referencelistener; -import com.google.inject.Singleton; import org.apache.aries.blueprint.annotation.referencelistener.Cardinality; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import javax.inject.Named; +import javax.inject.Singleton; @ReferenceListener(referenceInterface = ServiceA.class, cardinality = Cardinality.SINGLE, referenceName = "serviceAReferenceWithoutMethods") @Singleton
