[ARIES-1497] Cleanup test dependencies git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1776966 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/f0774929 Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/f0774929 Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/f0774929 Branch: refs/heads/master Commit: f07749292f1b607a9bf7c48a8139f570e2f562fb Parents: 805e98d Author: cschneider <cschneider@13f79535-47bb-0310-9956-ffa450edef68> Authored: Mon Jan 2 17:19:48 2017 +0000 Committer: cschneider <cschneider@13f79535-47bb-0310-9956-ffa450edef68> Committed: Mon Jan 2 17:19:48 2017 +0000 ---------------------------------------------------------------------- itests/jpa-container-itest/pom.xml | 54 +++++---------------------------- itests/pom.xml | 3 +- 2 files changed, 9 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/f0774929/itests/jpa-container-itest/pom.xml ---------------------------------------------------------------------- diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml index dd5fd87..1f4beed 100644 --- a/itests/jpa-container-itest/pom.xml +++ b/itests/jpa-container-itest/pom.xml @@ -34,6 +34,13 @@ <dependencies> <dependency> + <groupId>org.apache.aries.jpa</groupId> + <artifactId>jpa-repository</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> + + <dependency> <groupId>org.eclipse.tycho</groupId> <artifactId>org.eclipse.osgi</artifactId> <version>3.10.100.v20150529-1857</version> @@ -60,6 +67,7 @@ <version>1.8.4</version> <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.aries</groupId> <artifactId>org.apache.aries.util</artifactId> @@ -96,38 +104,6 @@ <scope>test</scope> </dependency> - <!-- Dependencies to aries jpa modules --> - <dependency> - <artifactId>org.apache.aries.jpa.api</artifactId> - <groupId>org.apache.aries.jpa</groupId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.container</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.support</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.blueprint</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.eclipselink.adapter</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <!-- Openjpa --> <!-- Aries jndi is only needed for openjpa --> <dependency> @@ -313,21 +289,11 @@ <!-- JTA 1.2 --> <dependency> - <groupId>javax.interceptor</groupId> - <artifactId>javax.interceptor-api</artifactId> - <version>1.2</version> - </dependency> - <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.javax-inject</artifactId> <version>1_2</version> </dependency> <dependency> - <groupId>javax.el</groupId> - <artifactId>javax.el-api</artifactId> - <version>3.0.0</version> - </dependency> - <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> <version>1.2</version> @@ -366,10 +332,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.service.jdbc</artifactId> - </dependency> - <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-derby</artifactId> <version>${paxjdbc.version}</version> http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/f0774929/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index 43176ef..cffe121 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -36,9 +36,8 @@ <properties> <paxlogging.version>1.7.3</paxlogging.version> <exam.version>4.9.1</exam.version> - <url.version>1.6.0</url.version> + <url.version>2.5.2</url.version> <hibernate42.version>4.2.15.Final</hibernate42.version> - <hibernate43.version>4.4.9</hibernate43.version> <ant.bundle.version>1.8.2_2</ant.bundle.version> <antlr.bundle.version>2.7.7_5</antlr.bundle.version> <dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
