You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2017/12/20 09:28:33 UTC
[maven-ant-plugin] 35/42: o Updated to maven-invoker-plugin:1.3
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.1.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 45dd97b3b8e99d200c76626147dab24acb8edc04
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Fri Nov 14 08:57:19 2008 +0000
o Updated to maven-invoker-plugin:1.3
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@713954 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 15 +--------------
src/it/ear-it/goals-2.txt | 1 -
src/it/ear-it/goals.txt | 3 ---
src/it/ear-it/invoker.properties | 3 +++
src/it/encoding-it/goals.txt | 3 ---
src/it/file-repo-it/goals.txt | 3 ---
src/it/plugin-it/goals.txt | 3 ---
src/it/relative-path-it/goals.txt | 3 ---
src/it/settings.xml | 4 ++--
src/it/single-test-it/goals.txt | 3 ---
src/it/skip-missing-junit-it/goals.txt | 3 ---
src/it/skip-test-compilation-it/goals.txt | 3 ---
src/it/skip-test-execution-it/goals.txt | 3 ---
src/it/test-custom-selector-it/goals.txt | 3 ---
src/it/test-default-selector-it/goals.txt | 3 ---
src/it/webapp-it/goals.txt | 3 ---
16 files changed, 6 insertions(+), 53 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2cc13fd..f10fd12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,6 +148,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>1.3</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
@@ -172,20 +173,6 @@ under the License.
<goal>run</goal>
</goals>
</execution>
- <!-- TODO: Remove execution once MINVOKER-46 is released -->
- <execution>
- <id>integration-test-phase-2</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pomIncludes>
- <pomInclude>ear-it/pom.xml</pomInclude>
- </pomIncludes>
- <goalsFile>goals-2.txt</goalsFile>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
diff --git a/src/it/ear-it/goals-2.txt b/src/it/ear-it/goals-2.txt
deleted file mode 100644
index 7179f2c..0000000
--- a/src/it/ear-it/goals-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-antrun:run
diff --git a/src/it/ear-it/goals.txt b/src/it/ear-it/goals.txt
deleted file mode 100644
index 96f7752..0000000
--- a/src/it/ear-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-install
-ant:ant
diff --git a/src/it/ear-it/invoker.properties b/src/it/ear-it/invoker.properties
new file mode 100644
index 0000000..d64c783
--- /dev/null
+++ b/src/it/ear-it/invoker.properties
@@ -0,0 +1,3 @@
+invoker.goals.1 = clean install ant:ant
+invoker.goals.2 = antrun:run
+invoker.nonRecursive.2 = true
diff --git a/src/it/encoding-it/goals.txt b/src/it/encoding-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/encoding-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/file-repo-it/goals.txt b/src/it/file-repo-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/file-repo-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/plugin-it/goals.txt b/src/it/plugin-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/plugin-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/relative-path-it/goals.txt b/src/it/relative-path-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/relative-path-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/settings.xml b/src/it/settings.xml
index 11e4382..68f23d0 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -29,7 +29,7 @@ under the License.
<repositories>
<repository>
<id>local.central</id>
- <url>file:///@localRepository@</url>
+ <url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -52,7 +52,7 @@ under the License.
<pluginRepositories>
<pluginRepository>
<id>local.central</id>
- <url>file:///@localRepository@</url>
+ <url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
diff --git a/src/it/single-test-it/goals.txt b/src/it/single-test-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/single-test-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/skip-missing-junit-it/goals.txt b/src/it/skip-missing-junit-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/skip-missing-junit-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/skip-test-compilation-it/goals.txt b/src/it/skip-test-compilation-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/skip-test-compilation-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/skip-test-execution-it/goals.txt b/src/it/skip-test-execution-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/skip-test-execution-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/test-custom-selector-it/goals.txt b/src/it/test-custom-selector-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/test-custom-selector-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/test-default-selector-it/goals.txt b/src/it/test-default-selector-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/test-default-selector-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
diff --git a/src/it/webapp-it/goals.txt b/src/it/webapp-it/goals.txt
deleted file mode 100644
index 4524f24..0000000
--- a/src/it/webapp-it/goals.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clean
-ant:ant
-antrun:run
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.