This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0254ad1d7233216c3d66b2283f9b14583dbfbfba Author: Peter Palaga <[email protected]> AuthorDate: Tue Jun 27 13:54:12 2023 +0200 Make plugin integration tests runnable against empty local Maven repository with Apache Snapshots repository disabled --- tooling/maven/camel-package-maven-plugin/pom.xml | 3 -- .../src/it/HeaderSupport/pom.xml | 5 +- .../camel-package-maven-plugin/src/it/settings.xml | 53 ---------------------- tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 26 ++++++++++- 4 files changed, 29 insertions(+), 58 deletions(-) diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index 7009dfbe106..9ce3108cc27 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -229,7 +229,6 @@ </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> - <settingsFile>src/it/settings.xml</settingsFile> <goals> <goal>clean</goal> <goal>verify</goal> @@ -237,8 +236,6 @@ </configuration> <executions> <execution> - <id>integration-test</id> - <phase>integration-test</phase> <goals> <goal>install</goal> <goal>integration-test</goal> diff --git a/tooling/maven/camel-package-maven-plugin/src/it/HeaderSupport/pom.xml b/tooling/maven/camel-package-maven-plugin/src/it/HeaderSupport/pom.xml index ce1d973480e..2e263eb70b9 100644 --- a/tooling/maven/camel-package-maven-plugin/src/it/HeaderSupport/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/src/it/HeaderSupport/pom.xml @@ -33,7 +33,10 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-bom</artifactId> - <version>@project.version@</version> + <!-- Testing against @project.version@ would cause a circular dependency --> + <!-- between camel-package-maven-plugin and camel-core. --> + <!-- Hence we have to use some recent enough public release here --> + <version>4.0.0-M3</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/tooling/maven/camel-package-maven-plugin/src/it/settings.xml b/tooling/maven/camel-package-maven-plugin/src/it/settings.xml deleted file mode 100644 index c72c23c7d2f..00000000000 --- a/tooling/maven/camel-package-maven-plugin/src/it/settings.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<settings> - <profiles> - <profile> - <id>it-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>local.central</id> - <url>@localRepositoryUrl@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>local.central</id> - <url>@localRepositoryUrl@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> -</settings> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml index 2216a41edb0..5dc0efa3fc9 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml @@ -92,13 +92,19 @@ <scope>test</scope> </dependency> - <!-- Used in integration tests --> + <!-- Required by invoker integration tests --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> <version>${project.version}</version> <type>pom</type> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -106,6 +112,12 @@ <version>${project.version}</version> <type>pom</type> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -113,6 +125,12 @@ <version>${project.version}</version> <type>pom</type> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -120,6 +138,12 @@ <version>${project.version}</version> <type>pom</type> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies>
