You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/05/01 23:11:36 UTC
svn commit: r652663 - in /maven/plugins/trunk/maven-jar-plugin: pom.xml
src/it/settings.xml
Author: olamy
Date: Thu May 1 14:11:35 2008
New Revision: 652663
URL: http://svn.apache.org/viewvc?rev=652663&view=rev
Log:
use last invoker plugin version
configure it for a faster build
Added:
maven/plugins/trunk/maven-jar-plugin/src/it/settings.xml (with props)
Modified:
maven/plugins/trunk/maven-jar-plugin/pom.xml
Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=652663&r1=652662&r2=652663&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/pom.xml Thu May 1 14:11:35 2008
@@ -144,18 +144,6 @@
</execution>
</executions>
</plugin>
-
- <!-- Testing the result of the it pom.xml -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <excludes>
- <exclude>**/*IntegrationTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
<profiles>
@@ -171,33 +159,8 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>${project.build.directory}/${project.build.finalName}.jar</file>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <packaging>${project.packaging}</packaging>
- <pomFile>${basedir}/pom.xml</pomFile>
- <createChecksum>true</createChecksum>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <localRepositoryId>it-local-repo</localRepositoryId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<pomIncludes>
@@ -209,6 +172,8 @@
<goal>clean</goal>
<goal>package</goal>
</goals>
+ <installProjectArtifacts>true</installProjectArtifacts>
+ <settingsFile>src/it/settings.xml</settingsFile>
</configuration>
<executions>
<execution>
@@ -236,4 +201,17 @@
</plugin>
</plugins>
</reporting>
+ <!-- TODO remove when invoker plugin 1.2 is released -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </pluginRepository>
+ </pluginRepositories>
</project>
Added: maven/plugins/trunk/maven-jar-plugin/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/settings.xml?rev=652663&view=auto
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/settings.xml (added)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/settings.xml Thu May 1 14:11:35 2008
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<settings>
+ <profiles>
+ <profile>
+ <id>apache</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.central</id>
+ <url>file://@localRepository@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>local.central</id>
+ <url>file://@localRepository@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"