You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/08/11 18:41:55 UTC
svn commit: r684802 - in /maven/plugins/trunk/maven-patch-plugin: ./ src/it/
src/it/apply-single-patch/ src/it/apply-two-patches-in-order/
src/it/it-project-parent/ src/it/path with spaces/
src/it/projects/apply/apply-single-patch/ src/it/projects/appl...
Author: bentmann
Date: Mon Aug 11 09:41:50 2008
New Revision: 684802
URL: http://svn.apache.org/viewvc?rev=684802&view=rev
Log:
o Updated ITs to use features of maven-invoker-plugin:1.2.1
Added:
maven/plugins/trunk/maven-patch-plugin/src/it/apply-single-patch/ (props changed)
- copied from r684790, maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/
maven/plugins/trunk/maven-patch-plugin/src/it/apply-two-patches-in-order/ (props changed)
- copied from r684790, maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/
maven/plugins/trunk/maven-patch-plugin/src/it/path with spaces/ (props changed)
- copied from r684790, maven/plugins/trunk/maven-patch-plugin/src/it/projects/path with spaces/
maven/plugins/trunk/maven-patch-plugin/src/it/remove-empty-files/ (props changed)
- copied from r684790, maven/plugins/trunk/maven-patch-plugin/src/it/projects/remove-empty-files/
maven/plugins/trunk/maven-patch-plugin/src/it/settings.xml (with props)
maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-enum-missing/ (props changed)
- copied from r684790, maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/
maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-tracking-file-present/ (props changed)
- copied from r684790, maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/
Removed:
maven/plugins/trunk/maven-patch-plugin/src/it/apply-single-patch/goals.txt
maven/plugins/trunk/maven-patch-plugin/src/it/apply-two-patches-in-order/goals.txt
maven/plugins/trunk/maven-patch-plugin/src/it/it-project-parent/
maven/plugins/trunk/maven-patch-plugin/src/it/path with spaces/goals.txt
maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/
maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/
maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/
maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/
maven/plugins/trunk/maven-patch-plugin/src/it/projects/path with spaces/
maven/plugins/trunk/maven-patch-plugin/src/it/projects/remove-empty-files/
maven/plugins/trunk/maven-patch-plugin/src/it/remove-empty-files/goals.txt
maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-enum-missing/goals.txt
maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-tracking-file-present/goals.txt
Modified:
maven/plugins/trunk/maven-patch-plugin/pom.xml
maven/plugins/trunk/maven-patch-plugin/src/it/apply-single-patch/pom.xml
maven/plugins/trunk/maven-patch-plugin/src/it/apply-two-patches-in-order/pom.xml
maven/plugins/trunk/maven-patch-plugin/src/it/path with spaces/pom.xml
maven/plugins/trunk/maven-patch-plugin/src/it/remove-empty-files/pom.xml
maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-enum-missing/pom.xml
maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-tracking-file-present/pom.xml
Modified: maven/plugins/trunk/maven-patch-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/pom.xml?rev=684802&r1=684801&r2=684802&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-plugin/pom.xml Mon Aug 11 09:41:50 2008
@@ -70,122 +70,38 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <!-- FIXME: Disable execution, makes IT preparation fail (for whatever reason...) -->
- <execution>
- <id>generated-helpmojo</id>
- <configuration>
- <extractors>
- <extractor/>
- </extractors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>run-its</id>
-
- <properties>
- <test.remote.repo.url>file://${project.build.testOutputDirectory}/remote-repository</test.remote.repo.url>
- </properties>
-
<build>
- <testResources>
- <testResource>
- <directory>src/it/projects</directory>
- <targetPath>projects</targetPath>
- </testResource>
- <testResource>
- <directory>src/it/it-project-parent</directory>
- <targetPath>it-project-parent</targetPath>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>src/it/remote-repository</directory>
- <targetPath>remote-repository</targetPath>
- </testResource>
- </testResources>
<plugins>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
+ <artifactId>maven-invoker-plugin</artifactId>
<configuration>
- <filesets>
- <fileset>
- <directory>src/it</directory>
- <includes>
- <include>**/build.log</include>
- </includes>
- </fileset>
- </filesets>
+ <debug>true</debug>
+ <projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ <preBuildHookScript>setup.bsh</preBuildHookScript>
+ <postBuildHookScript>verify.bsh</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <goals>
+ <goal>clean</goal>
+ <goal>initialize</goal>
+ </goals>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-component-it-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- <executions>
- <execution>
- <id>stage-plugin</id>
- <goals>
- <goal>stage</goal>
- </goals>
- <configuration>
- <pluginVersion>testing</pluginVersion>
- <repositoryDirectory>${project.build.directory}/local-repository</repositoryDirectory>
- <skipUnitTests>true</skipUnitTests>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
<executions>
<execution>
- <id>setup-integration-test-parent</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <suppressSummaries>true</suppressSummaries>
- <goals>
- <goal>install</goal>
- </goals>
- <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
- <pom>${project.build.testOutputDirectory}/it-project-parent/pom.xml</pom>
- <streamLogs>true</streamLogs>
- </configuration>
- </execution>
- <execution>
<id>integration-test</id>
- <phase>integration-test</phase>
<goals>
+ <goal>install</goal>
<goal>run</goal>
</goals>
- <configuration>
- <debug>true</debug>
- <projectsDirectory>${project.build.testOutputDirectory}/projects</projectsDirectory>
- <pomIncludes>
- <pomInclude>**/pom.xml</pomInclude>
- </pomIncludes>
- <pomExcludes>
- <pomExclude>**/child*/pom.xml</pomExclude>
- <pomExclude>**/module*/pom.xml</pomExclude>
- </pomExcludes>
- <postBuildHookScript>verify.bsh</postBuildHookScript>
- <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
- </configuration>
</execution>
- </executions>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/apply-single-patch/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/plugins/trunk/maven-patch-plugin/src/it/apply-single-patch/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/apply-single-patch/pom.xml?rev=684802&r1=684790&r2=684802&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/apply-single-patch/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/apply-single-patch/pom.xml Mon Aug 11 09:41:50 2008
@@ -20,20 +20,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugins.patch.it</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
+ <groupId>test</groupId>
<artifactId>apply-single-patch</artifactId>
<name>apply-single-patch</name>
-
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
+ <version>@pom.version@</version>
<configuration>
<targetDirectory>${basedir}</targetDirectory>
Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/apply-two-patches-in-order/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/plugins/trunk/maven-patch-plugin/src/it/apply-two-patches-in-order/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/apply-two-patches-in-order/pom.xml?rev=684802&r1=684790&r2=684802&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/apply-two-patches-in-order/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/apply-two-patches-in-order/pom.xml Mon Aug 11 09:41:50 2008
@@ -20,20 +20,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugins.patch.it</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
+ <groupId>test</groupId>
<artifactId>apply-two-patches-in-order</artifactId>
<name>apply-two-patches-in-order</name>
-
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
+ <version>@pom.version@</version>
<configuration>
<targetDirectory>${basedir}</targetDirectory>
Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/path with spaces/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/plugins/trunk/maven-patch-plugin/src/it/path with spaces/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/path%20with%20spaces/pom.xml?rev=684802&r1=684790&r2=684802&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/path with spaces/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/path with spaces/pom.xml Mon Aug 11 09:41:50 2008
@@ -20,20 +20,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugins.patch.it</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
+ <groupId>test</groupId>
<artifactId>path-with-spaces</artifactId>
<name>path-with-spaces</name>
-
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
+ <version>@pom.version@</version>
<executions>
<execution>
<id>apply-patch-0</id>
Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/remove-empty-files/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/plugins/trunk/maven-patch-plugin/src/it/remove-empty-files/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/remove-empty-files/pom.xml?rev=684802&r1=684790&r2=684802&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/remove-empty-files/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/remove-empty-files/pom.xml Mon Aug 11 09:41:50 2008
@@ -20,20 +20,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugins.patch.it</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
+ <groupId>test</groupId>
<artifactId>remove-empty-files</artifactId>
<name>remove-empty-files</name>
-
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
+ <version>@pom.version@</version>
<executions>
<execution>
<id>apply-patch-0</id>
Added: maven/plugins/trunk/maven-patch-plugin/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/settings.xml?rev=684802&view=auto
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/settings.xml (added)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/settings.xml Mon Aug 11 09:41:50 2008
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.central</id>
+ <url>file://@localRepository@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>local.central</id>
+ <url>file://@localRepository@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-enum-missing/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-enum-missing/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-enum-missing/pom.xml?rev=684802&r1=684790&r2=684802&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-enum-missing/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-enum-missing/pom.xml Mon Aug 11 09:41:50 2008
@@ -20,20 +20,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugins.patch.it</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
+ <groupId>test</groupId>
<artifactId>apply-single-patch</artifactId>
<name>apply-single-patch</name>
-
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
+ <version>@pom.version@</version>
<configuration>
<targetDirectory>${basedir}</targetDirectory>
Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-tracking-file-present/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-tracking-file-present/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-tracking-file-present/pom.xml?rev=684802&r1=684790&r2=684802&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-tracking-file-present/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/skip-when-patch-tracking-file-present/pom.xml Mon Aug 11 09:41:50 2008
@@ -20,20 +20,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.plugins.patch.it</groupId>
- <artifactId>it-project-parent</artifactId>
- <version>1</version>
- </parent>
-
+ <groupId>test</groupId>
<artifactId>skip-when-patch-tracking-file-present</artifactId>
<name>skip-when-patch-tracking-file-present</name>
-
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
+ <version>@pom.version@</version>
<configuration>
<targetDirectory>${basedir}</targetDirectory>