commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r532523 - /jakarta/commons/proper/commons-parent/trunk/pom.xml
Date Wed, 25 Apr 2007 23:10:07 GMT
Author: niallp
Date: Wed Apr 25 16:10:06 2007
New Revision: 532523

URL: http://svn.apache.org/viewvc?view=rev&rev=532523
Log:
Specify maven source plugin version 2.0.3 and remove antrun workaround for source plugin bug
(now resolved)

Modified:
    jakarta/commons/proper/commons-parent/trunk/pom.xml

Modified: jakarta/commons/proper/commons-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/commons-parent/trunk/pom.xml?view=diff&rev=532523&r1=532522&r2=532523
==============================================================================
--- jakarta/commons/proper/commons-parent/trunk/pom.xml (original)
+++ jakarta/commons/proper/commons-parent/trunk/pom.xml Wed Apr 25 16:10:06 2007
@@ -96,6 +96,16 @@
     </mailingList>
   </mailingLists>
   <build>
+    <resources>
+      <resource>
+        <directory>${basedir}</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+          <include>LICENSE.txt</include>
+        </includes>
+      </resource>
+    </resources>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -108,6 +118,11 @@
           <artifactId>maven-jar-plugin</artifactId>
           <version>2.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.0.3</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -143,35 +158,6 @@
           <jdkLevel>${maven.compile.source}</jdkLevel>
         </configuration>
       </plugin>
-      <plugin>
-            <!-- This should possibly better be done by using a resource
-                 definition. However, if we declare a resource with
-                 ${basedir} as the base directory, then the
-                 maven-source-plugin will add the whole directory to
-                 its contents when generating a "sources" jar.
-
-                 see http://jira.codehaus.org/browse/MSOURCES-6
-            -->
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <configuration>
-              <tasks>
-                <copy todir="${project.build.outputDirectory}/META-INF">
-                  <fileset dir="${basedir}">
-                    <include name="LICENSE.txt" />
-                    <include name="NOTICE.txt" />
-                  </fileset>
-                </copy>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
@@ -230,6 +216,15 @@
         </repository>
       </distributionManagement>
       <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-source-plugin</artifactId>
+              <version>2.0.3</version>
+            </plugin>
+          </plugins>
+        </pluginManagement>
         <plugins>
           <!-- We want to sign the artifact, the POM, and all attached artifacts -->
           <plugin>
@@ -290,6 +285,15 @@
         </snapshotRepository>
       </distributionManagement>
       <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-source-plugin</artifactId>
+              <version>2.0.3</version>
+            </plugin>
+          </plugins>
+        </pluginManagement>
         <plugins>
           <!-- We want to sign the artifact, the POM, and all attached artifacts -->
           <plugin>



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message