svn commit: r1091259 - /commons/proper/net/trunk/pom.xml

[se...@apache.org]

Author: sebb
Date: Tue Apr 12 00:06:20 2011
New Revision: 1091259

URL: http://svn.apache.org/viewvc?rev=1091259&view=rev
Log:
Add temporary fixes to generate binary and source test jars (will become part of parent pom)

Modified:
    commons/proper/net/trunk/pom.xml

Modified: commons/proper/net/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=1091259&r1=1091258&r2=1091259&view=diff
==============================================================================
--- commons/proper/net/trunk/pom.xml (original)
+++ commons/proper/net/trunk/pom.xml Tue Apr 12 00:06:20 2011
@@ -232,7 +232,7 @@ Supported protocols include: Echo, Finge
                 </executions>
             </plugin>
             <!--  Attaches the commons-net-ftp JAR to the Maven lifecycle
-                  to ensure that it will be signed a deployed as normal -->
+                  to ensure that it will be signed and deployed as normal -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -285,6 +285,18 @@ Supported protocols include: Echo, Finge
 
         </plugins>
 
+      <!-- Temporary fix until Commons Parent is updated: add N&L files to test jars -->
+      <testResources>
+        <testResource>
+          <directory>${basedir}</directory>
+          <targetPath>META-INF</targetPath>
+          <includes>
+            <include>NOTICE.txt</include>
+            <include>LICENSE.txt</include>
+          </includes>
+        </testResource>
+      </testResources>
+
     </build>
 
     <reporting>
@@ -343,6 +355,69 @@ Supported protocols include: Echo, Finge
     </reporting>
 
     <profiles>
+      <!-- TEMPORARY until new Commons Parent is released -->
+      <profile>
+        <id>apache-release</id>
+        <build>
+          <plugins>
+      <plugin>
+        <!--
+          - Copy LICENSE.txt and NOTICE.txt so that they are included
+          - in the -javadoc jar file for the component.
+          -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>tests.resources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <copy todir="${project.build.directory}/test-classes/META-INF">
+                  <fileset dir="${basedir}">
+                    <include name="LICENSE.txt" />
+                    <include name="NOTICE.txt" />
+                  </fileset>
+                </copy>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-test-sources</id>
+                <goals>
+                  <goal>test-jar</goal>
+                </goals>
+                <phase>generate-sources</phase>
+              </execution>
+            </executions>
+          </plugin>
+
+            <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>test-jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>          
+        </plugins>
+      </build>
+    </profile>
+    <!-- END of temporary addition -->
+    
       <profile>
         <id>rc</id>
         <distributionManagement>