Author: veithen
Date: Sat Aug 14 11:00:06 2010
New Revision: 985458
URL: http://svn.apache.org/viewvc?rev=985458&view=rev
Log:
Fixed the POMs so that all relevant artifacts contain the right set of legal
files.
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/pom.xml
axis/axis2/java/core/trunk/modules/transport/local/pom.xml
axis/axis2/java/core/trunk/modules/webapp/pom.xml
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml?rev=985458&r1=985457&r2=985458&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml Sat
Aug 14 11:00:06 2010
@@ -71,23 +71,23 @@
<url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin</url>
</scm>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>../../..</directory>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.axis2:axis2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<developers>
<developer>
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml?rev=985458&r1=985457&r2=985458&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml Sat
Aug 14 11:00:06 2010
@@ -72,23 +72,23 @@
<url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin</url>
</scm>
<build>
- <resources>
- <resource>
- <directory>../../..</directory>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.axis2:axis2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<developers>
<developer>
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=985458&r1=985457&r2=985458&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/pom.xml Sat Aug 14
11:00:06 2010
@@ -41,6 +41,21 @@
<testSourceDirectory>test</testSourceDirectory>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.axis2:axis2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
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=985458&r1=985457&r2=985458&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/local/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/local/pom.xml Sat Aug 14
11:00:06 2010
@@ -41,6 +41,21 @@
<testSourceDirectory>test</testSourceDirectory>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.axis2:axis2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=985458&r1=985457&r2=985458&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Sat Aug 14 11:00:06 2010
@@ -1364,6 +1364,21 @@
<finalName>axis2-${project.version}</finalName>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.axis2:axis2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo.jspc</groupId>
<artifactId>jspc-maven-plugin</artifactId>
<version>2.0-alpha-3</version>
