You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/12/18 15:08:04 UTC
[maven-stage-plugin] branch io created (now 5048980)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch io
in repository https://gitbox.apache.org/repos/asf/maven-stage-plugin.git.
at 5048980 generic types on set
This branch includes the following new commits:
new 5048980 generic types on set
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.
[maven-stage-plugin] 01/01: generic types on set
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch io
in repository https://gitbox.apache.org/repos/asf/maven-stage-plugin.git
commit 5048980278639d168c2117ee7b49a1110f32e39e
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Fri Dec 18 10:07:48 2020 -0500
generic types on set
---
.../org/apache/maven/plugins/stage/DefaultRepositoryCopier.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java b/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
index 0aff2c0..c2daec8 100644
--- a/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
+++ b/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
@@ -193,7 +193,7 @@ public class DefaultRepositoryCopier
}
}
- Set moveCommands = new TreeSet();
+ Set<String> moveCommands = new TreeSet<>();
// ----------------------------------------------------------------------------
// Create the Zip file that we will deploy to the targetRepositoryUrl stage
@@ -274,7 +274,7 @@ public class DefaultRepositoryCopier
targetWagon.disconnect();
}
- private void scanDirectory( File basedir, File dir, ZipOutputStream zos, String version, Set moveCommands )
+ private void scanDirectory( File basedir, File dir, ZipOutputStream zos, String version, Set<String> moveCommands )
throws IOException
{
if ( dir == null )
@@ -491,13 +491,12 @@ public class DefaultRepositoryCopier
protected List<String> scanForArtifactPaths( ArtifactRepository repository )
{
- List<String> collected;
try
{
Wagon wagon = wagonManager.getWagon( repository.getProtocol() );
Repository artifactRepository = new Repository( repository.getId(), repository.getUrl() );
wagon.connect( artifactRepository );
- collected = new ArrayList<String>();
+ List<String> collected = new ArrayList<String>();
scan( wagon, "/", collected );
wagon.disconnect();