maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khmarba...@apache.org
Subject [maven-deploy-plugin] 06/06: WIP - Upgraded release test WIP - Need to reconsider check in SNAPSHOT test cause I can't predict the names correct. Need to think about this (Will fail at the moment.).
Date Sat, 04 Aug 2018 08:30:49 GMT
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-deploy-plugin.git

commit 783bd1d5323e10273e32650ee2724b254b9e0b6c
Author: Karl Heinz Marbaise <khmarbaise@apache.org>
AuthorDate: Sun Jul 8 19:49:24 2018 +0200

    WIP - Upgraded release test
    WIP - Need to reconsider check in SNAPSHOT test
          cause I can't predict the names correct.
          Need to think about this (Will fail at the moment.).
---
 src/it/attach-jar-checksum-release/pom.xml        | 16 +++++++++++++++-
 src/it/attach-jar-checksum-release/verify.groovy  |  3 ++-
 src/it/attach-jar-checksum-snapshot/pom.xml       | 19 ++++++++++++++++---
 src/it/attach-jar-checksum-snapshot/verify.groovy |  7 ++-----
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/it/attach-jar-checksum-release/pom.xml b/src/it/attach-jar-checksum-release/pom.xml
index d0e28b0..bda659d 100644
--- a/src/it/attach-jar-checksum-release/pom.xml
+++ b/src/it/attach-jar-checksum-release/pom.xml
@@ -39,7 +39,7 @@ under the License.
   <distributionManagement>
     <repository>
       <id>it</id>
-      <url>file:///${basedir}/target/repo</url>
+      <url>file:///${basedir}/target/remoterepo</url>
     </repository>
   </distributionManagement>
 
@@ -55,6 +55,20 @@ under the License.
         <artifactId>maven-deploy-plugin</artifactId>
         <version>@project.version@</version>
       </plugin>
+      <!--
+       ! This is intentionally the old version which
+       ! will not create checksums by default.
+       ! We want to make sure that only maven-deploy-plugin
+       ! will generate the checksums. 
+       -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <version>2.5.2</version>
+        <configuration>
+          <createChecksum>false</createChecksum>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
diff --git a/src/it/attach-jar-checksum-release/verify.groovy b/src/it/attach-jar-checksum-release/verify.groovy
index 9a7376b..ac362f8 100644
--- a/src/it/attach-jar-checksum-release/verify.groovy
+++ b/src/it/attach-jar-checksum-release/verify.groovy
@@ -44,7 +44,8 @@ def cksumToCheckPaths = [
     "org/apache/maven/its/deploy/ajc/test/1.0/test-1.0-sources.jar"
 ]
 
-def repository = new File (basedir, "target/repo" )
+// Check if artifacts have been uploaded to remote with checksums
+def repository = new File (basedir, "target/remoterepo" )
 paths.each { path ->
     //File file = new File( localRepositoryPath, path );
     File file = new File( repository, path );
diff --git a/src/it/attach-jar-checksum-snapshot/pom.xml b/src/it/attach-jar-checksum-snapshot/pom.xml
index c81cc24..e43dac8 100644
--- a/src/it/attach-jar-checksum-snapshot/pom.xml
+++ b/src/it/attach-jar-checksum-snapshot/pom.xml
@@ -29,8 +29,7 @@ under the License.
   <packaging>jar</packaging>
 
   <description>
-    This test has been moved from maven-install-plugin to maven-deploy-plugin.
-    Tests the installation of a simple snapshot JAR with an attached artifact and checksums
+    Tests the installation of a simple SNAPSHOT JAR with an attached artifact and checksums
   </description>
 
   <properties>
@@ -39,7 +38,7 @@ under the License.
   <distributionManagement>
     <repository>
       <id>it</id>
-      <url>file:///${basedir}/target/repo</url>
+      <url>file:///${basedir}/target/remoterepo</url>
     </repository>
   </distributionManagement>
 
@@ -60,6 +59,20 @@ under the License.
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.1</version>
       </plugin>
+      <!--
+       ! This is intentionally the old version which
+       ! will not create checksums by default.
+       ! We want to make sure that only maven-deploy-plugin
+       ! will generate the checksums. 
+       -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <version>2.5.2</version>
+        <configuration>
+          <createChecksum>false</createChecksum>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
diff --git a/src/it/attach-jar-checksum-snapshot/verify.groovy b/src/it/attach-jar-checksum-snapshot/verify.groovy
index b533981..70798bd 100644
--- a/src/it/attach-jar-checksum-snapshot/verify.groovy
+++ b/src/it/attach-jar-checksum-snapshot/verify.groovy
@@ -17,9 +17,6 @@
  * under the License.
  */
 
-import java.io.*;
-import java.util.*;
-
 import org.apache.maven.plugins.deploy.Utils;
 
 def paths =
@@ -46,8 +43,8 @@ def cksumToCheckPaths = [
 
 def buildLog = new File ( basedir, "build.log")
 
-
-def repository = new File (basedir, "target/repo" )
+// Using the target/repo which is used are remote repository (deploy)
+def repository = new File (basedir, "target/remoterepo" )
 paths.each { path ->
     //File file = new File( localRepositoryPath, path );
     File file = new File( repository, path );


Mime
View raw message