Author: tv
Date: Sun Nov 18 18:00:13 2012
New Revision: 1410942
URL: http://svn.apache.org/viewvc?rev=1410942&view=rev
Log:
Adjust assemblies to use generated LICENSE and NOTICE files
Modified:
turbine/core/trunk/src/assembly/binaries.xml
turbine/core/trunk/src/assembly/source.xml
turbine/core/trunk/src/changes/changes.xml
Modified: turbine/core/trunk/src/assembly/binaries.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/assembly/binaries.xml?rev=1410942&r1=1410941&r2=1410942&view=diff
==============================================================================
--- turbine/core/trunk/src/assembly/binaries.xml (original)
+++ turbine/core/trunk/src/assembly/binaries.xml Sun Nov 18 18:00:13 2012
@@ -39,6 +39,12 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>README*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
<include>LICENSE*</include>
<include>NOTICE*</include>
</includes>
Modified: turbine/core/trunk/src/assembly/source.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/assembly/source.xml?rev=1410942&r1=1410941&r2=1410942&view=diff
==============================================================================
--- turbine/core/trunk/src/assembly/source.xml (original)
+++ turbine/core/trunk/src/assembly/source.xml Sun Nov 18 18:00:13 2012
@@ -30,13 +30,19 @@
<directory>${project.basedir}</directory>
<includes>
<include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
<include>pom.xml</include>
</includes>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
<fileSet>
+
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/src</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
Modified: turbine/core/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/changes/changes.xml?rev=1410942&r1=1410941&r2=1410942&view=diff
==============================================================================
--- turbine/core/trunk/src/changes/changes.xml (original)
+++ turbine/core/trunk/src/changes/changes.xml Sun Nov 18 18:00:13 2012
@@ -25,6 +25,9 @@
<body>
<release version="4.0-M2" date="in Subversion">
+ <action type="update" dev="tv">
+ Use Apache Turbine Parent POM version 2
+ </action>
<action type="add" dev="tv">
Add Annotation @InjectService to inject Turbine service instance into
assemblers
such as screens, actions, navigations etc.
