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 2022/04/22 20:42:05 UTC
[maven-archiver] branch MSHARED-1003a updated (040f40d -> a800654)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSHARED-1003a
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git
discard 040f40d [MSHARED-1003] Require Maven 3.2.5+
discard 2191632 Bump junit to 5.8.3
discard ceb5e24 [MSHARED-991] small code cleanup
discard a81608a Require Maven 3.2.5+
new 7769e4e Bump junit to 5.8.3
new e27143c [MSHARED-991] small code cleanup
new a800654 [MSHARED-1003] Require Maven 3.2.5+
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 (040f40d)
\
N -- N -- N refs/heads/MSHARED-1003a (a800654)
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 3 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:
[maven-archiver] 02/03: [MSHARED-991] small code cleanup
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-1003a
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git
commit e27143cd29e25838bb6ba4701a1bf5cd4a06ed86
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Apr 22 00:54:32 2022 +0200
[MSHARED-991] small code cleanup
---
src/main/java/org/apache/maven/archiver/MavenArchiver.java | 11 +++++------
.../java/org/apache/maven/archiver/PomPropertiesUtil.java | 4 ++--
.../java/org/apache/maven/archiver/MavenArchiverTest.java | 13 +++++--------
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
index 5ece688..0e66008 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
@@ -129,7 +129,7 @@ public class MavenArchiver
{
boolean hasManifestEntries = !config.isManifestEntriesEmpty();
Map<String, String> entries =
- hasManifestEntries ? config.getManifestEntries() : Collections.<String, String>emptyMap();
+ hasManifestEntries ? config.getManifestEntries() : Collections.emptyMap();
Manifest manifest = getManifest( session, project, config.getManifest(), entries );
@@ -197,7 +197,7 @@ public class MavenArchiver
public Manifest getManifest( MavenProject project, ManifestConfiguration config )
throws ManifestException, DependencyResolutionRequiredException
{
- return getManifest( null, project, config, Collections.<String, String>emptyMap() );
+ return getManifest( null, project, config, Collections.emptyMap() );
}
/**
@@ -211,7 +211,7 @@ public class MavenArchiver
public Manifest getManifest( MavenSession mavenSession, MavenProject project, ManifestConfiguration config )
throws ManifestException, DependencyResolutionRequiredException
{
- return getManifest( mavenSession, project, config, Collections.<String, String>emptyMap() );
+ return getManifest( mavenSession, project, config, Collections.emptyMap() );
}
private void addManifestAttribute( Manifest manifest, Map<String, String> map, String key, String value )
@@ -471,11 +471,10 @@ public class MavenArchiver
addManifestAttribute( m, entries, "Extension-List", extensionsList.toString() );
}
- for ( Object artifact1 : artifacts )
+ for ( Artifact artifact : artifacts )
{
// TODO: the correct solution here would be to have an extension type, and to read
// the real extension values either from the artifact's manifest or some part of the POM
- Artifact artifact = (Artifact) artifact1;
if ( "jar".equals( artifact.getType() ) )
{
String artifactId = artifact.getArtifactId().replace( '.', '_' );
@@ -487,7 +486,7 @@ public class MavenArchiver
if ( artifact.getRepository() != null )
{
iname = artifactId + "-Implementation-URL";
- String url = artifact.getRepository().getUrl() + "/" + artifact.toString();
+ String url = artifact.getRepository().getUrl() + "/" + artifact;
addManifestAttribute( m, entries, iname, url );
}
}
diff --git a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
index 7da8883..1ee6066 100644
--- a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
+++ b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
@@ -21,12 +21,12 @@ package org.apache.maven.archiver;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringReader;
import java.io.StringWriter;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -46,7 +46,7 @@ public class PomPropertiesUtil
throws IOException
{
Properties fileProps = new Properties();
- try ( InputStream istream = new FileInputStream( file ) )
+ try ( InputStream istream = Files.newInputStream( file.toPath() ) )
{
fileProps.load( istream );
return fileProps;
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 698f0c8..6baefc4 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -23,7 +23,6 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -1221,9 +1220,9 @@ class MavenArchiverTest
model.setVersion( "0.1.1" );
final MavenProject project = new MavenProject( model );
- project.setExtensionArtifacts( Collections.<Artifact>emptySet() );
- project.setRemoteArtifactRepositories( Collections.<ArtifactRepository>emptyList() );
- project.setPluginArtifactRepositories( Collections.<ArtifactRepository>emptyList() );
+ project.setExtensionArtifacts( Collections.emptySet() );
+ project.setRemoteArtifactRepositories( Collections.emptyList() );
+ project.setPluginArtifactRepositories( Collections.emptyList() );
return project;
}
@@ -1392,15 +1391,13 @@ class MavenArchiverTest
private MavenSession getDummySession( Properties systemProperties )
{
- File settings = null;
- List<String> goals = null;
Date startTime = new Date();
MavenExecutionRequest request = new DefaultMavenExecutionRequest();
request.setSystemProperties( systemProperties );
- request.setGoals( goals );
+ request.setGoals( null );
request.setStartTime( startTime );
- request.setUserSettingsFile( settings );
+ request.setUserSettingsFile( null );
MavenExecutionResult result = new DefaultMavenExecutionResult();
[maven-archiver] 01/03: Bump junit to 5.8.3
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-1003a
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git
commit 7769e4e00770918a4f0fca5c0be53ea689db8fb3
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Apr 22 01:03:25 2022 +0200
Bump junit to 5.8.3
---
pom.xml | 6 +++---
.../maven/archiver/ManifestConfigurationTest.java | 8 ++++----
.../archiver/MavenArchiveConfigurationTest.java | 14 +++++++-------
.../org/apache/maven/archiver/MavenArchiverTest.java | 20 ++++++++++----------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 84890cd..b385640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,9 +123,9 @@
Test dependencies
-->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>5.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java b/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
index 7c166d3..dce5c4e 100644
--- a/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
+++ b/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
@@ -21,15 +21,15 @@ package org.apache.maven.archiver;
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
-public class ManifestConfigurationTest
+class ManifestConfigurationTest
{
private ManifestConfiguration manifestConfiguration;
- @Before
+ @BeforeEach
public void before()
{
this.manifestConfiguration = new ManifestConfiguration();
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
index 27021c8..3939bc2 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
@@ -24,18 +24,18 @@ import static org.assertj.core.api.Assertions.entry;
import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author Karl Heinz Marbaise <a href="mailto:khmarbaise@apache.org">khmarbaise@apache.org</a>.
*/
-public class MavenArchiveConfigurationTest
+class MavenArchiveConfigurationTest
{
private MavenArchiveConfiguration archive;
- @Before
+ @BeforeEach
public void before()
{
archive = new MavenArchiveConfiguration();
@@ -46,7 +46,7 @@ public class MavenArchiveConfigurationTest
}
@Test
- public void addingSingleEntryShouldBeReturned()
+ void addingSingleEntryShouldBeReturned()
{
archive.addManifestEntry( "key1", "value1" );
Map<String, String> manifestEntries = archive.getManifestEntries();
@@ -54,7 +54,7 @@ public class MavenArchiveConfigurationTest
}
@Test
- public void addingTwoEntriesShouldBeReturnedInInsertOrder()
+ void addingTwoEntriesShouldBeReturnedInInsertOrder()
{
archive.addManifestEntry( "key1", "value1" );
archive.addManifestEntry( "key2", "value2" );
@@ -63,7 +63,7 @@ public class MavenArchiveConfigurationTest
}
@Test
- public void addingThreeEntriesShouldBeReturnedInInsertOrder()
+ void addingThreeEntriesShouldBeReturnedInInsertOrder()
{
archive.addManifestEntry( "key1", "value1" );
archive.addManifestEntry( "key2", "value2" );
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 029d3fb..698f0c8 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -39,7 +39,7 @@ import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.ManifestException;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystemSession;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
@@ -62,9 +62,9 @@ import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.fail;
-public class MavenArchiverTest
+class MavenArchiverTest
{
static class ArtifactComparator
implements Comparator<Artifact>
@@ -81,7 +81,7 @@ public class MavenArchiverTest
}
@Test
- public void testInvalidModuleNames()
+ void testInvalidModuleNames()
{
assertThat( MavenArchiver.isValidModuleName( "" ) ).isFalse();
assertThat( MavenArchiver.isValidModuleName( "." ) ).isFalse();
@@ -94,7 +94,7 @@ public class MavenArchiverTest
}
@Test
- public void testValidModuleNames()
+ void testValidModuleNames()
{
assertThat( MavenArchiver.isValidModuleName( "a" ) ).isTrue();
assertThat( MavenArchiver.isValidModuleName( "a.b" ) ).isTrue();
@@ -105,7 +105,7 @@ public class MavenArchiverTest
}
@Test
- public void testGetManifestExtensionList()
+ void testGetManifestExtensionList()
throws Exception
{
MavenArchiver archiver = new MavenArchiver();
@@ -189,7 +189,7 @@ public class MavenArchiverTest
}
@Test
- public void testMultiClassPath()
+ void testMultiClassPath()
throws Exception
{
final File tempFile = File.createTempFile( "maven-archiver-test-", ".jar" );
@@ -240,7 +240,7 @@ public class MavenArchiverTest
}
@Test
- public void testRecreation()
+ void testRecreation()
throws Exception
{
File jarFile = new File( "target/test/dummy.jar" );
@@ -278,7 +278,7 @@ public class MavenArchiverTest
}
@Test
- public void testNotGenerateImplementationVersionForMANIFESTMF()
+ void testNotGenerateImplementationVersionForMANIFESTMF()
throws Exception
{
File jarFile = new File( "target/test/dummy.jar" );
@@ -303,7 +303,7 @@ public class MavenArchiverTest
}
@Test
- public void testGenerateImplementationVersionForMANIFESTMF()
+ void testGenerateImplementationVersionForMANIFESTMF()
throws Exception
{
File jarFile = new File( "target/test/dummy.jar" );
[maven-archiver] 03/03: [MSHARED-1003] Require Maven 3.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 MSHARED-1003a
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git
commit a800654150575ffae7a06021fc779b5b68ba66a9
Author: Jorge Solórzano <jo...@gmail.com>
AuthorDate: Fri Apr 22 11:56:59 2022 +0200
[MSHARED-1003] Require Maven 3.2.5+
Signed-off-by: Jorge Solórzano <jo...@gmail.com>
---
pom.xml | 27 +++++++--------------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index b385640..43954a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>35</version>
+ <version>36</version>
<relativePath />
</parent>
@@ -34,9 +34,8 @@
<description>Provides utility methods for creating JARs and other archive files from a Maven project.</description>
<properties>
- <mavenVersion>3.1.1</mavenVersion>
+ <mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
- <surefire.version>2.22.2</surefire.version>
<project.build.outputTimestamp>2022-01-02T12:43:14Z</project.build.outputTimestamp>
</properties>
@@ -65,18 +64,6 @@
<!--
Apache Maven dependencies
-->
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
@@ -96,14 +83,14 @@
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.21</version>
- </dependency>
<!--
Plexus dependencies
-->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-io</artifactId>
+ <version>3.3.0</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>