maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khmarba...@apache.org
Subject [maven-ear-plugin] 20/24: Fixed.
Date Thu, 16 Apr 2020 13:20:14 GMT
This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch itf-extension
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git

commit 5a246599027633ff378725ff8fc9aeb7e2244f66
Author: Karl Heinz Marbaise <khmarbaise@apache.org>
AuthorDate: Sun Mar 29 17:19:33 2020 +0200

    Fixed.
---
 pom.xml                                            | 48 ++++++++++++----------
 .../plugins/ear/it/{EARMIT.java => EARIT.java}     | 15 +++----
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index a78cf0e..4b3669d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-plugins</artifactId>
     <version>34</version>
     <relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
   </parent>
@@ -93,7 +93,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.5.2</version>
+        <version>5.6.1</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -150,7 +150,7 @@
       <artifactId>maven-mapping</artifactId>
       <version>3.0.0</version>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-verifier</artifactId>
@@ -174,7 +174,13 @@
      -->
     <dependency>
       <groupId>org.apache.maven.jupiter.extension</groupId>
-      <artifactId>maven-it-extension</artifactId>
+      <artifactId>maven-jupiter-extension</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.jupiter.extension</groupId>
+      <artifactId>maven-it-assertions</artifactId>
       <version>0.1.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
@@ -325,7 +331,7 @@
               </execution>
               <execution>
                 <id>install-artifacts</id>
-                <phase>EMPTY</phase>
+<!--                <phase>EMPTY</phase>-->
                 <goals>
                   <goal>install</goal>
                 </goals>
@@ -339,7 +345,6 @@
               </execution>
             </executions>
           </plugin>
-<!--
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
@@ -369,7 +374,7 @@
               </execution>
             </executions>
           </plugin>
-
+<!--
           <plugin>
             <groupId>de.sormuras.junit</groupId>
             <artifactId>junit-platform-maven-plugin</artifactId>
@@ -386,20 +391,21 @@
           </plugin>
 -->
           <plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-  					<artifactId>maven-ngi-plugin</artifactId>
-						<version>0.1.0-SNAPSHOT</version>
-            <configuration>
-            </configuration>
-            <executions>
-							<execution>
-                <goals>
-                  <goal>install</goal>
-                  <goal>integration-test</goal>
-                </goals>
-							</execution>
-						</executions>
-					</plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-ngi-plugin</artifactId>
+					<version>0.1.0-SNAPSHOT</version>
+          <configuration>
+          </configuration>
+          <executions>
+						<execution>
+							<id>execution-first</id>
+              <goals>
+                <goal>install</goal>
+                <goal>integration-test</goal>
+              </goals>
+						</execution>
+					</executions>
+				</plugin>
         </plugins>
       </build>
     </profile>
diff --git a/src/test/java/org/apache/maven/plugins/ear/it/EARMIT.java b/src/test/java/org/apache/maven/plugins/ear/it/EARIT.java
similarity index 95%
rename from src/test/java/org/apache/maven/plugins/ear/it/EARMIT.java
rename to src/test/java/org/apache/maven/plugins/ear/it/EARIT.java
index 5dce615..01e8164 100644
--- a/src/test/java/org/apache/maven/plugins/ear/it/EARMIT.java
+++ b/src/test/java/org/apache/maven/plugins/ear/it/EARIT.java
@@ -19,18 +19,19 @@ package org.apache.maven.plugins.ear.it;
  * under the License.
  */
 
-import static org.apache.maven.jupiter.assertj.MavenITAssertions.assertThat;
-
+import org.apache.maven.assertj.MavenITAssertions;
 import org.apache.maven.jupiter.extension.MavenIT;
 import org.apache.maven.jupiter.extension.MavenTest;
-import org.apache.maven.jupiter.extension.maven.MavenExecutionResult;
-import org.apache.maven.jupiter.extension.maven.MavenLog;
-import org.apache.maven.jupiter.extension.maven.MavenProjectResult;
+import org.apache.maven.jupiter.maven.MavenExecutionResult;
+import org.apache.maven.jupiter.maven.MavenLog;
+import org.apache.maven.jupiter.maven.MavenProjectResult;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 
+import static org.apache.maven.assertj.MavenITAssertions.assertThat;
+
 /**
  * <ul>
  *   <li>basic</li>
@@ -45,11 +46,11 @@ import org.junit.jupiter.api.DisplayNameGenerator;
 @MavenIT
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @DisplayName("EAR Plugin Integration tests")
-class EARMIT
+class EARIT
 {
 
   @MavenTest
-  void basic(MavenExecutionResult result, MavenProjectResult project) {
+  void basic( MavenExecutionResult result, MavenProjectResult project) {
     assertThat(result).isSuccessful();
     assertThat(project).hasTarget()
         .withEarFile()


Mime
View raw message