You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ha...@apache.org on 2010/11/24 04:51:34 UTC
svn commit: r1038464 - in /geronimo/devtools/eclipse-plugin/branches/2.1: ./
plugins/org.apache.geronimo.jee.v21.jaxbmodel/
plugins/org.apache.geronimo.runtime.common/
plugins/org.apache.geronimo.runtime.v20/
plugins/org.apache.geronimo.runtime.v21/ pl...
Author: hanhongfang
Date: Wed Nov 24 03:51:33 2010
New Revision: 1038464
URL: http://svn.apache.org/viewvc?rev=1038464&view=rev
Log:
GERONIMODEVTOOLS-663 Remove duplicated License and Notice files in each jar when we issue "mvn release:prepare"
Modified:
geronimo/devtools/eclipse-plugin/branches/2.1/ (props changed)
geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.common/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.v20/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.core/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.schemas/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.ui/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v20.core/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v20.ui/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v21.core/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v21.ui/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1/pom.xml
Propchange: geronimo/devtools/eclipse-plugin/branches/2.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 24 03:51:33 2010
@@ -1 +1 @@
-/geronimo/devtools/eclipse-plugin/trunk:700249-701571,734752-734846
+/geronimo/devtools/eclipse-plugin/trunk:700249-701571,734752-734846,993190
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml Wed Nov 24 03:51:33 2010
@@ -101,6 +101,14 @@
<include>NOTICE.txt</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </resource>
</resources>
<plugins>
<!--
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.common/pom.xml Wed Nov 24 03:51:33 2010
@@ -80,6 +80,14 @@
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.v20/pom.xml Wed Nov 24 03:51:33 2010
@@ -82,6 +82,14 @@
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml Wed Nov 24 03:51:33 2010
@@ -82,6 +82,14 @@
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.core/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.core/pom.xml Wed Nov 24 03:51:33 2010
@@ -95,6 +95,14 @@
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.schemas/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.schemas/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.schemas/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.schemas/pom.xml Wed Nov 24 03:51:33 2010
@@ -76,6 +76,14 @@
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.ui/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.ui/pom.xml Wed Nov 24 03:51:33 2010
@@ -95,6 +95,14 @@
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v20.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v20.core/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v20.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v20.core/pom.xml Wed Nov 24 03:51:33 2010
@@ -81,6 +81,14 @@
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v20.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v20.ui/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v20.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v20.ui/pom.xml Wed Nov 24 03:51:33 2010
@@ -81,6 +81,14 @@
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v21.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v21.core/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v21.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v21.core/pom.xml Wed Nov 24 03:51:33 2010
@@ -88,6 +88,16 @@
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
</includes>
</resource>
+
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </resource>
+
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v21.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v21.ui/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v21.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.v21.ui/pom.xml Wed Nov 24 03:51:33 2010
@@ -81,6 +81,14 @@
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
</includes>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/pom.xml?rev=1038464&r1=1038463&r2=1038464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1/pom.xml Wed Nov 24 03:51:33 2010
@@ -316,6 +316,11 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -389,6 +394,18 @@
<validity>${keystoreValDays}</validity>
</configuration>
</plugin>
+ <!-- set attached as false to disable the automatic copy of LICNESE/NOTICE/DEPENDENCIES files -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <attached>false</attached>>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>