Author: dkulp
Date: Thu May 15 18:29:02 2014
New Revision: 1595009
URL: http://svn.apache.org/r1595009
Log:
ARIES-1188 Remove pax exam dependency and make testsupport compatible to pax
exam 3
Removed:
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/ExtraOptions.java
Modified:
aries/trunk/testsupport/testsupport-unit/pom.xml
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/RichBundleContext.java
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/packageinfo
Modified: aries/trunk/testsupport/testsupport-unit/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit/pom.xml?rev=1595009&r1=1595008&r2=1595009&view=diff
==============================================================================
--- aries/trunk/testsupport/testsupport-unit/pom.xml (original)
+++ aries/trunk/testsupport/testsupport-unit/pom.xml Thu May 15 18:29:02 2014
@@ -28,7 +28,7 @@
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Unit Test Support</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<description>
This bundle provides unit test support.
</description>
@@ -79,12 +79,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
</dependency>
</dependencies>
Modified:
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java?rev=1595009&r1=1595008&r2=1595009&view=diff
==============================================================================
---
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java
(original)
+++
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java
Thu May 15 18:29:02 2014
@@ -18,7 +18,8 @@
*/
package org.apache.aries.itest;
-import org.ops4j.pax.exam.Inject;
+import javax.inject.Inject;
+
import org.osgi.framework.BundleContext;
/**
Modified:
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/RichBundleContext.java
URL:
http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/RichBundleContext.java?rev=1595009&r1=1595008&r2=1595009&view=diff
==============================================================================
---
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/RichBundleContext.java
(original)
+++
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/RichBundleContext.java
Thu May 15 18:29:02 2014
@@ -165,11 +165,13 @@ public class RichBundleContext implement
delegate.removeFrameworkListener(listener);
}
+ @SuppressWarnings("rawtypes")
public ServiceRegistration registerService(String[] clazzes,
Object service, Dictionary properties) {
return delegate.registerService(clazzes, service, properties);
}
+ @SuppressWarnings("rawtypes")
public ServiceRegistration registerService(String clazz, Object service,
Dictionary properties) {
return delegate.registerService(clazz, service, properties);
Modified:
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/packageinfo
URL:
http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/packageinfo?rev=1595009&r1=1595008&r2=1595009&view=diff
==============================================================================
---
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/packageinfo
(original)
+++
aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/packageinfo
Thu May 15 18:29:02 2014
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 1.0.0
+version 2.0.0
