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/08/15 17:21:37 UTC

svn commit: r1157885 - in /incubator/rave: rave-master-pom/trunk/pom.xml trunk/rave-portal/src/main/webapp/META-INF/ trunk/rave-shindig/src/main/webapp/META-INF/

Author: ate
Date: Mon Aug 15 15:21:37 2011
New Revision: 1157885

URL: http://svn.apache.org/viewvc?rev=1157885&view=rev
Log:
RAVE-162: Fix missing DISCLAIMER file from build artifacts by leveraging the maven-remote-resources-plugin and the org.apache:apache-incubator-disclaimer-resource-bundle:1.1.
We don't need to include and maintain these ourselves anymore, except in the root svn tree  

Removed:
    incubator/rave/trunk/rave-portal/src/main/webapp/META-INF/
    incubator/rave/trunk/rave-shindig/src/main/webapp/META-INF/
Modified:
    incubator/rave/rave-master-pom/trunk/pom.xml

Modified: incubator/rave/rave-master-pom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/rave-master-pom/trunk/pom.xml?rev=1157885&r1=1157884&r2=1157885&view=diff
==============================================================================
--- incubator/rave/rave-master-pom/trunk/pom.xml (original)
+++ incubator/rave/rave-master-pom/trunk/pom.xml Mon Aug 15 15:21:37 2011
@@ -71,6 +71,28 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <!-- add apache-incubator-disclaimer-resource-bundle to be removed again when graduating from Incubator -->
+              <resourceBundles combine.children="append">
+                <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>      
+    </plugins>
+  </build>
+  
   <profiles>
     <profile>
       <id>pedantic</id>