Author: mbenson
Date: Wed Jan 13 16:54:23 2016
New Revision: 1724458
URL: http://svn.apache.org/viewvc?rev=1724458&view=rev
Log:
require manual intervention for licensing requirements when upgrading ASM
Added:
commons/proper/weaver/trunk/LICENSE-asm5.0.4.txt
- copied unchanged from r1724455,
commons/proper/weaver/trunk/LICENSE-asm.txt
Removed:
commons/proper/weaver/trunk/LICENSE-asm.txt
Modified:
commons/proper/weaver/trunk/LICENSE.txt
commons/proper/weaver/trunk/dist/src/assembly/bin.xml
commons/proper/weaver/trunk/dist/src/assembly/src.xml
commons/proper/weaver/trunk/pom.xml
Modified: commons/proper/weaver/trunk/LICENSE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/LICENSE.txt?rev=1724458&r1=1724457&r2=1724458&view=diff
==============================================================================
--- commons/proper/weaver/trunk/LICENSE.txt (original)
+++ commons/proper/weaver/trunk/LICENSE.txt Wed Jan 13 16:54:23 2016
@@ -202,6 +202,6 @@
limitations under the License.
------------
-This product bundles version ${asm.version} of the ASM bytecode library
-under the license provided here as LICENSE-asm.txt.
+This product bundles version 5.0.4 of the ASM bytecode library
+under the license provided here as LICENSE-asm5.0.4.txt.
Modified: commons/proper/weaver/trunk/dist/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/dist/src/assembly/bin.xml?rev=1724458&r1=1724457&r2=1724458&view=diff
==============================================================================
--- commons/proper/weaver/trunk/dist/src/assembly/bin.xml (original)
+++ commons/proper/weaver/trunk/dist/src/assembly/bin.xml Wed Jan 13 16:54:23
2016
@@ -37,7 +37,6 @@
<include>NOTICE.txt</include>
<include>RELEASE-NOTES.txt</include>
</includes>
- <filtered>true</filtered>
</fileSet>
</fileSets>
</assembly>
Modified: commons/proper/weaver/trunk/dist/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/dist/src/assembly/src.xml?rev=1724458&r1=1724457&r2=1724458&view=diff
==============================================================================
--- commons/proper/weaver/trunk/dist/src/assembly/src.xml (original)
+++ commons/proper/weaver/trunk/dist/src/assembly/src.xml Wed Jan 13 16:54:23
2016
@@ -24,16 +24,8 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/..</directory>
- <includes>
- <include>*.txt</include>
- </includes>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/..</directory>
<excludes>
<exclude>${project.build.directory}/**</exclude>
- <exclude>*.txt</exclude>
<exclude>.*/**</exclude>
<exclude>**/${project.build.directory}/**</exclude>
<exclude>**/.*/**</exclude>
Modified: commons/proper/weaver/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/pom.xml?rev=1724458&r1=1724457&r2=1724458&view=diff
==============================================================================
--- commons/proper/weaver/trunk/pom.xml (original)
+++ commons/proper/weaver/trunk/pom.xml Wed Jan 13 16:54:23 2016
@@ -186,28 +186,21 @@ under the License.
<union id="notices" />
<seek name="LICENSE.txt" addto="notices" />
<seek name="NOTICE.txt" addto="notices" />
- <seek name="LICENSE-asm.txt" addto="notices" />
-
- <filterchain id="notice-filter">
- <expandproperties />
- </filterchain>
+ <seek name="LICENSE-asm${asm.version}.txt" addto="notices" />
<mkdir
dir="${project.build.directory}/generated-resources/notices/META-INF" />
<copy verbose="true"
todir="${project.build.directory}/generated-resources/notices/META-INF">
<resources refid="notices" />
- <filterchain refid="notice-filter" />
</copy>
<mkdir
dir="${project.build.directory}/generated-test-resources/notices/META-INF" />
<copy verbose="true"
todir="${project.build.directory}/generated-test-resources/notices/META-INF">
<resources refid="notices" />
- <filterchain refid="notice-filter" />
</copy>
<mkdir dir="${project.build.directory}/apidocs/META-INF" />
<copy verbose="true"
todir="${project.build.directory}/apidocs/META-INF">
<resources refid="notices" />
- <filterchain refid="notice-filter" />
</copy>
</sequential>
</target>
