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 2018/04/29 19:15:55 UTC

[maven-verifier] branch CODE_IMPROVEMENTS updated (1d271fe -> be7fa32)

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

khmarbaise pushed a change to branch CODE_IMPROVEMENTS
in repository https://gitbox.apache.org/repos/asf/maven-verifier.git.


 discard 1d271fe  Code improvements.
     add eb124cb  [MSHARED-690] - Change package from org.apache.maven.it to org.apache.maven.shared.verifier
     add 7fbd6f8  [MSHARED-694] - Upgrade JUnit 3.8.2 to 4.12
     new be7fa32  Code improvements.

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   (1d271fe)
            \
             N -- N -- N   refs/heads/CODE_IMPROVEMENTS (be7fa32)

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:
 pom.xml                                                             | 2 +-
 .../apache/maven/{it => shared/verifier}/Embedded3xLauncher.java    | 2 +-
 .../org/apache/maven/{it => shared/verifier}/ForkedLauncher.java    | 2 +-
 .../org/apache/maven/{it => shared/verifier}/LauncherException.java | 2 +-
 .../org/apache/maven/{it => shared/verifier}/MavenLauncher.java     | 2 +-
 .../apache/maven/{it => shared/verifier}/VerificationException.java | 2 +-
 .../java/org/apache/maven/{it => shared/verifier}/Verifier.java     | 2 +-
 .../maven/{it => shared/verifier}/util/ResourceExtractor.java       | 2 +-
 .../java/org/apache/maven/{it => shared/verifier}/VerifierTest.java | 6 +++++-
 9 files changed, 13 insertions(+), 9 deletions(-)
 rename src/main/java/org/apache/maven/{it => shared/verifier}/Embedded3xLauncher.java (99%)
 rename src/main/java/org/apache/maven/{it => shared/verifier}/ForkedLauncher.java (99%)
 rename src/main/java/org/apache/maven/{it => shared/verifier}/LauncherException.java (96%)
 rename src/main/java/org/apache/maven/{it => shared/verifier}/MavenLauncher.java (96%)
 rename src/main/java/org/apache/maven/{it => shared/verifier}/VerificationException.java (96%)
 rename src/main/java/org/apache/maven/{it => shared/verifier}/Verifier.java (99%)
 rename src/main/java/org/apache/maven/{it => shared/verifier}/util/ResourceExtractor.java (99%)
 rename src/test/java/org/apache/maven/{it => shared/verifier}/VerifierTest.java (93%)

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

[maven-verifier] 01/01: Code improvements.

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

khmarbaise pushed a commit to branch CODE_IMPROVEMENTS
in repository https://gitbox.apache.org/repos/asf/maven-verifier.git

commit be7fa32e6c1834f8537f01288e134651ba0412ad
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Mar 4 13:56:47 2018 +0100

    Code improvements.
---
 .../java/org/apache/maven/shared/verifier/Embedded3xLauncher.java | 8 ++++----
 .../org/apache/maven/shared/verifier/VerificationException.java   | 5 +++++
 .../org/apache/maven/shared/verifier/util/ResourceExtractor.java  | 2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/verifier/Embedded3xLauncher.java b/src/main/java/org/apache/maven/shared/verifier/Embedded3xLauncher.java
index 1e6548d..699be36 100644
--- a/src/main/java/org/apache/maven/shared/verifier/Embedded3xLauncher.java
+++ b/src/main/java/org/apache/maven/shared/verifier/Embedded3xLauncher.java
@@ -93,11 +93,11 @@ class Embedded3xLauncher
 
             configure.invoke( launcher, new Object[] { new FileInputStream( config ) } );
 
-            Method getWorld = launcherClass.getMethod( "getWorld", null );
-            Object classWorld = getWorld.invoke( launcher, null );
+            Method getWorld = launcherClass.getMethod( "getWorld", (Class<?>) null );
+            Object classWorld = getWorld.invoke( launcher, (Class<?>) null );
 
-            Method getMainClass = launcherClass.getMethod( "getMainClass", null );
-            Class<?> cliClass = (Class<?>) getMainClass.invoke( launcher, null );
+            Method getMainClass = launcherClass.getMethod( "getMainClass", (Class<?>) null );
+            Class<?> cliClass = (Class<?>) getMainClass.invoke( launcher, (Class<?>) null );
 
             Constructor<?> newMavenCli = cliClass.getConstructor( new Class[] { classWorld.getClass() } );
             Object mavenCli = newMavenCli.newInstance( new Object[] { classWorld } );
diff --git a/src/main/java/org/apache/maven/shared/verifier/VerificationException.java b/src/main/java/org/apache/maven/shared/verifier/VerificationException.java
index e17121d..016eded 100644
--- a/src/main/java/org/apache/maven/shared/verifier/VerificationException.java
+++ b/src/main/java/org/apache/maven/shared/verifier/VerificationException.java
@@ -26,6 +26,11 @@ package org.apache.maven.shared.verifier;
 public class VerificationException
     extends Exception
 {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
     public VerificationException()
     {
     }
diff --git a/src/main/java/org/apache/maven/shared/verifier/util/ResourceExtractor.java b/src/main/java/org/apache/maven/shared/verifier/util/ResourceExtractor.java
index 57aee6b..c5431e4 100644
--- a/src/main/java/org/apache/maven/shared/verifier/util/ResourceExtractor.java
+++ b/src/main/java/org/apache/maven/shared/verifier/util/ResourceExtractor.java
@@ -141,6 +141,7 @@ public class ResourceExtractor
                         finally
                         {
                             IOUtil.close( fos );
+                            z.close();
                         }
                     }
                 }
@@ -156,6 +157,7 @@ public class ResourceExtractor
             finally
             {
                 IOUtil.close( fos );
+                z.close();
             }
         }
     }

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