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 2023/03/25 09:15:31 UTC
[maven-assembly-plugin] branch MASSEMBLY-978 created (now ed104807)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MASSEMBLY-978
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
at ed104807 [MASSEMBLY-978] Bump plexus-utils to 3.5.1
This branch includes the following new commits:
new ed104807 [MASSEMBLY-978] Bump plexus-utils to 3.5.1
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-assembly-plugin] 01/01: [MASSEMBLY-978] Bump plexus-utils 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 MASSEMBLY-978
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit ed1048076185b17c305a883c200c4f8d3eef21f2
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Mar 25 10:05:32 2023 +0100
[MASSEMBLY-978] Bump plexus-utils to 3.5.1
---
pom.xml | 2 +-
src/it/projects/basic-features/add-classpath/pom.xml | 2 +-
.../pom.xml | 2 +-
.../verify.bsh | 2 +-
.../plugins/assembly/mojos/AbstractAssemblyMojo.java | 17 ++++-------------
5 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index c9294da0..c8bdecb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.4.2</version>
+ <version>3.5.1</version>
</dependency>
<!-- Test -->
diff --git a/src/it/projects/basic-features/add-classpath/pom.xml b/src/it/projects/basic-features/add-classpath/pom.xml
index e7b28999..b88b862e 100644
--- a/src/it/projects/basic-features/add-classpath/pom.xml
+++ b/src/it/projects/basic-features/add-classpath/pom.xml
@@ -36,7 +36,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.3</version>
+ <version>3.5.1</version>
</dependency>
</dependencies>
diff --git a/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml b/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
index 827f2ff1..ef9f4673 100644
--- a/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
+++ b/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
@@ -45,7 +45,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.3</version>
+ <version>3.5.1</version>
</dependency>
</dependencies>
diff --git a/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh b/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
index 895fa100..93723781 100644
--- a/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
+++ b/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
@@ -25,7 +25,7 @@ boolean result = true;
try
{
- result = new File( basedir, "target/outputFileNameMapping-withArtifactBaseVersion-1.0-SNAPSHOT-bin/lib/plexus-utils-1.3.jar" ).exists();
+ result = new File( basedir, "target/outputFileNameMapping-withArtifactBaseVersion-1.0-SNAPSHOT-bin/lib/plexus-utils-3.5.1.jar" ).exists();
}
catch( IOException e )
{
diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
index e3bd9ce4..7057b8f3 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
@@ -20,8 +20,6 @@ package org.apache.maven.plugins.assembly.mojos;
*/
import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -613,17 +611,10 @@ public abstract class AbstractAssemblyMojo extends AbstractMojo implements Assem
private FixedStringSearchInterpolator createEnvInterpolator()
{
- try
- {
- PrefixedPropertiesValueSource envProps =
- new PrefixedPropertiesValueSource( Collections.singletonList( "env." ),
- CommandLineUtils.getSystemEnvVars( false ), true );
- return FixedStringSearchInterpolator.create( envProps );
- }
- catch ( IOException e )
- {
- throw new UncheckedIOException( e );
- }
+ PrefixedPropertiesValueSource envProps =
+ new PrefixedPropertiesValueSource( Collections.singletonList( "env." ),
+ CommandLineUtils.getSystemEnvVars( false ), true );
+ return FixedStringSearchInterpolator.create( envProps );
}
/**