[jboss-cvs] JBossAS SVN: r105396 - in trunk: build and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2010-05-29 11:23:31 -0400 (Sat, 29 May 2010)
New Revision: 105396

Modified:
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/pom.xml
Log:
JBBUILD-595 Update antrun plugin and refactor to work with Maven 3

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-05-29 13:54:54 UTC (rev 105395)
+++ trunk/build/build.xml	2010-05-29 15:23:31 UTC (rev 105396)
@@ -45,7 +45,7 @@
       -  Initialize properties for each dependency in the thirdparty pom 
       -  The properties take the form "groupId:artifactId:packaging"
       -->
-    <maven:pom id="pom.project" file="pom.xml"/>
+    <!--<maven:pom id="pom.project" file="pom.xml"/>
     <maven:dependencies filesetId="pom.dependencies"
                         versionsId="pom.dependencies.versions"
                         scopes="compile, runtime">
@@ -54,7 +54,7 @@
 
     <mapper id="remove-versions" classpathref="maven-ant-tasks.classpath"
               classname="org.apache.maven.artifact.ant.VersionMapper"
-              from="${pom.dependencies.versions}" to="flatten" />
+              from="${pom.dependencies.versions}" to="flatten" />-->
 
   </target>
 
@@ -81,7 +81,7 @@
 
     <!-- Module name(s) & version -->
     <property name="dist.module.name" value="jboss"/>
-    <property name="dist.module.version" value="${pom.project.version}"/>
+    <property name="dist.module.version" value="${project.version}"/>
     <property name="dist.module.output" value="${basedir}/target"/>
 
     <!-- Install/Release structure -->
@@ -519,13 +519,13 @@
 
     <jar destfile="${install.client}/${jbossall.client.filename}" basedir="${dist.module.output}/temp">
       <manifest>
-        <attribute name="Specification-Title" value="${pom.project.name}"/>
-        <attribute name="Specification-Version" value="${pom.project.version}"/>
-        <attribute name="Specification-Vendor" value="${pom.project.organization.name}"/>
-        <attribute name="Implementation-Title" value="${pom.project.name}"/>
-        <attribute name="Implementation-Version" value="${pom.project.version}"/>
-        <attribute name="Implementation-Vendor" value="${pom.project.organization.name}"/>
-        <attribute name="Implementation-Vendor-Id" value="${pom.project.groupId}"/>
+        <attribute name="Specification-Title" value="${project.name}"/>
+        <attribute name="Specification-Version" value="${project.version}"/>
+        <attribute name="Specification-Vendor" value="${project.organization.name}"/>
+        <attribute name="Implementation-Title" value="${project.name}"/>
+        <attribute name="Implementation-Version" value="${project.version}"/>
+        <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
+        <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
         <attribute name="Class-Path" value="${client.jar.manifest.classpath}"/>
       </manifest>
     </jar>
@@ -1781,7 +1781,7 @@
       </fileset>
     </copy>
 
-    <unzip dest="${install.osgi}" src="${osgi.module.output}/jboss-as-osgi-distribution-${pom.project.version}.zip"/>
+    <unzip dest="${install.osgi}" src="${osgi.module.output}/jboss-as-osgi-distribution-${project.version}.zip"/>
   </target>
 
   <!-- =========== -->

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2010-05-29 13:54:54 UTC (rev 105395)
+++ trunk/build/pom.xml	2010-05-29 15:23:31 UTC (rev 105396)
@@ -72,7 +72,11 @@
                 <phase>package</phase>
                 <configuration>
                   <tasks>
-                    <ant antfile="build.xml">
+                    <dependencyfilesets/>
+                    <mapper id="remove-versions"
+                            classname="org.apache.maven.ant.tasks.support.VersionMapper"
+                            from="${maven.project.dependencies.versions}" to="flatten" />
+                    <ant antfile="build.xml" inheritRefs="true">
                       <target name="dist"/>
                     </ant>
                  </tasks>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-05-29 13:54:54 UTC (rev 105395)
+++ trunk/pom.xml	2010-05-29 15:23:31 UTC (rev 105396)
@@ -43,7 +43,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.3</version>
+          <version>1.4</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>