Author: simonetripodi
Date: Tue Jul  3 16:15:35 2012
New Revision: 1356812

URL: http://svn.apache.org/viewvc?rev=1356812&view=rev
Log:
made the `without-deps` package include the right NOTICE file

Modified:
    incubator/any23/trunk/service/pom.xml
    incubator/any23/trunk/service/src/main/assembly/without-deps.xml

Modified: incubator/any23/trunk/service/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/any23/trunk/service/pom.xml?rev=1356812&r1=1356811&r2=1356812&view=diff
==============================================================================
--- incubator/any23/trunk/service/pom.xml (original)
+++ incubator/any23/trunk/service/pom.xml Tue Jul  3 16:15:35 2012
@@ -133,13 +133,6 @@
               </archive>
               <webResources>
                 <resource>
-                  <directory>${basedir}/../</directory>
-                  <targetPath>/META-INF</targetPath>
-                  <includes>
-                    <include>NOTICE.txt</include>
-                  </includes>
-                </resource>
-                <resource>
                   
<directory>${project.build.directory}/${assembly.finalName}-prepare-war-legals/without-deps/</directory>
                   <targetPath>/META-INF</targetPath>
                 </resource>

Modified: incubator/any23/trunk/service/src/main/assembly/without-deps.xml
URL: 
http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/assembly/without-deps.xml?rev=1356812&r1=1356811&r2=1356812&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/assembly/without-deps.xml (original)
+++ incubator/any23/trunk/service/src/main/assembly/without-deps.xml Tue Jul  3 
16:15:35 2012
@@ -35,7 +35,8 @@
       <fileMode>666</fileMode>
     </file>
     <file>
-      <source>${basedir}/../NOTICE.txt</source>
+      <source>${basedir}/src/main/assembly/NOTICE-without-deps.txt</source>
+      <destName>NOTICE.txt</destName>
       <outputDirectory>/</outputDirectory>
       <fileMode>666</fileMode>
     </file>


Reply via email to