You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/04/16 10:43:30 UTC
[maven-ear-plugin] 20/24: Fixed.
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 6d3c37d0a1a3c99a70986cdf2242984416b8ad8b
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Mar 29 17:19:33 2020 +0200
Fixed.
---
pom.xml | 50 ++++++++++++----------
.../plugins/ear/it/{EARMIT.java => EARIT.java} | 15 ++++---
2 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8d4be7c..70b2af0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,9 +23,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>33</version>
+ <artifactId>maven-plugins</artifactId>
+ <version>34</version>
<relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
</parent>
@@ -92,7 +92,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>
@@ -149,7 +149,7 @@
<artifactId>maven-mapping</artifactId>
<version>3.0.0</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
@@ -173,7 +173,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>
@@ -324,7 +330,7 @@
</execution>
<execution>
<id>install-artifacts</id>
- <phase>EMPTY</phase>
+<!-- <phase>EMPTY</phase>-->
<goals>
<goal>install</goal>
</goals>
@@ -338,7 +344,6 @@
</execution>
</executions>
</plugin>
-<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
@@ -368,7 +373,7 @@
</execution>
</executions>
</plugin>
-
+<!--
<plugin>
<groupId>de.sormuras.junit</groupId>
<artifactId>junit-platform-maven-plugin</artifactId>
@@ -385,20 +390,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()