Skip to content

Commit eae8fc6

Browse files
author
Hong Fang Han
committed
GERONIMODEVTOOLS-663 Remove duplicated License and Notice files in each jar when we issue "mvn release:prepare"
git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/branches/2.1@1038464 13f79535-47bb-0310-9956-ffa450edef68
1 parent af520d2 commit eae8fc6

File tree

12 files changed

+107
-0
lines changed
  • plugins
    • org.apache.geronimo.jee.v21.jaxbmodel
    • org.apache.geronimo.runtime.common
    • org.apache.geronimo.runtime.v20
    • org.apache.geronimo.runtime.v21
    • org.apache.geronimo.st.core
    • org.apache.geronimo.st.schemas
    • org.apache.geronimo.st.ui
    • org.apache.geronimo.st.v20.core
    • org.apache.geronimo.st.v20.ui
    • org.apache.geronimo.st.v21.core
    • org.apache.geronimo.st.v21.ui
  • pom.xml

12 files changed

+107
-0
lines changed

‎plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,14 @@
101101
<include>NOTICE.txt</include>
102102
</includes>
103103
</resource>
104+
<resource>
105+
<targetPath>META-INF</targetPath>
106+
<directory>target/maven-shared-archive-resources/META-INF/</directory>
107+
<excludes>
108+
<exclude>LICENSE</exclude>
109+
<exclude>NOTICE</exclude>
110+
</excludes>
111+
</resource>
104112
</resources>
105113
<plugins>
106114
<!--

‎plugins/org.apache.geronimo.runtime.common/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,14 @@
8080
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
8181
</includes>
8282
</resource>
83+
<resource>
84+
<targetPath>META-INF</targetPath>
85+
<directory>target/maven-shared-archive-resources/META-INF/</directory>
86+
<excludes>
87+
<exclude>LICENSE</exclude>
88+
<exclude>NOTICE</exclude>
89+
</excludes>
90+
</resource>
8391
</resources>
8492
<plugins>
8593
<plugin>

‎plugins/org.apache.geronimo.runtime.v20/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@
8282
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
8383
</includes>
8484
</resource>
85+
<resource>
86+
<targetPath>META-INF</targetPath>
87+
<directory>target/maven-shared-archive-resources/META-INF/</directory>
88+
<excludes>
89+
<exclude>LICENSE</exclude>
90+
<exclude>NOTICE</exclude>
91+
</excludes>
92+
</resource>
8593
</resources>
8694
<plugins>
8795
<plugin>

‎plugins/org.apache.geronimo.runtime.v21/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@
8282
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
8383
</includes>
8484
</resource>
85+
<resource>
86+
<targetPath>META-INF</targetPath>
87+
<directory>target/maven-shared-archive-resources/META-INF/</directory>
88+
<excludes>
89+
<exclude>LICENSE</exclude>
90+
<exclude>NOTICE</exclude>
91+
</excludes>
92+
</resource>
8593
</resources>
8694
<plugins>
8795
<plugin>

‎plugins/org.apache.geronimo.st.core/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,14 @@
9595
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
9696
</includes>
9797
</resource>
98+
<resource>
99+
<targetPath>META-INF</targetPath>
100+
<directory>target/maven-shared-archive-resources/META-INF/</directory>
101+
<excludes>
102+
<exclude>LICENSE</exclude>
103+
<exclude>NOTICE</exclude>
104+
</excludes>
105+
</resource>
98106
</resources>
99107
<plugins>
100108
<plugin>

‎plugins/org.apache.geronimo.st.schemas/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@
7676
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
7777
</includes>
7878
</resource>
79+
<resource>
80+
<targetPath>META-INF</targetPath>
81+
<directory>target/maven-shared-archive-resources/META-INF/</directory>
82+
<excludes>
83+
<exclude>LICENSE</exclude>
84+
<exclude>NOTICE</exclude>
85+
</excludes>
86+
</resource>
7987
</resources>
8088
<plugins>
8189
<plugin>

‎plugins/org.apache.geronimo.st.ui/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,14 @@
9595
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
9696
</includes>
9797
</resource>
98+
<resource>
99+
<targetPath>META-INF</targetPath>
100+
<directory>target/maven-shared-archive-resources/META-INF/</directory>
101+
<excludes>
102+
<exclude>LICENSE</exclude>
103+
<exclude>NOTICE</exclude>
104+
</excludes>
105+
</resource>
98106
</resources>
99107
<plugins>
100108
<plugin>

‎plugins/org.apache.geronimo.st.v20.core/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@
8181
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
8282
</includes>
8383
</resource>
84+
<resource>
85+
<targetPath>META-INF</targetPath>
86+
<directory>target/maven-shared-archive-resources/META-INF/</directory>
87+
<excludes>
88+
<exclude>LICENSE</exclude>
89+
<exclude>NOTICE</exclude>
90+
</excludes>
91+
</resource>
8492
</resources>
8593
<plugins>
8694
<plugin>

‎plugins/org.apache.geronimo.st.v20.ui/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@
8181
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
8282
</includes>
8383
</resource>
84+
<resource>
85+
<targetPath>META-INF</targetPath>
86+
<directory>target/maven-shared-archive-resources/META-INF/</directory>
87+
<excludes>
88+
<exclude>LICENSE</exclude>
89+
<exclude>NOTICE</exclude>
90+
</excludes>
91+
</resource>
8492
</resources>
8593
<plugins>
8694
<plugin>

‎plugins/org.apache.geronimo.st.v21.core/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,16 @@
8888
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
8989
</includes>
9090
</resource>
91+
92+
<resource>
93+
<targetPath>META-INF</targetPath>
94+
<directory>target/maven-shared-archive-resources/META-INF/</directory>
95+
<excludes>
96+
<exclude>LICENSE</exclude>
97+
<exclude>NOTICE</exclude>
98+
</excludes>
99+
</resource>
100+
91101
</resources>
92102
<plugins>
93103
<plugin>

‎plugins/org.apache.geronimo.st.v21.ui/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@
8181
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
8282
</includes>
8383
</resource>
84+
<resource>
85+
<targetPath>META-INF</targetPath>
86+
<directory>target/maven-shared-archive-resources/META-INF/</directory>
87+
<excludes>
88+
<exclude>LICENSE</exclude>
89+
<exclude>NOTICE</exclude>
90+
</excludes>
91+
</resource>
8492
</resources>
8593
<plugins>
8694
<plugin>

‎pom.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,11 @@
316316
<skip>true</skip>
317317
</configuration>
318318
</plugin>
319+
<plugin>
320+
<groupId>org.apache.maven.plugins</groupId>
321+
<artifactId>maven-remote-resources-plugin</artifactId>
322+
<version>1.1</version>
323+
</plugin>
319324
</plugins>
320325
</pluginManagement>
321326

@@ -389,6 +394,18 @@
389394
<validity>${keystoreValDays}</validity>
390395
</configuration>
391396
</plugin>
397+
<!-- set attached as false to disable the automatic copy of LICNESE/NOTICE/DEPENDENCIES files -->
398+
<plugin>
399+
<groupId>org.apache.maven.plugins</groupId>
400+
<artifactId>maven-remote-resources-plugin</artifactId>
401+
<executions>
402+
<execution>
403+
<configuration>
404+
<attached>false</attached>>
405+
</configuration>
406+
</execution>
407+
</executions>
408+
</plugin>
392409
</plugins>
393410
</build>
394411

0 commit comments

Comments
 (0)