Author: veithen
Date: Sun Jul 18 22:29:32 2010
New Revision: 965302
URL: http://svn.apache.org/viewvc?rev=965302&view=rev
Log:
Solved some issues when the Eclipse plugins are built as part of the
mutli-module build.
Modified:
axis/axis2/java/core/trunk/modules/all/pom.xml
axis/axis2/java/core/trunk/modules/osgi/pom.xml
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/pom.xml
axis/axis2/java/core/trunk/modules/transport/local/pom.xml
Modified: axis/axis2/java/core/trunk/modules/all/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/all/pom.xml?rev=965302&r1=965301&r2=965302&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/all/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/all/pom.xml Sun Jul 18 22:29:32 2010
@@ -176,7 +176,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: axis/axis2/java/core/trunk/modules/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi/pom.xml?rev=965302&r1=965301&r2=965302&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi/pom.xml Sun Jul 18 22:29:32 2010
@@ -62,7 +62,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=965302&r1=965301&r2=965302&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sun Jul 18 22:29:32 2010
@@ -1247,6 +1247,11 @@
<artifactId>maven-gpg-plugin</artifactId>
<version>1.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.1.0</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=965302&r1=965301&r2=965302&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
Sun Jul 18 22:29:32 2010
@@ -247,7 +247,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.1.0</version>
<extensions>true</extensions>
<configuration>
<!-- Produce the manifest in the location expected by
Eclipse -->
@@ -282,7 +281,7 @@
<source>
import java.util.jar.Manifest
- Manifest manifest = new Manifest(new
FileInputStream("META-INF/MANIFEST.MF"))
+ Manifest manifest = new Manifest(new
FileInputStream(new File(project.basedir, "META-INF/MANIFEST.MF")))
project.properties["bundle-symbolic-name"] =
manifest.mainAttributes.getValue("Bundle-SymbolicName").find("^[^;]*")
project.properties["bundle-version"] =
manifest.mainAttributes.getValue("Bundle-Version")
</source>
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=965302&r1=965301&r2=965302&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
Sun Jul 18 22:29:32 2010
@@ -220,7 +220,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.1.0</version>
<extensions>true</extensions>
<configuration>
<!-- Produce the manifest in the location expected by
Eclipse -->
@@ -255,7 +254,7 @@
<source>
import java.util.jar.Manifest
- Manifest manifest = new Manifest(new
FileInputStream("META-INF/MANIFEST.MF"))
+ Manifest manifest = new Manifest(new
FileInputStream(new File(project.basedir, "META-INF/MANIFEST.MF")))
project.properties["bundle-symbolic-name"] =
manifest.mainAttributes.getValue("Bundle-SymbolicName").find("^[^;]*")
project.properties["bundle-version"] =
manifest.mainAttributes.getValue("Bundle-Version")
</source>
Modified: axis/axis2/java/core/trunk/modules/transport/http/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/pom.xml?rev=965302&r1=965301&r2=965302&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/pom.xml Sun Jul 18
22:29:32 2010
@@ -40,7 +40,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: axis/axis2/java/core/trunk/modules/transport/local/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/pom.xml?rev=965302&r1=965301&r2=965302&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/local/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/local/pom.xml Sun Jul 18
22:29:32 2010
@@ -40,7 +40,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
