You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:13:31 UTC
[maven-shade-plugin] 01/01: mvn4 aggregator
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit 0dba26bdf34c6b2f81a4967a1d551572ce994e38
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:13:27 2022 +0100
mvn4 aggregator
---
pom.xml | 8 ++++----
.../java/org/apache/maven/plugins/shade/filter/MinijarFilter.java | 4 ++--
.../java/org/apache/maven/plugins/shade/DefaultShaderTest.java | 4 ++--
.../plugins/shade/resource/ManifestResourceTransformerTest.java | 8 ++++----
.../maven/plugins/shade/resource/rule/TransformerTesterRule.java | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 071c87d..5f2cdd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,8 +65,8 @@
</distributionManagement>
<properties>
- <mavenVersion>3.1.1</mavenVersion>
- <javaVersion>7</javaVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <javaVersion>8</javaVersion>
<sisu.version>0.3.5</sisu.version>
<currentVersion>${project.version}</currentVersion>
<asmVersion>9.2</asmVersion>
@@ -163,7 +163,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.13.1</version>
+ <version>2.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
@@ -197,7 +197,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
- <version>3.0.1</version>
+ <version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java b/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
index 818339e..71c4659 100644
--- a/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
+++ b/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
@@ -131,7 +131,7 @@ public class MinijarFilter
{
for ( final String fileName : project.getRuntimeClasspathElements() )
{
- try ( final JarFile jar = new JarFile( fileName ) )
+ try ( JarFile jar = new JarFile( fileName ) )
{
for ( final Enumeration<JarEntry> entries = jar.entries(); entries.hasMoreElements(); )
{
@@ -149,7 +149,7 @@ public class MinijarFilter
continue;
}
- try ( final BufferedReader bufferedReader =
+ try ( BufferedReader bufferedReader =
new BufferedReader( new InputStreamReader( jar.getInputStream( jarEntry ), UTF_8 ) ) )
{
for ( String line = bufferedReader.readLine(); line != null;
diff --git a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
index a709018..b1c44a0 100644
--- a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
+++ b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
@@ -103,7 +103,7 @@ public class DefaultShaderTest
final DefaultShader shader = newShader();
shader.shade( shadeRequest );
- try ( final JarFile originalJar = new JarFile( plexusJar );
+ try ( JarFile originalJar = new JarFile( plexusJar );
final JarFile shadedJar = new JarFile( shadedOutput ) )
{
// ASM processes all class files. In doing so, it modifies them, even when not relocating anything.
@@ -457,7 +457,7 @@ public class DefaultShaderTest
private boolean areEqual( final JarFile jar1, final JarFile jar2, final String entry1, String entry2 )
throws IOException
{
- try ( final InputStream s1 = jar1.getInputStream(
+ try ( InputStream s1 = jar1.getInputStream(
requireNonNull(jar1.getJarEntry(entry1), entry1 + " in " + jar1.getName() ) );
final InputStream s2 = jar2.getInputStream(
requireNonNull(jar2.getJarEntry(entry2), entry2 + " in " + jar2.getName() ) ))
diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformerTest.java b/src/test/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformerTest.java
index 198d7e1..c0108d7 100644
--- a/src/test/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformerTest.java
+++ b/src/test/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformerTest.java
@@ -89,7 +89,7 @@ public class ManifestResourceTransformerTest
final ByteArrayOutputStream out = transform( manifest, relocators );
- try ( final JarInputStream jis = new JarInputStream( new ByteArrayInputStream( out.toByteArray() ) ) )
+ try ( JarInputStream jis = new JarInputStream( new ByteArrayInputStream( out.toByteArray() ) ) )
{
final Attributes attrs = jis.getManifest().getMainAttributes();
assertEquals(
@@ -142,7 +142,7 @@ public class ManifestResourceTransformerTest
transformer.setAdditionalAttributes( Arrays.asList("description-custom", "attribute-unknown") );
final ByteArrayOutputStream out = transform( manifest, relocators );
- try ( final JarInputStream jis = new JarInputStream( new ByteArrayInputStream( out.toByteArray() ) ) )
+ try ( JarInputStream jis = new JarInputStream( new ByteArrayInputStream( out.toByteArray() ) ) )
{
final Attributes attrs = jis.getManifest().getMainAttributes();
assertEquals( "This jar uses jakarta packages", attrs.getValue( "description-custom" ) );
@@ -153,7 +153,7 @@ public class ManifestResourceTransformerTest
throws IOException
{
final ByteArrayOutputStream mboas = new ByteArrayOutputStream();
- try ( final OutputStream mos = mboas )
+ try ( OutputStream mos = mboas )
{
manifest.write( mos );
}
@@ -161,7 +161,7 @@ public class ManifestResourceTransformerTest
relocators, 0 );
final ByteArrayOutputStream out = new ByteArrayOutputStream();
- try ( final JarOutputStream jarOutputStream = new JarOutputStream( out ) )
+ try ( JarOutputStream jarOutputStream = new JarOutputStream( out ) )
{
transformer.modifyOutputStream( jarOutputStream );
}
diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/rule/TransformerTesterRule.java b/src/test/java/org/apache/maven/plugins/shade/resource/rule/TransformerTesterRule.java
index c159841..9e309dd 100644
--- a/src/test/java/org/apache/maven/plugins/shade/resource/rule/TransformerTesterRule.java
+++ b/src/test/java/org/apache/maven/plugins/shade/resource/rule/TransformerTesterRule.java
@@ -115,13 +115,13 @@ public class TransformerTesterRule
throws IOException
{
final ByteArrayOutputStream out = new ByteArrayOutputStream();
- try ( final JarOutputStream jar = new JarOutputStream( out ) )
+ try ( JarOutputStream jar = new JarOutputStream( out ) )
{
transformer.modifyOutputStream( jar );
}
final Map<String, String> created = new HashMap<>();
- try ( final JarInputStream jar = new JarInputStream( new ByteArrayInputStream( out.toByteArray() ) ) )
+ try ( JarInputStream jar = new JarInputStream( new ByteArrayInputStream( out.toByteArray() ) ) )
{
JarEntry entry;
while ( ( entry = jar.getNextJarEntry() ) != null )