This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4cf74d4f98029f69aa2f02ba92b881a412591cd1 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Feb 12 16:20:08 2020 +0100 Fixed duplicate warnings in maven pom.xml --- tests/camel-itest-karaf/pom.xml | 54 +++++++---------------------------------- 1 file changed, 9 insertions(+), 45 deletions(-) diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml index 02c38e4..22cb325 100644 --- a/tests/camel-itest-karaf/pom.xml +++ b/tests/camel-itest-karaf/pom.xml @@ -39,26 +39,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-karaf</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-link-mvn</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.karaf</groupId> <artifactId>apache-karaf</artifactId> <version>${karaf4-version}</version> @@ -160,23 +140,28 @@ <!-- PAX Exam --> <dependency> <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-junit4</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-spi</artifactId> - <version>${pax-exam-version}</version> + <artifactId>pax-exam-container-karaf</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> + <artifactId>pax-exam-link-mvn</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-karaf</artifactId> + <artifactId>pax-exam-spi</artifactId> + <version>${pax-exam-version}</version> <scope>test</scope> </dependency> <dependency> @@ -275,27 +260,6 @@ </executions> </plugin> - <!-- Execute in the integration-test phase so that the packaged JAR - can be used --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>**/*IT.java</include> - </includes> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </build>