ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1752025 - in /webservices/xmlschema/trunk/xmlschema-bundle-test: pom.xml src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java
Date Sat, 09 Jul 2016 16:55:38 GMT
Author: veithen
Date: Sat Jul  9 16:55:38 2016
New Revision: 1752025

URL: http://svn.apache.org/viewvc?rev=1752025&view=rev
Log:
Update Pax Exam and Apache Felix. This fixes a build failure on Java 8.

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=1752025&r1=1752024&r2=1752025&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml (original)
+++ webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml Sat Jul  9 16:55:38 2016
@@ -29,8 +29,30 @@
     <name>XmlSchema OSGi bundle test</name>
     <build>
         <defaultGoal>install</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>com.github.veithen.alta</groupId>
+                <artifactId>alta-maven-plugin</artifactId>
+                <version>0.4</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate-test-resources</goal>
+                        </goals>
+                        <configuration>
+                            <name>%bundle.symbolicName%.link</name>
+                            <value>%url%</value>
+                            <dependencySet>
+                                <scope>test</scope>
+                            </dependencySet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
     <properties>
+        <exam.version>4.9.1</exam.version>
         <!-- don't deploy this as this is just test data and a large amount of it -->
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
@@ -50,37 +72,31 @@
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
-            <version>3.4.0</version>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-native</artifactId>
-            <version>3.4.0</version>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>3.2.2</version>
+            <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-junit4</artifactId>
-            <version>3.4.0</version>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <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>
+            <artifactId>pax-exam-link-assembly</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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=1752025&r1=1752024&r2=1752025&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
Sat Jul  9 16:55:38 2016
@@ -20,6 +20,10 @@
 package org.apache.ws.xmlschema.bundletest;
 
 import junit.framework.Assert;
+
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.url;
+
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.internal.DummyInternalClass;
 import org.apache.ws.commons.schema.walker.XmlSchemaWalker;
@@ -38,11 +42,10 @@ public class XmlSchemaBundleTest {
 
     @Configuration
     public static Option[] configuration() {
-        return CoreOptions.options(CoreOptions.junitBundles(),
-                                   CoreOptions.provision(CoreOptions.mavenBundle()
-                                       .groupId("org.apache.ws.xmlschema").artifactId("xmlschema-core")),
-                                   CoreOptions.provision(CoreOptions.mavenBundle()
-                                       .groupId("org.apache.ws.xmlschema").artifactId("xmlschema-walker")));
+        return CoreOptions.options(
+                junitBundles(),
+                url("link:classpath:org.apache.ws.xmlschema.core.link"),
+                url("link:classpath:org.apache.ws.xmlschema.walker.link"));
     }
 
     @Test(expected = java.lang.NoClassDefFoundError.class)



Mime
View raw message