You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by at...@apache.org on 2011/06/24 12:58:39 UTC
svn commit: r1139240 - in /incubator/rave/trunk: rave-portal/pom.xml
rave-shindig/pom.xml
Author: ate
Date: Fri Jun 24 10:58:38 2011
New Revision: 1139240
URL: http://svn.apache.org/viewvc?rev=1139240&view=rev
Log:
RAVE-63: override and fix maven-remote-resources-plugin configuration where to put the generated/merged LICENSE and NOTICE files for war artifacts
These are by default put under /WEB-INF/classes/META-INF but for a war artifact these should go under the root /META-INF folder.
For rave-shindig, also exclude these files from the shindig-server overlayed war artifact (from *both* locations) as these are not ours anyway
Modified:
incubator/rave/trunk/rave-portal/pom.xml
incubator/rave/trunk/rave-shindig/pom.xml
Modified: incubator/rave/trunk/rave-portal/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/pom.xml?rev=1139240&r1=1139239&r2=1139240&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/pom.xml (original)
+++ incubator/rave/trunk/rave-portal/pom.xml Fri Jun 24 10:58:38 2011
@@ -169,6 +169,25 @@ if needed you can specify it on the comm
<build>
<defaultGoal>install</defaultGoal>
<plugins>
+ <!--
+ fix for war processing of m-r-r-plugin causing the generated NOTICE and LICENSE file to be put under
+ WEB-INF/classes/META-INF
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+ <attached>false</attached>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>com.googlecode.mavenfilesync</groupId>
<artifactId>maven-filesync-plugin</artifactId>
Modified: incubator/rave/trunk/rave-shindig/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/pom.xml?rev=1139240&r1=1139239&r2=1139240&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/pom.xml (original)
+++ incubator/rave/trunk/rave-shindig/pom.xml Fri Jun 24 10:58:38 2011
@@ -88,6 +88,25 @@
<defaultGoal>install</defaultGoal>
<plugins>
+ <!--
+ fix for war processing of m-r-r-plugin causing the generated NOTICE and LICENSE file to be put under
+ WEB-INF/classes/META-INF
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+ <attached>false</attached>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>com.googlecode.mavenfilesync</groupId>
<artifactId>maven-filesync-plugin</artifactId>
@@ -112,7 +131,13 @@
<overlay>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-server</artifactId>
- </overlay>
+ <excludes>
+ <!-- exclude Shinding provided m-r-r-p generated L&N files:
+ ours are put directly under /META-INF and these are confusing and not ours anyway -->
+ <exclude>META-INF/*</exclude>
+ <exclude>WEB-INF/classes/META-INF/*</exclude>
+ </excludes>
+ </overlay>
</overlays>
</configuration>
</plugin>