This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch asfMavenTlpPlgnBuild
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
The following commit(s) were added to refs/heads/asfMavenTlpPlgnBuild by this
push:
new cd0b66a Update usage maven-invoker-plugin
cd0b66a is described below
commit cd0b66a3f77274a2a7a4efebb619cb4d307eebf8
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sat Aug 25 23:52:23 2018 +0200
Update usage maven-invoker-plugin
---
.../invoker.properties | 3 ++
.../custom-containerDescriptorHandler/pom.xml | 46 +---------------------
.../custom-containerDescriptorHandler/verify.bsh | 4 +-
.../invoker.properties | 3 ++
.../custom-handler-withFileEntries/pom.xml | 46 +---------------------
.../custom-handler-withFileEntries/verify.bsh | 4 +-
.../invoker.properties | 3 ++
.../custom-handler-withMixedEntries/pom.xml | 46 +---------------------
.../custom-handler-withMixedEntries/verify.bsh | 4 +-
9 files changed, 18 insertions(+), 141 deletions(-)
diff --git
a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties
b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties
index f902e50..edb1394 100644
---
a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties
+++
b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties
@@ -16,3 +16,6 @@
# under the License.
invoker.goals=install
+
+invoker.project.1=handler-def
+invoker.project.2=assembly
diff --git
a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
index 692f872..c3b4969 100644
---
a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
+++
b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
@@ -30,50 +30,6 @@ under the License.
<groupId>org.test</groupId>
<artifactId>custom-containerDescriptorHandler</artifactId>
<packaging>pom</packaging>
- <version>1</version>
<name>custom-containerDescriptorHandler</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
-
- <configuration>
- <suppressSummaries>true</suppressSummaries>
- <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
- <properties>
- <testVersion>${testVersion}</testVersion>
- </properties>
- <streamLogs>true</streamLogs>
- <goals>
- <goal>install</goal>
- </goals>
- </configuration>
-
- <executions>
- <execution>
- <id>handler-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pom>handler-def/pom.xml</pom>
- </configuration>
- </execution>
- <execution>
- <id>assembly-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <debug>true</debug>
- <pom>assembly/pom.xml</pom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+
</project>
diff --git
a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
index b531e33..d380581 100644
---
a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
+++
b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
@@ -23,8 +23,8 @@ boolean result = true;
try
{
- File a = new File( basedir, "target/its/target/assembly-1-bin/file.txt");
- File b = new File( basedir, "target/its/target/assembly-1-bin/b/file.txt");
+ File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
+ File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
if(result && !a.exists() ) {
System.out.println( "File: " + a + " should have been generated, but
was not." );
diff --git
a/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties
b/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties
index f902e50..edb1394 100644
---
a/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties
+++
b/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties
@@ -16,3 +16,6 @@
# under the License.
invoker.goals=install
+
+invoker.project.1=handler-def
+invoker.project.2=assembly
diff --git
a/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
b/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
index 91fea38..36cd287 100644
---
a/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
+++
b/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
@@ -30,50 +30,6 @@ under the License.
<groupId>org.test</groupId>
<artifactId>custom-handler-withFileEntries</artifactId>
<packaging>pom</packaging>
- <version>1</version>
<name>custom-handler-withFileEntries</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
-
- <configuration>
- <suppressSummaries>true</suppressSummaries>
- <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
- <streamLogs>true</streamLogs>
- <properties>
- <testVersion>${testVersion}</testVersion>
- </properties>
- <goals>
- <goal>install</goal>
- </goals>
- </configuration>
-
- <executions>
- <execution>
- <id>handler-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pom>handler-def/pom.xml</pom>
- </configuration>
- </execution>
- <execution>
- <id>assembly-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <debug>true</debug>
- <pom>assembly/pom.xml</pom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+
</project>
diff --git
a/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
b/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
index b531e33..d380581 100644
---
a/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
+++
b/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
@@ -23,8 +23,8 @@ boolean result = true;
try
{
- File a = new File( basedir, "target/its/target/assembly-1-bin/file.txt");
- File b = new File( basedir, "target/its/target/assembly-1-bin/b/file.txt");
+ File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
+ File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
if(result && !a.exists() ) {
System.out.println( "File: " + a + " should have been generated, but
was not." );
diff --git
a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties
b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties
index f902e50..edb1394 100644
---
a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties
+++
b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties
@@ -16,3 +16,6 @@
# under the License.
invoker.goals=install
+
+invoker.project.1=handler-def
+invoker.project.2=assembly
diff --git
a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
index a8dd79f..9809baa 100644
---
a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
+++
b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
@@ -30,50 +30,6 @@ under the License.
<groupId>org.test</groupId>
<artifactId>custom-handler-withMixedEntries</artifactId>
<packaging>pom</packaging>
- <version>1</version>
<name>custom-handler-withMixedEntries</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
-
- <configuration>
- <suppressSummaries>true</suppressSummaries>
- <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
- <properties>
- <testVersion>${testVersion}</testVersion>
- </properties>
- <streamLogs>true</streamLogs>
- <goals>
- <goal>install</goal>
- </goals>
- </configuration>
-
- <executions>
- <execution>
- <id>handler-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pom>handler-def/pom.xml</pom>
- </configuration>
- </execution>
- <execution>
- <id>assembly-build</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <debug>true</debug>
- <pom>assembly/pom.xml</pom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+
</project>
diff --git
a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
index b531e33..d380581 100644
---
a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
+++
b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
@@ -23,8 +23,8 @@ boolean result = true;
try
{
- File a = new File( basedir, "target/its/target/assembly-1-bin/file.txt");
- File b = new File( basedir, "target/its/target/assembly-1-bin/b/file.txt");
+ File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
+ File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
if(result && !a.exists() ) {
System.out.println( "File: " + a + " should have been generated, but
was not." );
