[maven-install-plugin] branch MSHARED-695 updated (4a7fc85 -> da39467)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven-install-plugin] branch MSHARED-695 updated (4a7fc85 -> da39467)

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

khmarbaise pushed a change to branch MSHARED-695
in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git.


 discard 4a7fc85  Based on moving the checksum generation to deploy plugin this test can not check for the checksums.
     new da39467  Based on moving the checksum generation to deploy plugin this test can not check for the checksums.

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   (4a7fc85)
            \
             N -- N -- N   refs/heads/MSHARED-695 (da39467)

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/it/jar-sources-javadoc/verify.bsh | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[maven-install-plugin] 01/01: Based on moving the checksum generation to deploy plugin this test can not check for the checksums.

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

khmarbaise pushed a commit to branch MSHARED-695
in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git

commit da394671032730706d159d264ee376e655f0459d
Author: Karl Heinz Marbaise <[hidden email]>
AuthorDate: Wed Aug 8 17:28:28 2018 +0200

    Based on moving the checksum generation to deploy plugin
    this test can not check for the checksums.
---
 src/it/attach-jar-checksum/verify.bsh              |  6 ----
 src/it/generate-pom-auto-1/verify.bsh              |  9 ------
 src/it/jar-sources-javadoc/verify.bsh              | 32 ++++++++++++----------
 .../local-repo-override-with-checksum/verify.bsh   | 23 ++++++++++------
 4 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/src/it/attach-jar-checksum/verify.bsh b/src/it/attach-jar-checksum/verify.bsh
index 8a6e37d..9713ff9 100644
--- a/src/it/attach-jar-checksum/verify.bsh
+++ b/src/it/attach-jar-checksum/verify.bsh
@@ -25,14 +25,8 @@ import org.apache.maven.plugins.install.Utils;
 String[] paths =
 {
     "org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom",
-    // "org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom.md5",
-    // "org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom.sha1",
     "org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.jar",
-    // "org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.jar.md5",
-    // "org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.jar.sha1",
     "org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-sources.jar",
-    // "org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-sources.jar.md5",
-    // "org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-sources.jar.sha1",
     "org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/maven-metadata-local.xml",
     "org/apache/maven/its/install/ajc/test/maven-metadata-local.xml",
 };
