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
diff --git a/upnp/basedriver/pom.xml b/upnp/basedriver/pom.xml
index e7bf112..2599841 100644
--- a/upnp/basedriver/pom.xml
+++ b/upnp/basedriver/pom.xml
@@ -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>
diff --git a/upnp/pom.xml b/upnp/pom.xml
index 42269d2..5035e82 100644
--- a/upnp/pom.xml
+++ b/upnp/pom.xml
@@ -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>
diff --git a/upnp/samples/binarylight/pom.xml b/upnp/samples/binarylight/pom.xml
index d2f5245..342ca56 100644
--- a/upnp/samples/binarylight/pom.xml
+++ b/upnp/samples/binarylight/pom.xml
@@ -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>
diff --git a/upnp/samples/clock/pom.xml b/upnp/samples/clock/pom.xml
index 932a9df..43a2ff4 100644
--- a/upnp/samples/clock/pom.xml
+++ b/upnp/samples/clock/pom.xml
@@ -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>
diff --git a/upnp/samples/tv/pom.xml b/upnp/samples/tv/pom.xml
index 1843a88..69cf79d 100644
--- a/upnp/samples/tv/pom.xml
+++ b/upnp/samples/tv/pom.xml
@@ -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>
diff --git a/upnp/tester/pom.xml b/upnp/tester/pom.xml
index 5d65e10..4b214c1 100644
--- a/upnp/tester/pom.xml
+++ b/upnp/tester/pom.xml
@@ -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>