Author: ate
Date: Mon Apr 12 23:28:19 2010
New Revision: 933446
URL: http://svn.apache.org/viewvc?rev=933446&view=rev
Log:
Remove no longer needed assembly-plugin overrides as inherited apache-7 pom now
correctly defines it with runOnlyAtExecutionRoot=true
Modified:
portals/applications/dbbrowser/trunk/dbbrowser-jar/pom.xml
portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml
portals/applications/dbbrowser/trunk/pom.xml
portals/applications/demo/trunk/pom.xml
portals/applications/gems/trunk/pom.xml
portals/applications/rss/trunk/pom.xml
portals/applications/rss/trunk/rss-jar/pom.xml
portals/applications/rss/trunk/rss-war/pom.xml
portals/applications/webcontent/trunk/pom.xml
portals/applications/webcontent/trunk/webcontent-jar/pom.xml
portals/applications/webcontent/trunk/webcontent-war/pom.xml
Modified: portals/applications/dbbrowser/trunk/dbbrowser-jar/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-jar/pom.xml?rev=933446&r1=933445&r2=933446&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-jar/pom.xml (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-jar/pom.xml Mon Apr 12
23:28:19 2010
@@ -159,17 +159,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <!-- only include this in top level project poms -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml?rev=933446&r1=933445&r2=933446&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml Mon Apr 12
23:28:19 2010
@@ -77,14 +77,6 @@
</configuration>
</plugin>
<plugin>
- <!-- only include this in top level project poms -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </plugin>
- <plugin>
<!-- workaround for war processing of m-r-r-plugin causing the
generated NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
Modified: portals/applications/dbbrowser/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/pom.xml?rev=933446&r1=933445&r2=933446&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/pom.xml (original)
+++ portals/applications/dbbrowser/trunk/pom.xml Mon Apr 12 23:28:19 2010
@@ -52,19 +52,4 @@
<url>http://svn.apache.org/viewcvs.cgi/portals/applications/dbbrowser/trunk/</url>
</scm>
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <!-- only include this in top level project poms -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
Modified: portals/applications/demo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/demo/trunk/pom.xml?rev=933446&r1=933445&r2=933446&view=diff
==============================================================================
--- portals/applications/demo/trunk/pom.xml (original)
+++ portals/applications/demo/trunk/pom.xml Mon Apr 12 23:28:19 2010
@@ -306,18 +306,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <!-- only include this in top level project poms -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified: portals/applications/gems/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/gems/trunk/pom.xml?rev=933446&r1=933445&r2=933446&view=diff
==============================================================================
--- portals/applications/gems/trunk/pom.xml (original)
+++ portals/applications/gems/trunk/pom.xml Mon Apr 12 23:28:19 2010
@@ -186,7 +186,6 @@
</resource>
</resources>
-
</build>
<profiles>
@@ -209,18 +208,6 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <!-- only include this in top level project poms -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
+
</project>
\ No newline at end of file
Modified: portals/applications/rss/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/rss/trunk/pom.xml?rev=933446&r1=933445&r2=933446&view=diff
==============================================================================
--- portals/applications/rss/trunk/pom.xml (original)
+++ portals/applications/rss/trunk/pom.xml Mon Apr 12 23:28:19 2010
@@ -51,18 +51,5 @@ limitations under the License.
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/applications/rss/trunk/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/portals/applications/rss/trunk/</url>
</scm>
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <!-- only include this in top level project poms -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
Modified: portals/applications/rss/trunk/rss-jar/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/rss/trunk/rss-jar/pom.xml?rev=933446&r1=933445&r2=933446&view=diff
==============================================================================
--- portals/applications/rss/trunk/rss-jar/pom.xml (original)
+++ portals/applications/rss/trunk/rss-jar/pom.xml Mon Apr 12 23:28:19 2010
@@ -181,18 +181,5 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <!-- only include this in top level project poms -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: portals/applications/rss/trunk/rss-war/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/rss/trunk/rss-war/pom.xml?rev=933446&r1=933445&r2=933446&view=diff
==============================================================================
--- portals/applications/rss/trunk/rss-war/pom.xml (original)
+++ portals/applications/rss/trunk/rss-war/pom.xml Mon Apr 12 23:28:19 2010
@@ -115,14 +115,6 @@
</configuration>
</plugin>
<plugin>
- <!-- only include this in top level project poms -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </plugin>
- <plugin>
<!--
workaround for war processing of m-r-r-plugin causing the generated
NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF
Modified: portals/applications/webcontent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/pom.xml?rev=933446&r1=933445&r2=933446&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/pom.xml (original)
+++ portals/applications/webcontent/trunk/pom.xml Mon Apr 12 23:28:19 2010
@@ -57,18 +57,4 @@
<url>http://svn.apache.org/viewcvs.cgi/portals/applications/webcontent/trunk/</url>
</scm>
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <!-- only include this in top level project poms -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Modified: portals/applications/webcontent/trunk/webcontent-jar/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/pom.xml?rev=933446&r1=933445&r2=933446&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-jar/pom.xml (original)
+++ portals/applications/webcontent/trunk/webcontent-jar/pom.xml Mon Apr 12
23:28:19 2010
@@ -256,16 +256,4 @@
</exclusions>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <!-- only include this in top level project poms -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: portals/applications/webcontent/trunk/webcontent-war/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/pom.xml?rev=933446&r1=933445&r2=933446&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-war/pom.xml (original)
+++ portals/applications/webcontent/trunk/webcontent-war/pom.xml Mon Apr 12
23:28:19 2010
@@ -94,14 +94,6 @@
</configuration>
</plugin>
<plugin>
- <!-- only include this in top level project poms -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </plugin>
- <plugin>
<!--
workaround for war processing of m-r-r-plugin causing the generated
NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF
