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 2020/06/11 18:57:40 UTC
[maven] branch master updated: Fix maven-checkstyle-plugin 3.1.1
reported error
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new b4725db Fix maven-checkstyle-plugin 3.1.1 reported error
b4725db is described below
commit b4725dbe068ea18b35e013bf774e3d520619e7bc
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Jun 5 18:44:52 2020 +0200
Fix maven-checkstyle-plugin 3.1.1 reported error
- with maven-shared-resources v3
---
.../src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java | 2 +-
.../maven/artifact/repository/metadata/io/DefaultMetadataReader.java | 4 ++--
.../java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java | 4 ++--
.../java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java | 2 +-
.../src/main/java/org/apache/maven/model/io/DefaultModelReader.java | 4 ++--
.../src/main/java/org/apache/maven/model/io/DefaultModelWriter.java | 4 ++--
.../apache/maven/repository/internal/DefaultVersionRangeResolver.java | 2 +-
.../org/apache/maven/repository/internal/DefaultVersionResolver.java | 2 +-
.../main/java/org/apache/maven/settings/io/DefaultSettingsReader.java | 4 ++--
.../main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java | 4 ++--
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
index 83edd2b..df9b910 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
@@ -50,7 +50,7 @@ public enum ArtifactScopeEnum
/**
* Helper method to simplify null processing
*/
- public static final ArtifactScopeEnum checkScope( ArtifactScopeEnum scope )
+ public static ArtifactScopeEnum checkScope( ArtifactScopeEnum scope )
{
return scope == null ? DEFAULT_SCOPE : scope;
}
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index 1d7241c..ea5dd57 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -60,7 +60,7 @@ public class DefaultMetadataReader
{
Objects.requireNonNull( input, "input cannot be null" );
- try ( final Reader in = input )
+ try ( Reader in = input )
{
return new MetadataXpp3Reader().read( in, isStrict( options ) );
}
@@ -75,7 +75,7 @@ public class DefaultMetadataReader
{
Objects.requireNonNull( input, "input cannot be null" );
- try ( final InputStream in = input )
+ try ( InputStream in = input )
{
return new MetadataXpp3Reader().read( in, isStrict( options ) );
}
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 93dcca5..2522551 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -61,7 +61,7 @@ public class DefaultToolchainsReader
{
Objects.requireNonNull( input, "input cannot be null" );
- try ( final Reader in = input )
+ try ( Reader in = input )
{
return new MavenToolchainsXpp3Reader().read( in, isStrict( options ) );
}
@@ -77,7 +77,7 @@ public class DefaultToolchainsReader
{
Objects.requireNonNull( input, "input cannot be null" );
- try ( final InputStream in = input )
+ try ( InputStream in = input )
{
return new MavenToolchainsXpp3Reader().read( in, isStrict( options ) );
}
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java
index a533766..51ebdc7 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java
@@ -46,7 +46,7 @@ public class DefaultToolchainsWriter implements ToolchainsWriter
Objects.requireNonNull( output, "output cannot be null" );
Objects.requireNonNull( toolchains, "toolchains cannot be null" );
- try ( final Writer out = output )
+ try ( Writer out = output )
{
new MavenToolchainsXpp3Writer().write( out, toolchains );
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
index b0778d8..6e78fd0 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
@@ -68,7 +68,7 @@ public class DefaultModelReader
{
Objects.requireNonNull( input, "input cannot be null" );
- try ( final Reader in = input )
+ try ( Reader in = input )
{
return read( in, isStrict( options ), getSource( options ) );
}
@@ -80,7 +80,7 @@ public class DefaultModelReader
{
Objects.requireNonNull( input, "input cannot be null" );
- try ( final XmlStreamReader in = ReaderFactory.newXmlReader( input ) )
+ try ( XmlStreamReader in = ReaderFactory.newXmlReader( input ) )
{
return read( in, isStrict( options ), getSource( options ) );
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
index 650ae95..a6d4d98 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
@@ -64,7 +64,7 @@ public class DefaultModelWriter
Objects.requireNonNull( output, "output cannot be null" );
Objects.requireNonNull( model, "model cannot be null" );
- try ( final Writer out = output )
+ try ( Writer out = output )
{
new MavenXpp3Writer().write( out, model );
}
@@ -84,7 +84,7 @@ public class DefaultModelWriter
encoding = "UTF-8";
}
- try ( final Writer out = new OutputStreamWriter( output, encoding ) )
+ try ( Writer out = new OutputStreamWriter( output, encoding ) )
{
write( out, options, model );
}
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index 83c82a0..b53d5a5 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -244,7 +244,7 @@ public class DefaultVersionRangeResolver
if ( metadata.getFile() != null && metadata.getFile().exists() )
{
- try ( final InputStream in = new FileInputStream( metadata.getFile() ) )
+ try ( InputStream in = new FileInputStream( metadata.getFile() ) )
{
versioning = new MetadataXpp3Reader().read( in, false ).getVersioning();
}
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index d307c55..f5f9aea 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -310,7 +310,7 @@ public class DefaultVersionResolver
if ( metadata.getFile() != null && metadata.getFile().exists() )
{
- try ( final InputStream in = new FileInputStream( metadata.getFile() ) )
+ try ( InputStream in = new FileInputStream( metadata.getFile() ) )
{
versioning = new MetadataXpp3Reader().read( in, false ).getVersioning();
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
index 6044c0c..ac01feb 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
@@ -62,7 +62,7 @@ public class DefaultSettingsReader
{
Objects.requireNonNull( input, "input cannot be null" );
- try ( final Reader in = input )
+ try ( Reader in = input )
{
return new SettingsXpp3Reader().read( in, isStrict( options ) );
}
@@ -78,7 +78,7 @@ public class DefaultSettingsReader
{
Objects.requireNonNull( input, "input cannot be null" );
- try ( final InputStream in = input )
+ try ( InputStream in = input )
{
return new SettingsXpp3Reader().read( in, isStrict( options ) );
}
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
index 10729a2..54f626a 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
@@ -64,7 +64,7 @@ public class DefaultSettingsWriter
Objects.requireNonNull( output, "output cannot be null" );
Objects.requireNonNull( settings, "settings cannot be null" );
- try ( final Writer out = output )
+ try ( Writer out = output )
{
new SettingsXpp3Writer().write( out, settings );
}
@@ -84,7 +84,7 @@ public class DefaultSettingsWriter
encoding = "UTF-8";
}
- try ( final Writer out = new OutputStreamWriter( output, encoding ) )
+ try ( Writer out = new OutputStreamWriter( output, encoding ) )
{
write( out, options, settings );
}