You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/09/25 19:13:51 UTC
svn commit: r699022 - in /maven/components/branches/2.2.0-M1-MNG-3759:
build.xml pom.xml
Author: ogusakov
Date: Thu Sep 25 10:13:50 2008
New Revision: 699022
URL: http://svn.apache.org/viewvc?rev=699022&view=rev
Log:
java 1.5, sona repo - trying to build in Hudson
Modified:
maven/components/branches/2.2.0-M1-MNG-3759/build.xml
maven/components/branches/2.2.0-M1-MNG-3759/pom.xml
Modified: maven/components/branches/2.2.0-M1-MNG-3759/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/2.2.0-M1-MNG-3759/build.xml?rev=699022&r1=699021&r2=699022&view=diff
==============================================================================
--- maven/components/branches/2.2.0-M1-MNG-3759/build.xml (original)
+++ maven/components/branches/2.2.0-M1-MNG-3759/build.xml Thu Sep 25 10:13:50 2008
@@ -57,7 +57,12 @@
<property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}"/>
<property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/>
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="surefire.useFile" value="true"/>
+ <property name="surefire.useFile" value="true"/>
+ <artifact:remoteRepository id="remote.repo.ms"
+ url="http://repository.sonatype.org/content/repositories/maven.snapshots" />
+ <artifact:remoteRepository id="remote.repo.p"
+ url="http://repository.sonatype.org/content/groups/public" />
+
<echo>maven.home = ${maven.home}</echo>
<echo>maven.assembly = ${maven.assembly}</echo>
</target>
@@ -75,13 +80,15 @@
<artifact:pom file="${basedir}/dependencies.xml" id="pom"/>
<artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}" useScope="compile">
<localRepository path="${maven.repo.local}"/>
+ <remoteRepository refid="remote.repo.ms"/>
+ <remoteRepository refid="remote.repo.p"/>
<pom refid="pom"/>
</artifact:dependencies>
<delete file="${basedir}/dependencies.xml"/>
<!-- Pull the dependencies for Modello -->
<artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}">
- <localRepository path="${maven.repo.local}"/>
+ <localRepository path="${maven.repo.local}"/>
<dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0-alpha-20"/>
<dependency groupId="org.codehaus.modello" artifactId="modello-core" version="1.0-alpha-20"/>
</artifact:dependencies>
@@ -162,6 +169,7 @@
<jvmarg value="-Xmx256M"/>
<classpath refid="maven.classpath"/>
<arg value="-B"/>
+ <arg value="-X"/>
<arg value="clean"/>
<arg value="install"/>
<arg value="-Dmaven.repo.local=${maven.repo.local}"/>
Modified: maven/components/branches/2.2.0-M1-MNG-3759/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/2.2.0-M1-MNG-3759/pom.xml?rev=699022&r1=699021&r2=699022&view=diff
==============================================================================
--- maven/components/branches/2.2.0-M1-MNG-3759/pom.xml (original)
+++ maven/components/branches/2.2.0-M1-MNG-3759/pom.xml Thu Sep 25 10:13:50 2008
@@ -122,6 +122,15 @@
<build>
<plugins>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
@@ -436,6 +445,18 @@
<artifactId>wagon-mercury</artifactId>
<version>${mercuryVersion}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-transport-http</artifactId>
+ <version>${mercuryVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-util</artifactId>
+ <version>${mercuryVersion}</version>
+ </dependency>
<!--
<dependency>
<groupId>org.apache.maven.wagon</groupId>