simpligility / maven-repository-tools

Tools for interacting with Maven repositories
Eclipse Public License 1.0
137 stars 66 forks source link

Some minor improvements #40

Closed rob42 closed 5 years ago

rob42 commented 6 years ago

Nice work, very useful. Sorry, cant easily create a pull just now, so Ive added a 2 patches below.

1) adds support for zip files in migration, needed for angular repos.

diff --git a/maven-repository-provisioner/src/main/java/com/simpligility/maven/MavenConstants.java b/maven-repository-provisioner/src/main/java/com/simpligility/maven/MavenConstants.java
index 2e00cd6..3b512ee 100644
--- a/maven-repository-provisioner/src/main/java/com/simpligility/maven/MavenConstants.java
+++ b/maven-repository-provisioner/src/main/java/com/simpligility/maven/MavenConstants.java
@@ -12,6 +12,7 @@
     public static final String HPI = "hpi";
     public static final String JPI = "jpi";
     public static final String AAR = "aar";
+    public static final String ZIP = "zip";

     // packaging types with no file of the same extension, instead normal jar is the main file
     public static final String JAR = "jar";
@@ -45,7 +46,8 @@
       boolean result = false;
       if ( HPI.equals( packaging )
           || JPI.equals( packaging )
-          || AAR.equals( packaging ) )
+          || AAR.equals( packaging )
+          || ZIP.equals( packaging ))
       {
         result = true;
       }

2) returns without throwing Nullpointer exception when a resource is not found. This means you can migrate 99% of the repo without failing, then manually sort out the offending items.

diff --git a/maven-repository-provisioner/src/main/java/com/simpligility/maven/provisioner/ArtifactRetriever.java b/maven-repository-provisioner/src/main/java/com/simpligility/maven/provisioner/ArtifactRetriever.java
index 41f7009..c0827a7 100644
--- a/maven-repository-provisioner/src/main/java/com/simpligility/maven/provisioner/ArtifactRetriever.java
+++ b/maven-repository-provisioner/src/main/java/com/simpligility/maven/provisioner/ArtifactRetriever.java
@@ -237,6 +237,7 @@
             catch ( Exception e )
             {
                 logger.info( "Failed to retrieve gav from " + pomFile.getAbsolutePath() );
+                return;
             }
             String packaging = gav.getPackaging();
mosabua commented 6 years ago

Wanna send two independent PRs?

rob42 commented 6 years ago

I cloned the repo into an awkward location (AWS instance behind bastion), its not simple to do the PR from there.

There are only 3 single line edits, I was hoping you could work with those:

1) Add public static final String ZIP = "zip"; at line 15 in MavenConstants.java and add || ZIP.equals( packaging ) at line 50.

2) Add return; at line 240 in ArtifactRetriever.java

Sorry Rob

mosabua commented 5 years ago

done

mosabua commented 5 years ago

You want a release?

mosabua commented 5 years ago

https://github.com/simpligility/maven-repository-tools/commit/91aa19ea1cf0d3c6ed0d9acb8d6e5df509f0cf42