Author: mnuttall
Date: Mon Jun 30 09:56:33 2014
New Revision: 1606659
URL: http://svn.apache.org/r1606659
Log:
Aries-1221: Remove bundle versions from itest dependencies
Modified:
aries/trunk/jmx/jmx-itests/pom.xml
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
Modified: aries/trunk/jmx/jmx-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/pom.xml?rev=1606659&r1=1606658&r2=1606659&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ aries/trunk/jmx/jmx-itests/pom.xml Mon Jun 30 09:56:33 2014
@@ -49,15 +49,13 @@
</properties>
<dependencies>
- <!--
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx</artifactId>
<version>1.1.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
- -->
- <dependency>
+ <dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
<version>1.1.1-SNAPSHOT</version>
@@ -80,13 +78,11 @@
<artifactId>org.apache.aries.jmx.whiteboard</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
- <!--
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core.whiteboard</artifactId>
<version>1.1.2-SNAPSHOT</version>
</dependency>
- -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
Modified:
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java?rev=1606659&r1=1606658&r2=1606659&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
(original)
+++
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
Mon Jun 30 09:56:33 2014
@@ -82,8 +82,8 @@ public abstract class AbstractIntegratio
mavenBundle("org.osgi",
"org.osgi.compendium").versionAsInProject(),
mavenBundle("org.apache.aries",
"org.apache.aries.util").versionAsInProject(),
mavenBundle("org.apache.felix",
"org.apache.felix.configadmin").versionAsInProject(),
- mavenBundle("org.apache.aries.jmx",
"org.apache.aries.jmx").version("1.1.2-SNAPSHOT"),
- mavenBundle("org.apache.aries.jmx",
"org.apache.aries.jmx.core.whiteboard").version("1.1.2-SNAPSHOT"),
+ mavenBundle("org.apache.aries.jmx",
"org.apache.aries.jmx").versionAsInProject(),
+ mavenBundle("org.apache.aries.jmx",
"org.apache.aries.jmx.core.whiteboard").versionAsInProject(),
mavenBundle("org.apache.aries.jmx",
"org.apache.aries.jmx.api").versionAsInProject(),
mavenBundle("org.apache.aries.jmx",
"org.apache.aries.jmx.whiteboard").versionAsInProject(),
mavenBundle("org.apache.aries.testsupport",
"org.apache.aries.testsupport.unit").versionAsInProject(),
