Use 1.4.0 bundleplugin, and enable jdk13 classifier build in UPNP basedriver
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@631301 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/upnp/basedriver/pom.xml b/upnp/basedriver/pom.xml
index e2cc240..b833689 100644
--- a/upnp/basedriver/pom.xml
+++ b/upnp/basedriver/pom.xml
@@ -59,10 +59,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
-<!--
- <version>1.3.0-SNAPSHOT</version>
--->
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -99,7 +96,6 @@
</instructions>
<excludeDependencies>upnp-stack-jdk13</excludeDependencies>
</configuration>
-<!--
<executions>
<execution>
<id>jdk13</id>
@@ -127,7 +123,6 @@
</configuration>
</execution>
</executions>
--->
</plugin>
</plugins>
</build>
@@ -151,13 +146,11 @@
<version>1.8.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
-<!--
<dependency>
<groupId>it.cnr.isti.domoware.cyberdomo</groupId>
<artifactId>upnp-stack-jdk13</artifactId>
<version>1.8.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
--->
</dependencies>
</project>
diff --git a/upnp/extra/pom.xml b/upnp/extra/pom.xml
index d4a168b..53a4ae3 100644
--- a/upnp/extra/pom.xml
+++ b/upnp/extra/pom.xml
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/upnp/samples/binarylight/pom.xml b/upnp/samples/binarylight/pom.xml
index 8264178..df2e762 100644
--- a/upnp/samples/binarylight/pom.xml
+++ b/upnp/samples/binarylight/pom.xml
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/upnp/samples/clock/pom.xml b/upnp/samples/clock/pom.xml
index 61b4e9d..0f3e25b 100644
--- a/upnp/samples/clock/pom.xml
+++ b/upnp/samples/clock/pom.xml
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/upnp/samples/tv/pom.xml b/upnp/samples/tv/pom.xml
index 41c8f15..81ba75d 100644
--- a/upnp/samples/tv/pom.xml
+++ b/upnp/samples/tv/pom.xml
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/upnp/tester/pom.xml b/upnp/tester/pom.xml
index 0316870..aff1545 100644
--- a/upnp/tester/pom.xml
+++ b/upnp/tester/pom.xml
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>