You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/04/22 21:18:31 UTC
[maven-rar-plugin] branch next updated (2818ab3 -> 9289665)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/maven-rar-plugin.git.
discard 2818ab3 [MRAR-84] Bump maven-archiver to 3.5.1
discard 25baeea [MRAR-83] Bump plexus-archiver to 4.2.5
discard 98440bc Cleanup - Java 7 - replace with diamond
discard ddd25a4 Bump junit from 4.13.1 to 4.13.2
new 71b9219 [MRAR-80] Bump junit to 4.13.2
new fe4735f Cleanup - Java 7 - replace with diamond
new 1e5a2d3 [MRAR-83] Bump plexus-archiver to 4.2.5
new 3af5b4b [MRAR-84] Bump maven-archiver to 3.5.1
new 9289665 [MRAR-62] Bump maven-filtering to 3.2.0
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 (2818ab3)
\
N -- N -- N refs/heads/next (9289665)
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 5 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 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-rar-plugin] 02/05: Cleanup - Java 7 - replace with diamond
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/maven-rar-plugin.git
commit fe4735fa4dd7074f904b41c63673163d6135bd2a
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Jun 4 14:24:05 2020 +0200
Cleanup - Java 7 - replace with diamond
---
src/main/java/org/apache/maven/plugins/rar/RarMojo.java | 2 +-
.../java/org/apache/maven/plugins/rar/RarMojoTest.java | 16 ++++++++--------
.../maven/plugins/rar/stubs/RarMavenProjectStub.java | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/rar/RarMojo.java b/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
index 45120b9..6311ab6 100644
--- a/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
@@ -414,7 +414,7 @@ public class RarMojo
resource.setTargetPath( getBuildDir().getAbsolutePath() );
resource.setFiltering( filterRarSourceDirectory );
- List<Resource> resources = new ArrayList<Resource>();
+ List<Resource> resources = new ArrayList<>();
resources.add( resource );
if ( rarResources != null && !rarResources.isEmpty() )
diff --git a/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java b/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java
index 838c34c..10a3c26 100644
--- a/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java
@@ -83,7 +83,7 @@ public class RarMojoTest
File[] fileNames = workDirectory.listFiles();
assertNotNull( fileNames );
- List<String> expectedFiles = new ArrayList<String>();
+ List<String> expectedFiles = new ArrayList<>();
expectedFiles.add( "maven-artifact01-1.0-SNAPSHOT.jar" );
expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
@@ -116,7 +116,7 @@ public class RarMojoTest
assertTrue( rarFile.exists() );
//expected files/directories inside the rar file
- expectedFiles = new ArrayList<String>();
+ expectedFiles = new ArrayList<>();
expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.properties" );
expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.xml" );
@@ -168,8 +168,8 @@ public class RarMojoTest
File[] fileNames = workDirectory.listFiles();
assertNotNull( fileNames );
- List<String> expectedFiles = new ArrayList<String>();
- List<String> fileList = new ArrayList<String>();
+ List<String> expectedFiles = new ArrayList<>();
+ List<String> fileList = new ArrayList<>();
for ( File fileName : fileNames )
{
@@ -191,7 +191,7 @@ public class RarMojoTest
assertTrue( rarFile.exists() );
//expected files/directories inside the rar file
- expectedFiles = new ArrayList<String>();
+ expectedFiles = new ArrayList<>();
expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.properties" );
expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.xml" );
@@ -243,8 +243,8 @@ public class RarMojoTest
File[] fileNames = workDirectory.listFiles();
assertNotNull( fileNames );
- List<String> expectedFiles = new ArrayList<String>();
- List<String> fileList = new ArrayList<String>();
+ List<String> expectedFiles = new ArrayList<>();
+ List<String> fileList = new ArrayList<>();
for ( File file : fileNames )
{
@@ -267,7 +267,7 @@ public class RarMojoTest
assertTrue( rarFile.exists() );
//expected files/directories inside the rar file
- expectedFiles = new ArrayList<String>();
+ expectedFiles = new ArrayList<>();
expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.properties" );
expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.xml" );
diff --git a/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java
index 427d403..b3c512e 100644
--- a/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java
@@ -122,7 +122,7 @@ public class RarMavenProjectStub
public Set<Artifact> getArtifacts()
{
- Set<Artifact> artifacts = new HashSet<Artifact>();
+ Set<Artifact> artifacts = new HashSet<>();
artifacts.add( createArtifact( "org.apache.maven.test", "maven-artifact01", "1.0-SNAPSHOT", false ) );
artifacts.add( createArtifact( "org.apache.maven.test", "maven-artifact02", "1.0-SNAPSHOT", false ) );
@@ -134,7 +134,7 @@ public class RarMavenProjectStub
{
if ( attachedArtifacts == null )
{
- attachedArtifacts = new ArrayList<Artifact>();
+ attachedArtifacts = new ArrayList<>();
}
return attachedArtifacts;
}
[maven-rar-plugin] 03/05: [MRAR-83] Bump plexus-archiver to 4.2.5
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/maven-rar-plugin.git
commit 1e5a2d340ec7acc92684b3420b74b591998d7571
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Apr 22 23:12:44 2021 +0200
[MRAR-83] Bump plexus-archiver to 4.2.5
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index dbd8a5c..24cb20e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>4.2.3</version>
+ <version>4.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
[maven-rar-plugin] 01/05: [MRAR-80] Bump junit to 4.13.2
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/maven-rar-plugin.git
commit 71b921968f2a72b4f78b902b9e0067c9d817a3bd
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Apr 22 23:10:19 2021 +0200
[MRAR-80] Bump junit to 4.13.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c92c5f0..dbd8a5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
[maven-rar-plugin] 05/05: [MRAR-62] Bump maven-filtering to 3.2.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/maven-rar-plugin.git
commit 9289665a22d8c13a9baa6b5b62e312b807a1b802
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Apr 22 23:16:49 2021 +0200
[MRAR-62] Bump maven-filtering to 3.2.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f38391d..9ef60f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
[maven-rar-plugin] 04/05: [MRAR-84] Bump maven-archiver to 3.5.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/maven-rar-plugin.git
commit 3af5b4b74714da7f32bf615c194610261d7654f5
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Apr 22 23:14:23 2021 +0200
[MRAR-84] Bump maven-archiver to 3.5.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 24cb20e..f38391d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>