You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/12/23 21:18:52 UTC

[maven-assembly-plugin] branch stabilize_ITs created (now 5f1a9b1)

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch stabilize_ITs
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


      at 5f1a9b1  Don't use maven-invoker-plugin in ITs

This branch includes the following new commits:

     new 5f1a9b1  Don't use maven-invoker-plugin in ITs

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[maven-assembly-plugin] 01/01: Don't use maven-invoker-plugin in ITs

Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch stabilize_ITs
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git

commit 5f1a9b1fe47d7e0a7c71fad7e8ffd7b5591e8b50
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Dec 23 22:18:46 2018 +0100

    Don't use maven-invoker-plugin in ITs
---
 src/it/it-project-parent/pom.xml                   |  3 +-
 .../handler-def/pom.xml                            |  8 ----
 .../invoker.properties                             |  5 ++-
 .../custom-containerDescriptorHandler/pom.xml      | 46 +---------------------
 .../handler-def/pom.xml                            |  8 ----
 .../invoker.properties                             |  5 ++-
 .../custom-handler-withFileEntries/pom.xml         | 43 --------------------
 .../handler-def/pom.xml                            |  8 ----
 .../invoker.properties                             |  6 ++-
 .../custom-handler-withMixedEntries/pom.xml        | 43 --------------------
 10 files changed, 16 insertions(+), 159 deletions(-)

diff --git a/src/it/it-project-parent/pom.xml b/src/it/it-project-parent/pom.xml
index 144de8c..e0804ce 100644
--- a/src/it/it-project-parent/pom.xml
+++ b/src/it/it-project-parent/pom.xml
@@ -68,8 +68,9 @@ under the License.
       <build>
         <plugins>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>${testVersion}</version>
+            <version>@project.version@</version>
           </plugin>
           <plugin>
              <artifactId>maven-jar-plugin</artifactId>
diff --git a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
index 5c64535..7cd959a 100644
--- a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
+++ b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml
@@ -26,12 +26,4 @@ under the License.
   <version>1</version>
   <artifactId>handler-def</artifactId>
   
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-assembly-plugin</artifactId>
-      <version>${testVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
 </project>
diff --git a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties
index f902e50..649f9c8 100644
--- a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties
+++ b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties
@@ -14,5 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+invoker.project.1=handler-def
+invoker.goals.1=install
 
-invoker.goals=install
+invoker.project.2=assembly
+invoker.goals.2=package
diff --git a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
index 692f872..03b85e4 100644
--- a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
+++ b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
@@ -31,49 +31,5 @@ under the License.
   <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-handler-withFileEntries/handler-def/pom.xml b/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
index 5c64535..7cd959a 100644
--- a/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
+++ b/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml
@@ -26,12 +26,4 @@ under the License.
   <version>1</version>
   <artifactId>handler-def</artifactId>
   
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-assembly-plugin</artifactId>
-      <version>${testVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
 </project>
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..649f9c8 100644
--- a/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties
+++ b/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties
@@ -14,5 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+invoker.project.1=handler-def
+invoker.goals.1=install
 
-invoker.goals=install
+invoker.project.2=assembly
+invoker.goals.2=package
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..6b03541 100644
--- a/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
+++ b/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
@@ -33,47 +33,4 @@ under the License.
   <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-withMixedEntries/handler-def/pom.xml b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
index 5c64535..7cd959a 100644
--- a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
+++ b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml
@@ -26,12 +26,4 @@ under the License.
   <version>1</version>
   <artifactId>handler-def</artifactId>
   
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-assembly-plugin</artifactId>
-      <version>${testVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
 </project>
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..91a7b51 100644
--- a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties
+++ b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties
@@ -14,5 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+invoker.project.1=handler-def
+invoker.goals.1=install
+
+invoker.project.2=assembly
+invoker.goals.2=package
 
-invoker.goals=install
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..4269f70 100644
--- a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
+++ b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
@@ -33,47 +33,4 @@ under the License.
   <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>