[maven-ear-plugin] branch MEAR-256 updated (633ea0e -> e805768)

[kh...@apache.org]

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

khmarbaise pushed a change to branch MEAR-256
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git.


 discard 633ea0e  [MEAR-256] - Upgrade maven-verifier component
     new e805768  [MEAR-256] - Upgrade maven-verifier component

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (633ea0e)
            \
             N -- N -- N   refs/heads/MEAR-256 (e805768)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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.


Summary of changes:
 src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.

[maven-ear-plugin] 01/01: [MEAR-256] - Upgrade maven-verifier component

[kh...@apache.org]

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

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

commit e805768ba184cde0ac00c9689847cab1782548bc
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Mar 4 12:56:55 2018 +0100

    [MEAR-256] - Upgrade maven-verifier component
---
 pom.xml                                                                | 2 +-
 src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java | 2 +-
 src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index be96438..73a5fbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-verifier</artifactId>
-      <version>1.3</version>
+      <version>1.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
index 864507b..dd35c1d 100644
--- a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
+++ b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
@@ -88,7 +88,7 @@ public abstract class AbstractEarPluginIT
 
         verifier.getCliOptions().add( "-s \"" + settingsFile.getAbsolutePath() + "\"" );//
         verifier.getCliOptions().add( "-X" );
-        verifier.localRepo = localRepo;
+        verifier.setLocalRepo( localRepo );
 
         // On linux and macOSX, an exception is thrown if a build failure occurs underneath
         try
diff --git a/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java b/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java
index 4d71ba4..c81d357 100644
--- a/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java
+++ b/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java
@@ -25,7 +25,7 @@ import java.util.Properties;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
-import org.apache.maven.it.util.IOUtil;
+import org.apache.maven.shared.utils.io.IOUtil;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.ReaderFactory;
 

-- 
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.