SOURCES (DEVEL): maven-build.patch - removed some classpath references

[pawelz]

Author: pawelz                       Date: Thu Mar 26 23:00:37 2009 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- removed some classpath references

---- Files affected:
SOURCES:
   maven-build.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/maven-build.patch
diff -u SOURCES/maven-build.patch:1.1.2.1 SOURCES/maven-build.patch:1.1.2.2
--- SOURCES/maven-build.patch:1.1.2.1	Thu Mar 26 23:54:10 2009
+++ SOURCES/maven-build.patch	Fri Mar 27 00:00:31 2009
@@ -8,8 +8,8 @@
        <arg value="-B"/>
        <arg value="-e"/>
        <arg value="clean"/>
---- maven-2.0.10/build.xml~	2009-03-26 23:45:47.000000000 +0100
-+++ maven-2.0.10/build.xml	2009-03-26 23:52:42.000000000 +0100
+--- build.xml~	2009-03-26 23:45:47.000000000 +0100
++++ build.xml	2009-03-26 23:52:42.000000000 +0100
 @@ -85,7 +85,7 @@
      </artifact:dependencies>          
    </target>
@@ -18,4 +18,58 @@
 +  <target name="generate-sources" description="generates Java sources from Modello mdo model files">
      <mkdir dir="bootstrap/target"/>
      <mkdir dir="bootstrap/target/generated-sources"/>
+ 
+--- build.xml~	2009-03-26 23:55:27.000000000 +0100
++++ build.xml	2009-03-26 23:58:47.000000000 +0100
+@@ -65,26 +65,6 @@
+     <delete dir="bootstrap"/>
+   </target>
+ 
+-  <target name="pull" depends="init, read-poms" unless="skip.pull">    
+-    <property name="verbose" value="false"/>
+-    <property name="bootstrap.repository" value="${basedir}/bootstrap-repository"/>
+-    <!-- Pull the dependencies that Maven needs to build -->
+-    <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}">
+-       <!--
+-       <localRepository path="${bootstrap.repository}"/>
+-       -->
+-       <pom refid="pom"/>                                                                                                                                       
+-    </artifact:dependencies>      
+-    
+-    <!-- Pull the dependencies for Modello -->
+-    <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}">
+-       <!--
+-       <localRepository path="${bootstrap.repository}"/>
+-       -->
+-       <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0-alpha-17"/>                                                                                                                                      
+-    </artifact:dependencies>          
+-  </target>
+-
+   <target name="generate-sources" description="generates Java sources from Modello mdo model files">
+     <mkdir dir="bootstrap/target"/>
+     <mkdir dir="bootstrap/target/generated-sources"/>
+@@ -95,7 +75,7 @@
+       <attribute name="version"/>
+       <sequential>
+         <java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true">
+-          <classpath refid="modello.pathid"/>
++	  <!-- <classpath refid="modello.pathid"/> -->
+           <arg file="@{file}"/>
+           <arg value="@{mode}"/>
+           <arg file="bootstrap/target/generated-sources"/>
+@@ -140,7 +120,6 @@
+     <mkdir dir="bootstrap/target/classes"/>
+     <javac destdir="bootstrap/target/classes" encoding="UTF-8" source="1.4" target="1.4" debug="${debug}">
+       <src refid="sources"/>
+-      <classpath refid="pom.pathid"/>
+     </javac>
+ 
+     <!-- DGF generating a fake pom.properties so Maven thinks it has a version number -->
+@@ -151,7 +130,6 @@
+     <path id="maven.classpath">
+       <pathelement location="bootstrap/target/classes"/>
+       <path refid="sources"/>
+-      <path refid="pom.pathid"/>
+     </path>
+   </target>
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/maven-build.patch?r1=1.1.2.1&r2=1.1.2.2&f=u