You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2014/03/12 20:47:55 UTC
svn commit: r1576869 - in /webservices/axiom/trunk: pom.xml
systests/osgi-tests/pom.xml
systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
Author: veithen
Date: Wed Mar 12 19:47:54 2014
New Revision: 1576869
URL: http://svn.apache.org/r1576869
Log:
Get rid of the pax-exam-link-mvn dependency and ensure that all artifacts are resolved by the Maven session of the build (and not a distinct Maven session created by Pax Exam).
Modified:
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/systests/osgi-tests/pom.xml
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1576869&r1=1576868&r2=1576869&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Wed Mar 12 19:47:54 2014
@@ -376,6 +376,18 @@
<shade.plugin.version>1.6</shade.plugin.version>
<jacoco.version>0.6.3.201306030806</jacoco.version>
</properties>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>cloudbees-snapshot</id>
+ <url>http://repository-veithen.forge.cloudbees.com/snapshot/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
<build>
<extensions>
<extension>
Modified: webservices/axiom/trunk/systests/osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/pom.xml?rev=1576869&r1=1576868&r2=1576869&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/osgi-tests/pom.xml Wed Mar 12 19:47:54 2014
@@ -30,18 +30,6 @@
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
- <version>2.2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <!-- Contains SJSXP -->
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxp-ri</artifactId>
- <version>1.4.5_1</version>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>axiom-api</artifactId>
<version>${project.version}</version>
@@ -65,18 +53,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
- <version>2.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
- <version>2.1.13_2</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -97,24 +73,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- <version>1.7.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.5.11</version>
@@ -132,14 +96,46 @@
<build>
<plugins>
<plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>paxexam-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
<executions>
<execution>
<goals>
- <goal>generate-link-files</goal>
+ <goal>generate-test-resources</goal>
</goals>
+ <configuration>
+ <name>%paxexam.linkName%</name>
+ <altName>%bundle.symbolicName%.link</altName>
+ <value>%url%</value>
+ <dependencySet>
+ <scope>test</scope>
+ </dependencySet>
+ <artifacts>
+ <artifact>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>2.2.0</version>
+ </artifact>
+ <artifact>
+ <!-- Contains SJSXP -->
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxp-ri</artifactId>
+ <version>1.4.5_1</version>
+ </artifact>
+ <artifact>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+ <version>2.0.0</version>
+ </artifact>
+ <artifact>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+ <version>2.1.13_2</version>
+ </artifact>
+ </artifacts>
+ <paxExam>${exam.version}</paxExam>
+ </configuration>
</execution>
</executions>
</plugin>
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java?rev=1576869&r1=1576868&r2=1576869&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java Wed Mar 12 19:47:54 2014
@@ -102,7 +102,7 @@ public class UsesConstraintsTest {
Listener listener = new Listener();
context.addFrameworkListener(listener);
List<Bundle> bundles = new ArrayList<Bundle>();
- bundles.add(context.installBundle("link:classpath:org.ops4j.pax.logging.pax-logging-api.link"));
+ bundles.add(context.installBundle("link:classpath:META-INF/links/org.ops4j.pax.logging.api.link"));
bundles.add(context.installBundle("link:classpath:org.apache.geronimo.specs.geronimo-activation_1.1_spec.link"));
bundles.add(context.installBundle("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"));
bundles.add(context.installBundle("link:classpath:stax2-api.link"));