maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject [29/50] git commit: o Fixed bootstrap to work with Ant 1.8.x
Date Sat, 01 Dec 2012 10:39:57 GMT
o Fixed bootstrap to work with Ant 1.8.x

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x@1001487 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/740efe80
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/740efe80
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/740efe80

Branch: refs/heads/maven-2.2.x
Commit: 740efe80d614eff8b3887bde51d2754f02838800
Parents: 21cffe1 5b9f2d2
Author: Benjamin Bentmann <bentmann@apache.org>
Authored: Sun Sep 26 18:08:45 2010 +0000
Committer: Benjamin Bentmann <bentmann@apache.org>
Committed: Sun Sep 26 18:08:45 2010 +0000

----------------------------------------------------------------------
 build.xml                 |   21 +++++++++------------
 maven-ant-tasks-2.0.8.jar |  Bin 980760 -> 0 bytes
 maven-ant-tasks-2.1.1.jar |  Bin 0 -> 1314262 bytes
 3 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/740efe80/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index f26f42c,53d2ea3..e115316
--- a/build.xml
+++ b/build.xml
@@@ -36,8 -36,8 +36,8 @@@ TODO
  <project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
  
    <target name="initTaskDefs" unless="taskdefs.inited">
--    <xmlproperty file="pom.xml" prefix="pom.xml" />
--    <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.0.8.jar"/>
++    <xmlproperty file="pom.xml" prefix="xmlPom" />
++    <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar"/>
      <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
classpathref="maven-ant-tasks.classpath"/>
      <property name="taskdefs.inited" value="true"/>
    </target>
@@@ -80,11 -80,11 +80,9 @@@
    </target>
  
    <target name="init" depends="isMavenHomeSet,initLocalRepo">
--    <xmlproperty prefix="pom" file="pom.xml"/>
      <basename file="${maven.home}" property="maven.home.basename"/>
      <dirname file="${maven.home}" property="maven.home.dirname"/>
--    <!-- Initialize properties -->
--    <property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}"/>
++    <property name="maven.home.basename.expected" value="apache-maven-${xmlPom.project.version}"/>
      <property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/>
      <property name="surefire.useFile" value="true"/>
      <echo>maven.home = ${maven.home}</echo>
@@@ -103,15 -96,15 +101,14 @@@
    </target>
  
    <target name="pull" depends="init, read-poms" unless="skip.pull">
--    <property name="verbose" value="false"/>
      <!-- Pull the dependencies that Maven needs to build -->
--    <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}"
useScope="compile">
++    <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" useScope="compile">
         <localRepository path="${maven.repo.local}"/>
         <pom refid="pom"/>
      </artifact:dependencies>
  
      <!-- Pull the dependencies for Modello -->
--    <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}">
++    <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset">
         <localRepository path="${maven.repo.local}"/>
         <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0"/>
         <dependency groupId="org.codehaus.modello" artifactId="modello-core" version="1.0"/>
@@@ -173,14 -166,14 +170,14 @@@
      </path>
  
      <mkdir dir="bootstrap/target/classes"/>
--    <javac destdir="bootstrap/target/classes" encoding="UTF-8" source="1.5" target="1.5"
debug="true">
++    <javac destdir="bootstrap/target/classes" encoding="UTF-8" source="1.5" target="1.5"
debug="true" includeAntRuntime="false">
        <src refid="sources"/>
        <classpath refid="pom.pathid"/>
      </javac>
  
      <!-- DGF generating a fake pom.properties so Maven thinks it has a version number
-->
      <mkdir dir="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core"/>
--    <echo message="version=${pom.project.version}"
++    <echo message="version=${xmlPom.project.version}"
            file="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core/pom.properties"/>
  
      <path id="maven.classpath">
@@@ -324,8 -314,8 +321,8 @@@
  
    <target name="with-its" depends="all,run-its"/>
  
--  <target name="set-temp-maven-home" depends="read-poms">
--    <property name="maven.home" location="${java.io.tmpdir}/apache-maven-${pom.version}"/>
++  <target name="set-temp-maven-home" depends="initTaskDefs">
++    <property name="maven.home" location="${java.io.tmpdir}/apache-maven-${xmlPom.project.version}"/>
      <echo>Using temporary maven install directory: ${maven.home}</echo>
    </target>
  

http://git-wip-us.apache.org/repos/asf/maven/blob/740efe80/maven-ant-tasks-2.0.8.jar
----------------------------------------------------------------------
diff --cc maven-ant-tasks-2.0.8.jar
index 8d0abaa,8d0abaa..0000000
deleted file mode 100644,100644
Binary files differ

http://git-wip-us.apache.org/repos/asf/maven/blob/740efe80/maven-ant-tasks-2.1.1.jar
----------------------------------------------------------------------
diff --cc maven-ant-tasks-2.1.1.jar
index 0000000,0000000..7810a54
new file mode 100644
Binary files differ


Mime
View raw message