Skip to content
Permalink
Browse files
Added pax:run to all the upnp subproject
Removed automatic dependencies evaluation for upnp/pom.xml which caused multiple version of the same bundle to be installed



git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@777591 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Stefano Lenzi committed May 22, 2009
1 parent ab8138a commit 72db4f70629f2682f069ce0f46679f9bb90ecfc4
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 21 deletions.
@@ -157,24 +157,16 @@
</execution>
</executions>
</plugin>
<!--plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>minijar-maven-plugin</artifactId>
<version>1.0-alpha-3</version>
<executions>
<execution>
<id>ueberjar</id>
<phase>package</phase>
<goals><goal>ueberjar</goal></goals>
<configuration>
<stripUnusedClasses>true</stripUnusedClasses>
<includeDependencies>
<param>none:dependency</param>
</includeDependencies>
</configuration>
</execution>
</executions>
</plugin-->
<plugin>
<groupId>org.ops4j</groupId>
<artifactId>maven-pax-plugin</artifactId>
<configuration>
<provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver</provision>
<provision>mvn:org.apache.felix/javax.servlet</provision>
</provision>
</configuration>
</plugin>
</plugins>
</build>

@@ -67,6 +67,7 @@
<groupId>org.ops4j</groupId>
<artifactId>maven-pax-plugin</artifactId>
<configuration>
<noDependencies>true</noDependencies>
<provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver@nostart</provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.tester</provision>
@@ -49,8 +49,22 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.ops4j</groupId>
<artifactId>maven-pax-plugin</artifactId>
<configuration>
<provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver@nostart</provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.tester</provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.extra</provision>
<provision>mvn:org.apache.felix/javax.servlet</provision>
<provision>mvn:org.apache.felix/org.apache.felix.http.jetty@nostart</provision>
</provision>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -73,7 +87,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.upnp.extra</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.4.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -49,8 +49,22 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.ops4j</groupId>
<artifactId>maven-pax-plugin</artifactId>
<configuration>
<provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver@nostart</provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.tester</provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.extra</provision>
<provision>mvn:org.apache.felix/javax.servlet</provision>
<provision>mvn:org.apache.felix/org.apache.felix.http.jetty@nostart</provision>
</provision>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -67,7 +81,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.upnp.extra</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.4.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -49,8 +49,22 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.ops4j</groupId>
<artifactId>maven-pax-plugin</artifactId>
<configuration>
<provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver@nostart</provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.tester</provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.extra</provision>
<provision>mvn:org.apache.felix/javax.servlet</provision>
<provision>mvn:org.apache.felix/org.apache.felix.http.jetty@nostart</provision>
</provision>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -67,7 +81,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.upnp.extra</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.4.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -53,6 +53,17 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.ops4j</groupId>
<artifactId>maven-pax-plugin</artifactId>
<configuration>
<provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver/0.8.0@nostart</provision>
<provision>mvn:org.apache.felix/org.apache.felix.upnp.tester</provision>
<provision>mvn:org.apache.felix/javax.servlet</provision>
</provision>
</configuration>
</plugin>
</plugins>
</build>

0 comments on commit 72db4f7

Please sign in to comment.