svn commit: r1624332 - in /webservices/xmlschema/trunk/xmlschema-bundle-test: pom.xml src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java

[dkulp]

Author: dkulp
Date: Thu Sep 11 16:42:22 2014
New Revision: 1624332

URL: http://svn.apache.org/r1624332
Log:
Update to a newer version of pax-exam

Modified:
    webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml
    
webservices/xmlschema/trunk/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java

Modified: webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml?rev=1624332&r1=1624331&r2=1624332&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml (original)
+++ webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml Thu Sep 11 
16:42:22 2014
@@ -44,19 +44,37 @@
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
-            <version>1.0.0</version>
+            <version>3.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-default</artifactId>
-            <version>1.0.0</version>
+            <artifactId>pax-exam-container-native</artifactId>
+            <version>3.4.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+            <version>3.2.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit4</artifactId>
+            <version>3.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit</artifactId>
-            <version>1.0.0</version>
+            <artifactId>pax-exam-link-mvn</artifactId>
+            <version>3.4.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-aether</artifactId>
+            <version>1.6.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -64,5 +82,10 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
     </dependencies>
 </project>

Modified: 
webservices/xmlschema/trunk/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java
URL: 
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java?rev=1624332&r1=1624331&r2=1624332&view=diff
==============================================================================
--- 
webservices/xmlschema/trunk/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java
 (original)
+++ 
webservices/xmlschema/trunk/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java
 Thu Sep 11 16:42:22 2014
@@ -20,29 +20,30 @@
 package org.apache.ws.xmlschema.bundletest;
 
 import junit.framework.Assert;
+
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.internal.DummyInternalClass;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-
+import org.ops4j.pax.exam.junit.PaxExam;
 
 /**
  *
  */
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
 public class XmlSchemaBundleTest {
 
     @Configuration
     public static Option[] configuration()
     {
-       return CoreOptions.options(CoreOptions.felix(), CoreOptions.provision(
-         
CoreOptions.mavenBundle().groupId("org.apache.ws.xmlschema").artifactId("xmlschema-core")
+       return CoreOptions.options(
+            CoreOptions.junitBundles(),
+            
CoreOptions.provision(CoreOptions.mavenBundle().groupId("org.apache.ws.xmlschema").artifactId("xmlschema-core")
        ));
     }