Apply patch for FELIX-2845
ipojo composite references wrong maven-ipojo-plugin version
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1071292 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/arch/pom.xml b/ipojo/arch/pom.xml
index 0caef14..2e63096 100644
--- a/ipojo/arch/pom.xml
+++ b/ipojo/arch/pom.xml
@@ -29,10 +29,10 @@
<artifactId>org.apache.felix.ipojo.arch</artifactId>
<groupId>org.apache.felix</groupId>
<version>1.7.0-SNAPSHOT</version>
-
+
<description>Arch command to collect and print information about iPOJO instances.</description>
<url>http://felix.apache.org/site/ipojo-arch-command.html</url>
-
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -63,7 +63,7 @@
http://felix.apache.org/site/ipojo-arch-command.html
</Bundle-DocURL>
<Private-Package> org.apache.felix.ipojo.arch </Private-Package>
- <Include-Resource>
+ <Include-Resource>
META-INF/LICENSE=LICENSE,
META-INF/NOTICE=NOTICE,
META-INF/DEPENDENCIES=DEPENDENCIES
@@ -74,7 +74,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>${project.version}</version>
+ <version>1.8.0</version>
<executions>
<execution>
<goals>
diff --git a/ipojo/composite/pom.xml b/ipojo/composite/pom.xml
index 79c8516..ea035ed 100644
--- a/ipojo/composite/pom.xml
+++ b/ipojo/composite/pom.xml
@@ -110,7 +110,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>${project.version}</version>
+ <version>1.8.0</version>
<executions>
<execution>
<goals>
diff --git a/ipojo/online-manipulator/pom.xml b/ipojo/online-manipulator/pom.xml
index 0c1023e..049a952 100644
--- a/ipojo/online-manipulator/pom.xml
+++ b/ipojo/online-manipulator/pom.xml
@@ -28,12 +28,12 @@
<artifactId>org.apache.felix.ipojo.online.manipulator</artifactId>
<version>1.7.0-SNAPSHOT</version>
<name>Apache Felix iPOJO URL Handler</name>
-
+
<description>
iPOJO online manipulator allowing install time manipulation of iPOJO bundle.
</description>
<url>http://felix.apache.org/site/apache-felix-ipojo-online-manipulator.html</url>
-
+
<build>
<plugins>
<plugin>
@@ -55,7 +55,7 @@
org.objectweb.asm.commons, org.objectweb.asm </Export-Package>
<Import-Package> !org.objectweb.asm.tree, !sun.io, org.osgi.framework;version=1.3, *
</Import-Package>
- <Include-Resource>
+ <Include-Resource>
META-INF/LICENSE=LICENSE,
META-INF/LICENSE.asm=LICENSE.asm,
META-INF/NOTICE=NOTICE,
@@ -68,7 +68,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>${project.version}</version>
+ <version>1.8.0</version>
<executions>
<execution>
<goals>
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>${project.version}</version>
+ <version>1.8.0</version>
</dependency>
<dependency>
<groupId>asm</groupId>