diff --git a/src/it/generate-pom-auto-1/verify.bsh b/src/it/generate-pom-auto-1/verify.bsh
index e4152c8..d5ea928 100644
--- a/src/it/generate-pom-auto-1/verify.bsh
+++ b/src/it/generate-pom-auto-1/verify.bsh
@@ -26,11 +26,7 @@ String[] paths =
 {
     "org/apache/maven/its/install/gpa1/test/maven-metadata-local.xml",
     "org/apache/maven/its/install/gpa1/test/0.1/test-0.1.jar",
-    "org/apache/maven/its/install/gpa1/test/0.1/test-0.1.jar.md5",
-    "org/apache/maven/its/install/gpa1/test/0.1/test-0.1.jar.sha1",
     "org/apache/maven/its/install/gpa1/test/0.1/test-0.1.pom",
-    "org/apache/maven/its/install/gpa1/test/0.1/test-0.1.pom.md5",
-    "org/apache/maven/its/install/gpa1/test/0.1/test-0.1.pom.sha1",
 };
 
 Set cksumToCheckPaths = new HashSet( Arrays.asList( new String[]
@@ -47,11 +43,6 @@ for ( String path : paths )
     {
         throw new FileNotFoundException( "Missing: " + file.getAbsolutePath() );
     }
-    if ( cksumToCheckPaths.contains( path ) )
-    {    
-        System.out.println( "Verifying " + file );
-        Utils.verifyChecksum( file );
-    }
 }
 
 return true;
diff --git a/src/it/jar-sources-javadoc/verify.bsh b/src/it/jar-sources-javadoc/verify.bsh
index 6e4abd8..9f20faf 100644
--- a/src/it/jar-sources-javadoc/verify.bsh
+++ b/src/it/jar-sources-javadoc/verify.bsh
@@ -19,6 +19,7 @@
 
 import java.io.*;
 import java.util.*;
+import java.lang.*;
 
 import org.apache.maven.plugins.install.Utils;
 
@@ -26,27 +27,23 @@ String[] paths =
 {
     "org/apache/maven/its/install/jsj/test/maven-metadata-local.xml",
     "org/apache/maven/its/install/jsj/test/0.1/test-0.1.jar",
+    "org/apache/maven/its/install/jsj/test/0.1/test-0.1.pom",
+    "org/apache/maven/its/install/jsj/test/0.1/test-0.1-sources.jar",
+    "org/apache/maven/its/install/jsj/test/0.1/test-0.1-javadoc.jar",
+};
+
+String[] pathsWhichShouldNotExist =
+{
     "org/apache/maven/its/install/jsj/test/0.1/test-0.1.jar.md5",
     "org/apache/maven/its/install/jsj/test/0.1/test-0.1.jar.sha1",
-    "org/apache/maven/its/install/jsj/test/0.1/test-0.1.pom",
     "org/apache/maven/its/install/jsj/test/0.1/test-0.1.pom.md5",
     "org/apache/maven/its/install/jsj/test/0.1/test-0.1.pom.sha1",
-    "org/apache/maven/its/install/jsj/test/0.1/test-0.1-sources.jar",
     "org/apache/maven/its/install/jsj/test/0.1/test-0.1-sources.jar.md5",
     "org/apache/maven/its/install/jsj/test/0.1/test-0.1-sources.jar.sha1",
-    "org/apache/maven/its/install/jsj/test/0.1/test-0.1-javadoc.jar",
     "org/apache/maven/its/install/jsj/test/0.1/test-0.1-javadoc.jar.md5",
     "org/apache/maven/its/install/jsj/test/0.1/test-0.1-javadoc.jar.sha1",
 };
 
-Set cksumToCheckPaths = new HashSet( Arrays.asList( new String[]
-{
-    "org/apache/maven/its/install/jsj/test/0.1/test-0.1.jar",
-    "org/apache/maven/its/install/jsj/test/0.1/test-0.1.pom",
-    "org/apache/maven/its/install/jsj/test/0.1/test-0.1-sources.jar",
-    "org/apache/maven/its/install/jsj/test/0.1/test-0.1-javadoc.jar"
-} ) );
-
 for ( String path : paths )
 {
     File file = new File( localRepositoryPath, path );
@@ -55,10 +52,15 @@ for ( String path : paths )
     {
         throw new FileNotFoundException( "Missing: " + file.getAbsolutePath() );
     }
-    if ( cksumToCheckPaths.contains( path ) )
-    {    
-        System.out.println( "Verifying " + file );
-        Utils.verifyChecksum( file );
+}
+
+for ( String path : pathsWhichShouldNotExist )
+{
+    File file = new File( localRepositoryPath, path );
+    System.out.println( "Checking for non existence of " + file );
+    if ( file.isFile() )
+    {
+        throw new IOException( "Missing: " + file.getAbsolutePath() );
     }
 }
 
diff --git a/src/it/local-repo-override-with-checksum/verify.bsh b/src/it/local-repo-override-with-checksum/verify.bsh
index 33178b7..11208cc 100644
--- a/src/it/local-repo-override-with-checksum/verify.bsh
+++ b/src/it/local-repo-override-with-checksum/verify.bsh
@@ -19,34 +19,39 @@
 
 import java.io.*;
 import java.util.*;
+import java.lang.*;
 
 import org.apache.maven.plugins.install.Utils;
 
 String[] paths =
 {
     "gid/test/0.1/test-0.1.jar",
+};
+
+String[] pathsWhichAreNotAllowedToBeThere =
+{
     "gid/test/0.1/test-0.1.jar.md5",
     "gid/test/0.1/test-0.1.jar.sha1",
 };
 
-Set cksumToCheckPaths = new HashSet( Arrays.asList( new String[]
+for ( String path : pathsWhichAreNotAllowedToBeThere )
 {
-    "gid/test/0.1/test-0.1.jar"
-} ) );
+    File file = new File( new File( basedir, "target/local-repo" ), path );
+    System.out.println( "Checking for existence of " + file );
+    if ( file.isFile() )
+    {
+        throw new IOException( "Existing file which should not be there: " + file.getAbsolutePath() );
+    }
+}
 
 for ( String path : paths )
 {
     File file = new File( new File( basedir, "target/local-repo" ), path );
-    System.out.println( "Checking for existence of " + file );
+    System.out.println( "Checking for non existence of " + file );
     if ( !file.isFile() )
     {
         throw new FileNotFoundException( "Existing: " + file.getAbsolutePath() );
     }
-    if ( cksumToCheckPaths.contains( path ) )
-    {    
-        System.out.println( "Verifying " + file );
-        Utils.verifyChecksum( file );
-    }
 }
 
 return true;