This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2174-move-depends-plugin-configuration-to-parent in repository https://gitbox.apache.org/repos/asf/aries.git
commit e09ce628dec359702e984d7f6beae03089bb90b1 Author: Dominik Przybysz <[email protected]> AuthorDate: Sat Mar 22 11:59:56 2025 +0100 ARIES-2174: Move depends-maven-plugin configuration to parent pom --- application/application-itests/pom.xml | 1 + .../pom.xml | 1 + blueprint/itests/blueprint-itests/pom.xml | 1 + jmx/jmx-itests/pom.xml | 1 + jndi/jndi-url-itest/pom.xml | 14 ----- parent/pom.xml | 62 ++++++++-------------- proxy/proxy-itests/pom.xml | 1 + quiesce/quiesce-manager-itest/pom.xml | 9 ---- samples/blog/blog-itests/pom.xml | 9 ---- .../blueprint/helloworld/helloworld-itests/pom.xml | 9 ---- samples/twitter/twitter-itests/pom.xml | 9 ---- subsystem/subsystem-itests/pom.xml | 1 + transaction/transaction-itests/pom.xml | 1 + web/web-itests/pom.xml | 10 ---- 14 files changed, 30 insertions(+), 99 deletions(-) diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml index 6e39be141..7db147aa9 100644 --- a/application/application-itests/pom.xml +++ b/application/application-itests/pom.xml @@ -281,6 +281,7 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> + <!-- TODO ARIES-2165: remove configuration when the newest parent pom is used --> <version>${depends-maven-plugin.version}</version> <executions> <execution> diff --git a/application/application-resolve-transform-cm-itests/pom.xml b/application/application-resolve-transform-cm-itests/pom.xml index 92bd9c360..c49f97254 100644 --- a/application/application-resolve-transform-cm-itests/pom.xml +++ b/application/application-resolve-transform-cm-itests/pom.xml @@ -199,6 +199,7 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> + <!-- TODO ARIES-2165: remove configuration when the newest parent pom is used --> <version>${depends-maven-plugin.version}</version> <executions> <execution> diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index 6515e975e..6db7774da 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/pom.xml @@ -367,6 +367,7 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> + <!-- TODO ARIES-2165: remove configuration when the newest parent pom is used --> <version>${depends-maven-plugin.version}</version> <executions> <execution> diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml index 3e1d6806e..067e08b11 100644 --- a/jmx/jmx-itests/pom.xml +++ b/jmx/jmx-itests/pom.xml @@ -231,6 +231,7 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> + <!-- TODO ARIES-2165: remove configuration when the newest parent pom is used --> <version>${depends-maven-plugin.version}</version> <executions> <execution> diff --git a/jndi/jndi-url-itest/pom.xml b/jndi/jndi-url-itest/pom.xml index dfe9dbadc..9d0073de7 100644 --- a/jndi/jndi-url-itest/pom.xml +++ b/jndi/jndi-url-itest/pom.xml @@ -309,23 +309,9 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>${depends-maven-plugin.version}</version> - <executions> - <execution> - <phase>generate-resources</phase> - <id>generate-depends-file</id> - <goals> - <goal>generate-depends-file</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> diff --git a/parent/pom.xml b/parent/pom.xml index ffdcb1b57..7245b8ce1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -185,6 +185,7 @@ <!--Plugin versions--> <animal-sniffer-enforcer-rule.version>1.24</animal-sniffer-enforcer-rule.version> + <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> <depgraph-maven-plugin.version>4.0.3</depgraph-maven-plugin.version> <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version> <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version> @@ -250,15 +251,9 @@ <pluginExecutions> <pluginExecution> <pluginExecutionFilter> - <groupId> - org.apache.servicemix.tooling - </groupId> - <artifactId> - depends-maven-plugin - </artifactId> - <versionRange> - [1.2,) - </versionRange> + <groupId>org.apache.servicemix.tooling</groupId> + <artifactId>depends-maven-plugin</artifactId> + <versionRange>[${depends-maven-plugin.version},)</versionRange> <goals> <goal> generate-depends-file @@ -271,15 +266,9 @@ </pluginExecution> <pluginExecution> <pluginExecutionFilter> - <groupId> - org.apache.maven.plugins - </groupId> - <artifactId> - maven-antrun-plugin - </artifactId> - <versionRange> - [1.2,) - </versionRange> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <versionRange>[1.2,)</versionRange> <goals> <goal>run</goal> </goals> @@ -288,27 +277,6 @@ <ignore/> </action> </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - properties-maven-plugin - </artifactId> - <versionRange> - [1.0-alpha-2,) - </versionRange> - <goals> - <goal> - read-project-properties - </goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore/> - </action> - </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> @@ -373,6 +341,22 @@ </scopes> </configuration> </plugin> + <plugin> + <groupId>org.apache.servicemix.tooling</groupId> + <artifactId>depends-maven-plugin</artifactId> + <version>${depends-maven-plugin.version}</version> + <executions> + <execution> + <id>generate-depends-file</id> + <goals> + <goal>generate-depends-file</goal> + </goals> + <configuration> + <outputFile>${project.build.directory}/test-classes/META-INF/maven/dependencies.properties</outputFile> + </configuration> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> <plugins> diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml index 997a7cfb6..c140fcf9b 100644 --- a/proxy/proxy-itests/pom.xml +++ b/proxy/proxy-itests/pom.xml @@ -185,6 +185,7 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> + <!-- TODO ARIES-2165: remove configuration when the newest parent pom is used --> <version>${depends-maven-plugin.version}</version> <executions> <execution> diff --git a/quiesce/quiesce-manager-itest/pom.xml b/quiesce/quiesce-manager-itest/pom.xml index ede54819a..d41f38f0d 100644 --- a/quiesce/quiesce-manager-itest/pom.xml +++ b/quiesce/quiesce-manager-itest/pom.xml @@ -138,15 +138,6 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>${depends-maven-plugin.version}</version> - <executions> - <execution> - <id>generate-depends-file</id> - <goals> - <goal>generate-depends-file</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml index 42e725cd1..4dfb8c5bd 100644 --- a/samples/blog/blog-itests/pom.xml +++ b/samples/blog/blog-itests/pom.xml @@ -463,15 +463,6 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>${depends-maven-plugin.version}</version> - <executions> - <execution> - <id>generate-depends-file</id> - <goals> - <goal>generate-depends-file</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/samples/blueprint/helloworld/helloworld-itests/pom.xml b/samples/blueprint/helloworld/helloworld-itests/pom.xml index 4b3992188..f8b52268b 100644 --- a/samples/blueprint/helloworld/helloworld-itests/pom.xml +++ b/samples/blueprint/helloworld/helloworld-itests/pom.xml @@ -205,15 +205,6 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>${depends-maven-plugin.version}</version> - <executions> - <execution> - <id>generate-depends-file</id> - <goals> - <goal>generate-depends-file</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> diff --git a/samples/twitter/twitter-itests/pom.xml b/samples/twitter/twitter-itests/pom.xml index 7e8bef66f..e2b17360e 100644 --- a/samples/twitter/twitter-itests/pom.xml +++ b/samples/twitter/twitter-itests/pom.xml @@ -245,15 +245,6 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>${depends-maven-plugin.version}</version> - <executions> - <execution> - <id>generate-depends-file</id> - <goals> - <goal>generate-depends-file</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/subsystem/subsystem-itests/pom.xml b/subsystem/subsystem-itests/pom.xml index 7e76d667a..38300b749 100644 --- a/subsystem/subsystem-itests/pom.xml +++ b/subsystem/subsystem-itests/pom.xml @@ -905,6 +905,7 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> + <!-- TODO ARIES-2165: remove configuration when the newest parent pom is used --> <version>${depends-maven-plugin.version}</version> <executions> <execution> diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml index b71820755..370becb77 100644 --- a/transaction/transaction-itests/pom.xml +++ b/transaction/transaction-itests/pom.xml @@ -281,6 +281,7 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> + <!-- TODO ARIES-2165: remove configuration when the newest parent pom is used --> <version>${depends-maven-plugin.version}</version> <executions> <execution> diff --git a/web/web-itests/pom.xml b/web/web-itests/pom.xml index 13f513f2d..bc7cac584 100644 --- a/web/web-itests/pom.xml +++ b/web/web-itests/pom.xml @@ -181,16 +181,6 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>${depends-maven-plugin.version}</version> - <executions> - <execution> - <phase>generate-resources</phase> - <id>generate-depends-file</id> - <goals> - <goal>generate-depends-file</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build>
