Repository: camel Updated Branches: refs/heads/master 46921104f -> 3c58e2110
CAMEL-10052: Moved module versions to parent pom Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c58e211 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c58e211 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c58e211 Branch: refs/heads/master Commit: 3c58e2110d09778040e8946656c944e9f0b91fae Parents: c39b955 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Wed Jun 15 15:14:42 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Jun 15 15:40:20 2016 +0200 ---------------------------------------------------------------------- parent/pom.xml | 3 +++ tests/camel-itest-spring-boot/pom.xml | 30 +++++++++++------------------- 2 files changed, 14 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3c58e211/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0a8a6a0..f2fd5c0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -50,6 +50,7 @@ <aries-blueprint-proxy-version>1.0.1</aries-blueprint-proxy-version> <aries-blueprint-proxy-impl-version>1.0.4</aries-blueprint-proxy-impl-version> <aries-util-version>1.1.1</aries-util-version> + <arquillian-container-se-managed-version>1.0.0.Final</arquillian-container-se-managed-version> <arquillian-version>1.1.11.Final</arquillian-version> <arquillian-weld-se-embedded-version>1.0.0.CR9</arquillian-weld-se-embedded-version> <asm-bundle-version>3.3.1_1</asm-bundle-version> @@ -498,6 +499,8 @@ <servlet-version-range>[3,4)</servlet-version-range> <shiro-version>1.2.4</shiro-version> <shrinkwrap-descriptors-version>2.0.0-alpha-8</shrinkwrap-descriptors-version> + <shrinkwrap-resolver-version>2.2.2</shrinkwrap-resolver-version> + <shrinkwrap-version>1.2.3</shrinkwrap-version> <sip-api-version>1.1</sip-api-version> <slf4j-api-version>1.7.21</slf4j-api-version> <slf4j-version>1.7.21</slf4j-version> http://git-wip-us.apache.org/repos/asf/camel/blob/3c58e211/tests/camel-itest-spring-boot/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/pom.xml b/tests/camel-itest-spring-boot/pom.xml index b53b612..3324851 100644 --- a/tests/camel-itest-spring-boot/pom.xml +++ b/tests/camel-itest-spring-boot/pom.xml @@ -14,14 +14,6 @@ <name>Camel :: Integration Tests :: Spring-Boot</name> <description>Spring-Boot Camel test</description> - - <properties> - <arquillian.version>1.1.11.Final</arquillian.version> - <arquillian-container.version>1.0.0.Final</arquillian-container.version> - <shrinkwrap.version>1.2.3</shrinkwrap.version> - <shrinkwrap-resolver.version>2.2.2</shrinkwrap-resolver.version> - </properties> - <dependencies> <dependency> @@ -40,13 +32,13 @@ <dependency> <groupId>org.jboss.shrinkwrap</groupId> <artifactId>shrinkwrap-api</artifactId> - <version>${shrinkwrap.version}</version> + <version>${shrinkwrap-version}</version> </dependency> <dependency> <groupId>org.jboss.shrinkwrap</groupId> <artifactId>shrinkwrap-impl-base</artifactId> - <version>${shrinkwrap.version}</version> + <version>${shrinkwrap-version}</version> </dependency> <dependency> @@ -58,62 +50,62 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> - <version>${arquillian.version}</version> + <version>${arquillian-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.arquillian.container</groupId> <artifactId>container-se-managed</artifactId> - <version>${arquillian-container.version}</version> + <version>${arquillian-container-se-managed-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-api</artifactId> - <version>${shrinkwrap-resolver.version}</version> + <version>${shrinkwrap-resolver-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-spi</artifactId> - <version>${shrinkwrap-resolver.version}</version> + <version>${shrinkwrap-resolver-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-api-maven</artifactId> - <version>${shrinkwrap-resolver.version}</version> + <version>${shrinkwrap-resolver-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-spi-maven</artifactId> - <version>${shrinkwrap-resolver.version}</version> + <version>${shrinkwrap-resolver-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-api-maven-archive</artifactId> - <version>${shrinkwrap-resolver.version}</version> + <version>${shrinkwrap-resolver-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-impl-maven</artifactId> - <version>${shrinkwrap-resolver.version}</version> + <version>${shrinkwrap-resolver-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId> - <version>${shrinkwrap-resolver.version}</version> + <version>${shrinkwrap-resolver-version}</version> <scope>test</scope> </dependency>