Author: jochen
Date: Sat Jun  2 17:46:16 2007
New Revision: 543816

URL: http://svn.apache.org/viewvc?view=rev&rev=543816
Log:
Ensured that the -sources and -javadoc jar files contain META-INF/LICENSE and 
META-INF/NOTICE.

Modified:
    jakarta/commons/proper/io/branches/b1_3/pom.xml

Modified: jakarta/commons/proper/io/branches/b1_3/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/io/branches/b1_3/pom.xml?view=diff&rev=543816&r1=543815&r2=543816
==============================================================================
--- jakarta/commons/proper/io/branches/b1_3/pom.xml (original)
+++ jakarta/commons/proper/io/branches/b1_3/pom.xml Sat Jun  2 17:46:16 2007
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>2</version>
+    <version>3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-io</groupId>
@@ -202,27 +202,37 @@
   <build>
     <sourceDirectory>src/java</sourceDirectory>
     <testSourceDirectory>src/test</testSourceDirectory>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <includes>
-                <include>**/*Test*</include>
-              </includes>
-              <excludes>
-                <exclude>**/*AbstractTestCase*</exclude>
-                <exclude>**/AllIOTestSuite*</exclude>
-                <exclude>**/PackageTestSuite*</exclude>
-                <exclude>**/testtools/**</exclude>
-
-                <!-- http://jira.codehaus.org/browse/SUREFIRE-44 -->
-                <exclude>**/*$*</exclude>
-              </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/*Test*</include>
+          </includes>
+          <excludes>
+            <exclude>**/*AbstractTestCase*</exclude>
+            <exclude>**/AllIOTestSuite*</exclude>
+            <exclude>**/PackageTestSuite*</exclude>
+            <exclude>**/testtools/**</exclude>
+
+            <!-- http://jira.codehaus.org/browse/SUREFIRE-44 -->
+            <exclude>**/*$*</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/bin.xml</descriptor>
+            <descriptor>src/main/assembly/src.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
   <reporting>
     <plugins>
@@ -241,16 +251,6 @@
           </reportSet>
         </reportSets>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/bin.xml</descriptor>
-            <descriptor>src/main/assembly/src.xml</descriptor>
-          </descriptors>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-      </plugin>
     </plugins>
   </reporting>
 
@@ -283,6 +283,24 @@
                     <copy todir="${project.build.directory}/site/api-release">
                       <fileset dir="${project.build.directory}/site/apidocs"/>
                     </copy>
+                    <zip 
destfile="${project.build.directory}/${artifactId}-${version}-javadoc.jar.new">
+                      <zipfileset 
src="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
+                      <zipfileset dir="." prefix="META-INF">
+                        <include name="LICENSE.txt"/>
+                        <include name="NOTICE.txt"/>
+                      </zipfileset>
+                    </zip>
+                    <move 
file="${project.build.directory}/${artifactId}-${version}-javadoc.jar.new"
+                          
tofile="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
+                    <zip 
destfile="${project.build.directory}/${artifactId}-${version}-sources.jar.new">
+                      <zipfileset 
src="${project.build.directory}/${artifactId}-${version}-sources.jar"/>
+                      <zipfileset dir="." prefix="META-INF">
+                        <include name="LICENSE.txt"/>
+                        <include name="NOTICE.txt"/>
+                      </zipfileset>
+                    </zip>
+                    <move 
file="${project.build.directory}/${artifactId}-${version}-sources.jar.new"
+                          
tofile="${project.build.directory}/${artifactId}-${version}-sources.jar"/>
                   </tasks>
                 </configuration>
               </execution>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to