You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/02/10 12:10:26 UTC
[1/9] maven git commit: [MNG-5992] Upgrade default version of
maven-release-plugin to 2.5.3 [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6352-print-version 8f5b00f02 -> 79f501ea6 (forced update)
[MNG-5992] Upgrade default version of maven-release-plugin to 2.5.3
avoids exposing Git password during release
this fixes #152
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/085ee9f2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/085ee9f2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/085ee9f2
Branch: refs/heads/MNG-6352-print-version
Commit: 085ee9f27508f29ff5cbe418eff0eabc98ad1a95
Parents: 99e6622
Author: Hervé Boutemy <hb...@apache.org>
Authored: Wed Feb 7 22:06:37 2018 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Thu Feb 8 08:02:04 2018 +0100
----------------------------------------------------------------------
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/085ee9f2/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 91492a9..8c26f71 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -86,7 +86,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.5.3</version>
</plugin>
</plugins>
</pluginManagement>
[2/9] maven git commit: [ MNG-6335] Update Mockito to 2.12.0
Posted by kh...@apache.org.
[ MNG-6335] Update Mockito to 2.12.0
Also change scope to test
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a03489b6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a03489b6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a03489b6
Branch: refs/heads/MNG-6352-print-version
Commit: a03489b67d04a4b014ff5d1c151b331a39bf100b
Parents: 085ee9f
Author: Sylwester Lachiewicz <sl...@gmail.com>
Authored: Sun Jan 7 01:17:32 2018 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Fri Feb 9 00:20:03 2018 +0100
----------------------------------------------------------------------
.../DefaultToolchainManagerPrivateTest.java | 15 ++++++---------
.../maven/toolchain/DefaultToolchainManagerTest.java | 4 ++--
.../building/DefaultToolchainsBuilderTest.java | 14 +++++++-------
maven-embedder/pom.xml | 1 +
pom.xml | 3 ++-
5 files changed, 18 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/a03489b6/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
index 1e48441..c937564 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
@@ -20,8 +20,7 @@ package org.apache.maven.toolchain;
*/
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -145,9 +144,8 @@ public class DefaultToolchainManagerPrivateTest
verify( logger, never() ).error( anyString() );
assertEquals( 2, toolchains.length );
}
-
- @SuppressWarnings( "unchecked" )
- @Test( expected = MisconfiguredToolchainException.class )
+
+ @Test
public void testMisconfiguredToolchain()
throws Exception
{
@@ -155,12 +153,11 @@ public class DefaultToolchainManagerPrivateTest
MavenSession session = mock( MavenSession.class );
MavenExecutionRequest req = new DefaultMavenExecutionRequest();
when( session.getRequest() ).thenReturn( req );
- when(toolchainFactory_basicType.createDefaultToolchain()).thenThrow( MisconfiguredToolchainException.class );
// execute
- toolchainManager.getToolchainsForType( "basic", session );
-
+ ToolchainPrivate[] basics = toolchainManager.getToolchainsForType("basic", session);
+
// verify
- fail( "Should exit with a MisconfiguredToolchainException" );
+ assertEquals( 0, basics.length );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/a03489b6/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
index 6e85c42..84444c0 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.toolchain;
*/
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyMap;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -39,6 +38,7 @@ import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.logging.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -142,7 +142,7 @@ public class DefaultToolchainManagerTest
executionRequest.setToolchains( toolchainModels );
when( session.getRequest() ).thenReturn( executionRequest );
ToolchainPrivate basicPrivate = mock( ToolchainPrivate.class );
- when( basicPrivate.matchesRequirements( anyMap() ) ).thenReturn( false ).thenReturn( true );
+ when( basicPrivate.matchesRequirements( ArgumentMatchers.<String, String>anyMap() ) ).thenReturn( false ).thenReturn( true );
when( toolchainFactory_basicType.createToolchain( isA( ToolchainModel.class ) ) ).thenReturn( basicPrivate );
List<Toolchain> toolchains =
http://git-wip-us.apache.org/repos/asf/maven/blob/a03489b6/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
index 80fca09..fc530df 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
@@ -21,8 +21,7 @@ package org.apache.maven.toolchain.building;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyMap;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import java.io.IOException;
@@ -35,6 +34,7 @@ import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -78,7 +78,7 @@ public class DefaultToolchainsBuilderTest
toolchain.setType( "TYPE" );
toolchain.addProvide( "key", "user_value" );
userResult.addToolchain( toolchain );
- when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenReturn( userResult );
+ when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap()) ).thenReturn( userResult );
ToolchainsBuildingResult result = toolchainBuilder.build( request );
assertNotNull( result.getEffectiveToolchains() );
@@ -101,7 +101,7 @@ public class DefaultToolchainsBuilderTest
toolchain.setType( "TYPE" );
toolchain.addProvide( "key", "global_value" );
globalResult.addToolchain( toolchain );
- when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenReturn( globalResult );
+ when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap()) ).thenReturn( globalResult );
ToolchainsBuildingResult result = toolchainBuilder.build( request );
assertNotNull( result.getEffectiveToolchains() );
@@ -131,7 +131,7 @@ public class DefaultToolchainsBuilderTest
globalToolchain.setType( "TYPE" );
globalToolchain.addProvide( "key", "global_value" );
globalResult.addToolchain( globalToolchain );
- when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenReturn( globalResult ).thenReturn( userResult );
+ when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap()) ).thenReturn( globalResult ).thenReturn( userResult );
ToolchainsBuildingResult result = toolchainBuilder.build( request );
assertNotNull( result.getEffectiveToolchains() );
@@ -150,7 +150,7 @@ public class DefaultToolchainsBuilderTest
ToolchainsBuildingRequest request = new DefaultToolchainsBuildingRequest();
request.setGlobalToolchainsSource( new StringSource( "" ) );
ToolchainsParseException parseException = new ToolchainsParseException( "MESSAGE", 4, 2 );
- when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenThrow( parseException );
+ when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap()) ).thenThrow( parseException );
try
{
@@ -169,7 +169,7 @@ public class DefaultToolchainsBuilderTest
ToolchainsBuildingRequest request = new DefaultToolchainsBuildingRequest();
request.setGlobalToolchainsSource( new StringSource( "", "LOCATION" ) );
IOException ioException = new IOException( "MESSAGE" );
- when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenThrow( ioException );
+ when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap()) ).thenThrow( ioException );
try
{
http://git-wip-us.apache.org/repos/asf/maven/blob/a03489b6/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index cfc126f..7adddc6 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -141,6 +141,7 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/a03489b6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d03a25a..4fb8053 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@ under the License.
<commonsCliVersion>1.4</commonsCliVersion>
<commonsLangVersion>3.5</commonsLangVersion>
<junitVersion>4.12</junitVersion>
- <mockitoVersion>1.10.19</mockitoVersion>
+ <mockitoVersion>2.12.0</mockitoVersion>
<plexusVersion>1.7.1</plexusVersion>
<plexusInterpolationVersion>1.24</plexusInterpolationVersion>
<plexusUtilsVersion>3.1.0</plexusUtilsVersion>
@@ -405,6 +405,7 @@ under the License.
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockitoVersion}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
<!--bootstrap-start-comment-->
[7/9] maven git commit: fixed new issues reported by Checkstyle 6.18
Posted by kh...@apache.org.
fixed new issues reported by Checkstyle 6.18
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cf7b0a3e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cf7b0a3e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cf7b0a3e
Branch: refs/heads/MNG-6352-print-version
Commit: cf7b0a3ec0c9333f646da8694bdcd9d2eb91a4b0
Parents: e2bc17b
Author: Hervé Boutemy <hb...@apache.org>
Authored: Thu Feb 8 07:37:05 2018 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat Feb 10 11:42:33 2018 +0100
----------------------------------------------------------------------
.../apache/maven/artifact/versioning/ComparableVersion.java | 4 ++--
.../main/java/org/apache/maven/building/DefaultProblem.java | 2 +-
.../org/apache/maven/building/DefaultProblemCollector.java | 2 +-
maven-core/src/main/java/org/apache/maven/ReactorReader.java | 2 +-
.../src/main/java/org/apache/maven/RepositoryUtils.java | 2 +-
.../artifact/repository/LegacyLocalRepositoryManager.java | 4 ++--
.../maven/classrealm/ArtifactClassRealmConstituent.java | 2 +-
.../org/apache/maven/classrealm/DefaultClassRealmRequest.java | 4 ++--
.../maven/configuration/internal/DefaultBeanConfigurator.java | 2 +-
.../maven/eventspy/internal/EventSpyExecutionListener.java | 2 +-
.../maven/eventspy/internal/EventSpyRepositoryListener.java | 2 +-
.../main/java/org/apache/maven/execution/SettingsAdapter.java | 2 +-
.../apache/maven/graph/FilteredProjectDependencyGraph.java | 4 ++--
.../maven/internal/aether/LoggingRepositoryListener.java | 2 +-
.../lifecycle/internal/CompoundProjectExecutionListener.java | 2 +-
.../maven/lifecycle/internal/DefaultExecutionEvent.java | 2 +-
.../maven/lifecycle/internal/LifecycleDependencyResolver.java | 2 +-
.../internal/builder/multithreaded/ThreadOutputMuxer.java | 2 +-
.../apache/maven/plugin/CompoundMojoExecutionListener.java | 2 +-
.../org/apache/maven/plugin/DefaultPluginDescriptorCache.java | 2 +-
.../java/org/apache/maven/plugin/ExtensionRealmCache.java | 4 ++--
.../java/org/apache/maven/plugin/PluginArtifactsCache.java | 4 ++--
.../main/java/org/apache/maven/plugin/PluginRealmCache.java | 4 ++--
.../plugin/internal/PluginDependencyResolutionListener.java | 2 +-
.../plugin/internal/ValidatingConfigurationListener.java | 2 +-
.../java/org/apache/maven/plugin/internal/WagonExcluder.java | 2 +-
.../plugin/prefix/internal/DefaultPluginPrefixResult.java | 6 +++---
.../plugin/version/internal/DefaultPluginVersionResult.java | 4 ++--
.../apache/maven/project/DefaultProjectBuildingResult.java | 6 +++---
.../maven/project/DefaultProjectDependenciesResolver.java | 2 +-
.../main/java/org/apache/maven/project/ProjectRealmCache.java | 4 ++--
.../main/java/org/apache/maven/project/ReactorModelCache.java | 2 +-
.../main/java/org/apache/maven/project/ReactorModelPool.java | 2 +-
.../apache/maven/project/artifact/ProjectArtifactsCache.java | 6 +++---
.../org/apache/maven/toolchain/java/JavaToolchainImpl.java | 2 +-
.../src/main/java/org/apache/maven/cli/MavenCli.java | 2 +-
.../java/org/apache/maven/cli/logging/Slf4jConfiguration.java | 2 +-
.../maven/cli/transfer/AbstractMavenTransferListener.java | 4 ++--
.../maven/model/building/DefaultModelBuildingEvent.java | 2 +-
.../maven/model/building/DefaultModelBuildingResult.java | 2 +-
.../maven/model/building/DefaultModelProblemCollector.java | 2 +-
.../maven/model/building/FilterModelBuildingRequest.java | 2 +-
.../main/java/org/apache/maven/model/building/ModelData.java | 4 ++--
.../maven/model/interpolation/BuildTimestampValueSource.java | 2 +-
.../model/interpolation/PathTranslatingPostProcessor.java | 2 +-
.../model/interpolation/ProblemDetectingValueSource.java | 2 +-
.../model/interpolation/StringSearchModelInterpolator.java | 7 +++----
.../model/interpolation/UrlNormalizingPostProcessor.java | 2 +-
.../apache/maven/repository/internal/DefaultModelCache.java | 2 +-
.../maven/repository/internal/DefaultModelResolver.java | 6 +++---
.../maven/repository/internal/DefaultVersionResolver.java | 6 +++---
.../maven/repository/internal/LocalSnapshotMetadata.java | 4 ++--
.../repository/internal/LocalSnapshotMetadataGenerator.java | 2 +-
.../apache/maven/repository/internal/RelocatedArtifact.java | 2 +-
.../maven/repository/internal/RemoteSnapshotMetadata.java | 2 +-
.../repository/internal/RemoteSnapshotMetadataGenerator.java | 2 +-
.../apache/maven/repository/internal/VersionsMetadata.java | 4 ++--
.../maven/repository/internal/VersionsMetadataGenerator.java | 4 ++--
.../settings/building/DefaultSettingsBuildingResult.java | 2 +-
.../settings/building/DefaultSettingsProblemCollector.java | 2 +-
.../settings/crypto/DefaultSettingsDecryptionResult.java | 2 +-
61 files changed, 87 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 105d9b5..8eb9a8f 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -98,7 +98,7 @@ public class ComparableVersion
this.value = BIG_INTEGER_ZERO;
}
- public IntegerItem( String str )
+ IntegerItem( String str )
{
this.value = new BigInteger( str );
}
@@ -169,7 +169,7 @@ public class ComparableVersion
private String value;
- public StringItem( String value, boolean followedByDigit )
+ StringItem( String value, boolean followedByDigit )
{
if ( followedByDigit && value.length() == 1 )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
----------------------------------------------------------------------
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
index 427eb2c..5ac68ef 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
@@ -55,7 +55,7 @@ class DefaultProblem
* @param columnNumber The one-based index of the column containing the problem or {@code -1} if unknown.
* @param exception The exception that caused this problem, may be {@code null}.
*/
- public DefaultProblem( String message, Severity severity, String source, int lineNumber, int columnNumber,
+ DefaultProblem( String message, Severity severity, String source, int lineNumber, int columnNumber,
Exception exception )
{
this.message = message;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java
----------------------------------------------------------------------
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java
index 567f620..8502942 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java
@@ -36,7 +36,7 @@ class DefaultProblemCollector
private String source;
- public DefaultProblemCollector( List<Problem> problems )
+ DefaultProblemCollector( List<Problem> problems )
{
this.problems = ( problems != null ) ? problems : new ArrayList<Problem>();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/ReactorReader.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
index 99ae0a3..84662ff 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -64,7 +64,7 @@ class ReactorReader
private WorkspaceRepository repository;
@Inject
- public ReactorReader( MavenSession session )
+ ReactorReader( MavenSession session )
{
projectsByGAV = session.getProjectMap();
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 00f1327..c1e21c4 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -347,7 +347,7 @@ public class RepositoryUtils
private final ArtifactHandlerManager handlerManager;
- public MavenArtifactTypeRegistry( ArtifactHandlerManager handlerManager )
+ MavenArtifactTypeRegistry( ArtifactHandlerManager handlerManager )
{
this.handlerManager = handlerManager;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
index 0c92721..bc63364 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
@@ -197,7 +197,7 @@ public class LegacyLocalRepositoryManager
private final Metadata metadata;
- public ArtifactMetadataAdapter( Metadata metadata )
+ ArtifactMetadataAdapter( Metadata metadata )
{
this.metadata = metadata;
}
@@ -291,7 +291,7 @@ public class LegacyLocalRepositoryManager
private final RemoteRepository repository;
- public ArtifactRepositoryAdapter( RemoteRepository repository )
+ ArtifactRepositoryAdapter( RemoteRepository repository )
{
this.repository = repository;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java b/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java
index 562d6f4..16d3e7b 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java
@@ -32,7 +32,7 @@ class ArtifactClassRealmConstituent
private final Artifact artifact;
- public ArtifactClassRealmConstituent( Artifact artifact )
+ ArtifactClassRealmConstituent( Artifact artifact )
{
this.artifact = artifact;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmRequest.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmRequest.java
index 062b2cf..8694b01 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmRequest.java
@@ -39,8 +39,8 @@ class DefaultClassRealmRequest
private final List<ClassRealmConstituent> constituents;
- public DefaultClassRealmRequest( RealmType type, ClassLoader parent, List<String> parentImports,
- Map<String, ClassLoader> foreignImports, List<ClassRealmConstituent> constituents )
+ DefaultClassRealmRequest( RealmType type, ClassLoader parent, List<String> parentImports,
+ Map<String, ClassLoader> foreignImports, List<ClassRealmConstituent> constituents )
{
this.type = type;
this.parent = parent;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
index 21c1ee3..1b3c71a 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
@@ -111,7 +111,7 @@ public class DefaultBeanConfigurator
private final BeanConfigurationPathTranslator translator;
- public BeanExpressionEvaluator( BeanConfigurationRequest request )
+ BeanExpressionEvaluator( BeanConfigurationRequest request )
{
preprocessor = request.getValuePreprocessor();
translator = request.getPathTranslator();
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java
index 6b25da5..cc0a311 100644
--- a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java
@@ -35,7 +35,7 @@ class EventSpyExecutionListener
private final ExecutionListener delegate;
- public EventSpyExecutionListener( EventSpyDispatcher dispatcher, ExecutionListener delegate )
+ EventSpyExecutionListener( EventSpyDispatcher dispatcher, ExecutionListener delegate )
{
this.dispatcher = dispatcher;
this.delegate = delegate;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java
index 60d4cd1..a2bce12 100644
--- a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java
+++ b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java
@@ -34,7 +34,7 @@ class EventSpyRepositoryListener
private final RepositoryListener delegate;
- public EventSpyRepositoryListener( EventSpyDispatcher dispatcher, RepositoryListener delegate )
+ EventSpyRepositoryListener( EventSpyDispatcher dispatcher, RepositoryListener delegate )
{
this.dispatcher = dispatcher;
this.delegate = delegate;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java b/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java
index 9a76993..bf5d373 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java
@@ -47,7 +47,7 @@ class SettingsAdapter
private RuntimeInfo runtimeInfo;
- public SettingsAdapter( MavenExecutionRequest request )
+ SettingsAdapter( MavenExecutionRequest request )
{
this.request = request;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
index c4f8e1a..795e666 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
@@ -50,8 +50,8 @@ class FilteredProjectDependencyGraph
* @param projectDependencyGraph The project dependency graph to create a sub view from, must not be {@code null}.
* @param whiteList The projects on which the dependency view should focus, must not be {@code null}.
*/
- public FilteredProjectDependencyGraph( ProjectDependencyGraph projectDependencyGraph,
- Collection<? extends MavenProject> whiteList )
+ FilteredProjectDependencyGraph( ProjectDependencyGraph projectDependencyGraph,
+ Collection<? extends MavenProject> whiteList )
{
this.projectDependencyGraph =
Validate.notNull( projectDependencyGraph, "projectDependencyGraph cannot be null" );
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java b/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java
index 7b67c3b..67dca47 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java
@@ -35,7 +35,7 @@ class LoggingRepositoryListener
private final Logger logger;
- public LoggingRepositoryListener( Logger logger )
+ LoggingRepositoryListener( Logger logger )
{
this.logger = logger;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java
index f2a8291..48474e6 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java
@@ -30,7 +30,7 @@ class CompoundProjectExecutionListener
{
private final Collection<ProjectExecutionListener> listeners;
- public CompoundProjectExecutionListener( Collection<ProjectExecutionListener> listeners )
+ CompoundProjectExecutionListener( Collection<ProjectExecutionListener> listeners )
{
this.listeners = listeners; // NB this is live injected collection
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java
index 9434a65..1090871 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java
@@ -41,7 +41,7 @@ class DefaultExecutionEvent
private final Exception exception;
- public DefaultExecutionEvent( Type type, MavenSession session, MojoExecution mojoExecution, Exception exception )
+ DefaultExecutionEvent( Type type, MavenSession session, MojoExecution mojoExecution, Exception exception )
{
this.type = type;
this.session = session;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index f7636ef..dfc65a8 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -356,7 +356,7 @@ public class LifecycleDependencyResolver
private Set<String> keys = new HashSet<>();
- public ReactorDependencyFilter( Collection<Artifact> artifacts )
+ ReactorDependencyFilter( Collection<Artifact> artifacts )
{
for ( Artifact artifact : artifacts )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
index edf8ab6..587a847 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
@@ -209,7 +209,7 @@ public class ThreadOutputMuxer
extends PrintStream
{
- public ThreadBoundPrintStream( PrintStream systemOutStream )
+ ThreadBoundPrintStream( PrintStream systemOutStream )
{
super( systemOutStream );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java b/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java
index 9fe5283..e61ffbd 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java
@@ -30,7 +30,7 @@ class CompoundMojoExecutionListener
private final Collection<MojoExecutionListener> listeners;
- public CompoundMojoExecutionListener( Collection<MojoExecutionListener> listeners )
+ CompoundMojoExecutionListener( Collection<MojoExecutionListener> listeners )
{
this.listeners = listeners; // NB this is live injected collection
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
index 32228ba..1e87998 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
@@ -141,7 +141,7 @@ public class DefaultPluginDescriptorCache
private final int hashCode;
- public CacheKey( Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session )
+ CacheKey( Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session )
{
groupId = plugin.getGroupId();
artifactId = plugin.getArtifactId();
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
index 803b4b0..ffae815 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
@@ -44,7 +44,7 @@ public interface ExtensionRealmCache
// marker interface for cache keys
}
- static class CacheRecord
+ class CacheRecord
{
public final ClassRealm realm;
@@ -53,7 +53,7 @@ public interface ExtensionRealmCache
public final List<Artifact> artifacts;
- public CacheRecord( ClassRealm realm, ExtensionDescriptor descriptor, List<Artifact> artifacts )
+ CacheRecord( ClassRealm realm, ExtensionDescriptor descriptor, List<Artifact> artifacts )
{
this.realm = realm;
this.descriptor = descriptor;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
index 17537a2..e24b733 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
@@ -47,14 +47,14 @@ public interface PluginArtifactsCache
// marker interface for cache keys
}
- static class CacheRecord
+ class CacheRecord
{
public final List<Artifact> artifacts;
public final PluginResolutionException exception;
- public CacheRecord( List<Artifact> artifacts )
+ CacheRecord( List<Artifact> artifacts )
{
this.artifacts = artifacts;
this.exception = null;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
index 1ffa157..b2c3172 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
@@ -41,13 +41,13 @@ import org.eclipse.aether.repository.RemoteRepository;
public interface PluginRealmCache
{
- static class CacheRecord
+ class CacheRecord
{
public final ClassRealm realm;
public final List<Artifact> artifacts;
- public CacheRecord( ClassRealm realm, List<Artifact> artifacts )
+ CacheRecord( ClassRealm realm, List<Artifact> artifacts )
{
this.realm = realm;
this.artifacts = artifacts;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
index 18756f3..47728ec 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
@@ -52,7 +52,7 @@ class PluginDependencyResolutionListener
private Map<Artifact, Object> bannedArtifacts = new IdentityHashMap<>();
- public PluginDependencyResolutionListener( ArtifactFilter coreFilter )
+ PluginDependencyResolutionListener( ArtifactFilter coreFilter )
{
this.coreFilter = coreFilter;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
index e9c08be..99b18af 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
@@ -43,7 +43,7 @@ class ValidatingConfigurationListener
private final Map<String, Parameter> missingParameters;
- public ValidatingConfigurationListener( Object mojo, MojoDescriptor mojoDescriptor, ConfigurationListener delegate )
+ ValidatingConfigurationListener( Object mojo, MojoDescriptor mojoDescriptor, ConfigurationListener delegate )
{
this.mojo = mojo;
this.delegate = delegate;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
index 43e8cfc..d374cab 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
@@ -39,7 +39,7 @@ class WagonExcluder
private final boolean coreArtifact;
- public WagonExcluder()
+ WagonExcluder()
{
this( false );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java
index 6a248bf..2adc6f3 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java
@@ -39,18 +39,18 @@ class DefaultPluginPrefixResult
private ArtifactRepository repository;
- public DefaultPluginPrefixResult()
+ DefaultPluginPrefixResult()
{
// does nothing
}
- public DefaultPluginPrefixResult( Plugin plugin )
+ DefaultPluginPrefixResult( Plugin plugin )
{
groupId = plugin.getGroupId();
artifactId = plugin.getArtifactId();
}
- public DefaultPluginPrefixResult( String groupId, String artifactId, ArtifactRepository repository )
+ DefaultPluginPrefixResult( String groupId, String artifactId, ArtifactRepository repository )
{
this.groupId = groupId;
this.artifactId = artifactId;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java
index 9027a53..020d6e7 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java
@@ -36,12 +36,12 @@ class DefaultPluginVersionResult
private ArtifactRepository repository;
- public DefaultPluginVersionResult()
+ DefaultPluginVersionResult()
{
// does nothing
}
- public DefaultPluginVersionResult( String version )
+ DefaultPluginVersionResult( String version )
{
this.version = version;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
index 06e4101..bcc6b4f 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
@@ -51,8 +51,8 @@ class DefaultProjectBuildingResult
* @param problems The problems that were encountered, may be {@code null}.
* @param dependencyResolutionResult The result of the resolution for the project dependencies, may be {@code null}.
*/
- public DefaultProjectBuildingResult( MavenProject project, List<ModelProblem> problems,
- DependencyResolutionResult dependencyResolutionResult )
+ DefaultProjectBuildingResult( MavenProject project, List<ModelProblem> problems,
+ DependencyResolutionResult dependencyResolutionResult )
{
this.projectId =
( project != null ) ? project.getGroupId() + ':' + project.getArtifactId() + ':' + project.getVersion()
@@ -70,7 +70,7 @@ class DefaultProjectBuildingResult
* @param pomFile The POM file from which the project was built, may be {@code null}.
* @param problems The problems that were encountered, may be {@code null}.
*/
- public DefaultProjectBuildingResult( String projectId, File pomFile, List<ModelProblem> problems )
+ DefaultProjectBuildingResult( String projectId, File pomFile, List<ModelProblem> problems )
{
this.projectId = ( projectId != null ) ? projectId : "";
this.pomFile = pomFile;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 4e26de2..4bb9609 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -236,7 +236,7 @@ public class DefaultProjectDependenciesResolver
private String indent = "";
- public GraphLogger( MavenProject project )
+ GraphLogger( MavenProject project )
{
this.project = project;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
index 9265b89..3400f96 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
@@ -43,14 +43,14 @@ public interface ProjectRealmCache
// marker interface for cache keys
}
- static class CacheRecord
+ class CacheRecord
{
public final ClassRealm realm;
public final DependencyFilter extensionArtifactFilter;
- public CacheRecord( ClassRealm realm, DependencyFilter extensionArtifactFilter )
+ CacheRecord( ClassRealm realm, DependencyFilter extensionArtifactFilter )
{
this.realm = realm;
this.extensionArtifactFilter = extensionArtifactFilter;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java
index 9b7c84f..6331157 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java
@@ -58,7 +58,7 @@ class ReactorModelCache
private final int hashCode;
- public CacheKey( String groupId, String artifactId, String version, String tag )
+ CacheKey( String groupId, String artifactId, String version, String tag )
{
this.groupId = ( groupId != null ) ? groupId : "";
this.artifactId = ( artifactId != null ) ? artifactId : "";
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
index 318dc19..6b6d2bb 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
@@ -55,7 +55,7 @@ class ReactorModelPool
private final int hashCode;
- public CacheKey( String groupId, String artifactId, String version )
+ CacheKey( String groupId, String artifactId, String version )
{
this.groupId = ( groupId != null ) ? groupId : "";
this.artifactId = ( artifactId != null ) ? artifactId : "";
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
index ac093e9..cfec1d9 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
@@ -46,20 +46,20 @@ public interface ProjectArtifactsCache
// marker interface for cache keys
}
- static class CacheRecord
+ class CacheRecord
{
public final Set<Artifact> artifacts;
public final LifecycleExecutionException exception;
- public CacheRecord( Set<Artifact> artifacts )
+ CacheRecord( Set<Artifact> artifacts )
{
this.artifacts = artifacts;
this.exception = null;
}
- public CacheRecord( LifecycleExecutionException exception )
+ CacheRecord( LifecycleExecutionException exception )
{
this.artifacts = null;
this.exception = exception;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
index 4a09ee0..d047e7e 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
@@ -41,7 +41,7 @@ class JavaToolchainImpl
public static final String KEY_JAVAHOME = "jdkHome"; //NOI18N
- public JavaToolchainImpl( ToolchainModel model, Logger logger )
+ JavaToolchainImpl( ToolchainModel model, Logger logger )
{
super( model, "jdk", logger );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 977f174..77ef134 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1684,7 +1684,7 @@ public class MavenCli
@SuppressWarnings( "checkstyle:visibilitymodifier" )
public int exitCode;
- public ExitException( int exitCode )
+ ExitException( int exitCode )
{
this.exitCode = exitCode;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
index 5f4b64d..f64f330 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
@@ -28,7 +28,7 @@ package org.apache.maven.cli.logging;
*/
public interface Slf4jConfiguration
{
- public static enum Level
+ enum Level
{
DEBUG, INFO, ERROR
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
index 2b13879..c33e8a2 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
@@ -49,7 +49,7 @@ public abstract class AbstractMavenTransferListener
// TODO Move me to Maven Shared Utils
static class FileSizeFormat
{
- static enum ScaleUnit
+ enum ScaleUnit
{
BYTE
{
@@ -137,7 +137,7 @@ public abstract class AbstractMavenTransferListener
private DecimalFormat smallFormat;
private DecimalFormat largeFormat;
- public FileSizeFormat( Locale locale )
+ FileSizeFormat( Locale locale )
{
smallFormat = new DecimalFormat( "#0.0", new DecimalFormatSymbols( locale ) );
largeFormat = new DecimalFormat( "###0", new DecimalFormatSymbols( locale ) );
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java
index f72403b..01d23ef 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java
@@ -36,7 +36,7 @@ class DefaultModelBuildingEvent
private final ModelProblemCollector problems;
- public DefaultModelBuildingEvent( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
+ DefaultModelBuildingEvent( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
{
this.model = model;
this.request = request;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
index 7bf45b5..7c14063 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
@@ -49,7 +49,7 @@ class DefaultModelBuildingResult
private List<ModelProblem> problems;
- public DefaultModelBuildingResult()
+ DefaultModelBuildingResult()
{
modelIds = new ArrayList<>();
rawModels = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
index 89d5cb2..c06869a 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
@@ -51,7 +51,7 @@ class DefaultModelProblemCollector
private Set<ModelProblem.Severity> severities = EnumSet.noneOf( ModelProblem.Severity.class );
- public DefaultModelProblemCollector( ModelBuildingResult result )
+ DefaultModelProblemCollector( ModelBuildingResult result )
{
this.result = result;
this.problems = result.getProblems();
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
index c5c2cbf..a51126f 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
@@ -41,7 +41,7 @@ class FilterModelBuildingRequest
protected ModelBuildingRequest request;
- public FilterModelBuildingRequest( ModelBuildingRequest request )
+ FilterModelBuildingRequest( ModelBuildingRequest request )
{
this.request = request;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
index 4fefe0d..b21dd0d 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
@@ -51,7 +51,7 @@ class ModelData
*
* @param model The model to wrap, may be {@code null}.
*/
- public ModelData( ModelSource source, Model model )
+ ModelData( ModelSource source, Model model )
{
this.source = source;
this.model = model;
@@ -65,7 +65,7 @@ class ModelData
* @param artifactId The effective artifact identifier of the model, may be {@code null}.
* @param version The effective version of the model, may be {@code null}.
*/
- public ModelData( ModelSource source, Model model, String groupId, String artifactId, String version )
+ ModelData( ModelSource source, Model model, String groupId, String artifactId, String version )
{
this.source = source;
this.model = model;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java
index 30809b8..c7ca305 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java
@@ -29,7 +29,7 @@ class BuildTimestampValueSource
{
private final MavenBuildTimestamp mavenBuildTimestamp;
- public BuildTimestampValueSource( Date startTime, Properties properties )
+ BuildTimestampValueSource( Date startTime, Properties properties )
{
super( false );
this.mavenBuildTimestamp = new MavenBuildTimestamp( startTime, properties );
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java
index 1aeafdd..c05b86a 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java
@@ -39,7 +39,7 @@ class PathTranslatingPostProcessor
private final PathTranslator pathTranslator;
private final List<String> expressionPrefixes;
- public PathTranslatingPostProcessor( List<String> expressionPrefixes, Collection<String> unprefixedPathKeys,
+ PathTranslatingPostProcessor( List<String> expressionPrefixes, Collection<String> unprefixedPathKeys,
File projectDir, PathTranslator pathTranslator )
{
this.expressionPrefixes = expressionPrefixes;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
index be5b227..4ed98d0 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
@@ -44,7 +44,7 @@ class ProblemDetectingValueSource
private final ModelProblemCollector problems;
- public ProblemDetectingValueSource( ValueSource valueSource, String bannedPrefix, String newPrefix,
+ ProblemDetectingValueSource( ValueSource valueSource, String bannedPrefix, String newPrefix,
ModelProblemCollector problems )
{
this.valueSource = valueSource;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
index ba077b2..1d8ad04 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
@@ -106,10 +106,9 @@ public class StringSearchModelInterpolator
private final ModelProblemCollector problems;
- public InterpolateObjectAction( Object target, List<? extends ValueSource> valueSources,
- List<? extends InterpolationPostProcessor> postProcessors,
- StringSearchModelInterpolator modelInterpolator,
- ModelProblemCollector problems )
+ InterpolateObjectAction( Object target, List<? extends ValueSource> valueSources,
+ List<? extends InterpolationPostProcessor> postProcessors,
+ StringSearchModelInterpolator modelInterpolator, ModelProblemCollector problems )
{
this.valueSources = valueSources;
this.postProcessors = postProcessors;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
index ec1b0ad..14beeac 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
@@ -50,7 +50,7 @@ class UrlNormalizingPostProcessor
private UrlNormalizer normalizer;
- public UrlNormalizingPostProcessor( UrlNormalizer normalizer )
+ UrlNormalizingPostProcessor( UrlNormalizer normalizer )
{
this.normalizer = normalizer;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
index f13495d..86edf16 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
@@ -77,7 +77,7 @@ class DefaultModelCache
private final int hash;
- public Key( String groupId, String artifactId, String version, String tag )
+ Key( String groupId, String artifactId, String version, String tag )
{
this.groupId = groupId;
this.artifactId = artifactId;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index 03a0d9b..6818453 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -78,9 +78,9 @@ class DefaultModelResolver
private final Set<String> repositoryIds;
- public DefaultModelResolver( RepositorySystemSession session, RequestTrace trace, String context,
- ArtifactResolver resolver, VersionRangeResolver versionRangeResolver,
- RemoteRepositoryManager remoteRepositoryManager, List<RemoteRepository> repositories )
+ DefaultModelResolver( RepositorySystemSession session, RequestTrace trace, String context,
+ ArtifactResolver resolver, VersionRangeResolver versionRangeResolver,
+ RemoteRepositoryManager remoteRepositoryManager, List<RemoteRepository> repositories )
{
this.session = session;
this.trace = trace;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
----------------------------------------------------------------------
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 2789640..c087bdf 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
@@ -475,7 +475,7 @@ public class DefaultVersionResolver
ArtifactRepository repository;
- public VersionInfo( String timestamp, String version, ArtifactRepository repository )
+ VersionInfo( String timestamp, String version, ArtifactRepository repository )
{
this.timestamp = ( timestamp != null ) ? timestamp : "";
this.version = version;
@@ -512,7 +512,7 @@ public class DefaultVersionResolver
private final int hashCode;
- public Key( RepositorySystemSession session, VersionRequest request )
+ Key( RepositorySystemSession session, VersionRequest request )
{
Artifact artifact = request.getArtifact();
groupId = artifact.getGroupId();
@@ -585,7 +585,7 @@ public class DefaultVersionResolver
final Class<?> repoClass;
- public Record( String version, ArtifactRepository repository )
+ Record( String version, ArtifactRepository repository )
{
this.version = version;
if ( repository != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
index a572010..ce09efd 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
@@ -42,13 +42,13 @@ final class LocalSnapshotMetadata
private final boolean legacyFormat;
- public LocalSnapshotMetadata( Artifact artifact, boolean legacyFormat )
+ LocalSnapshotMetadata( Artifact artifact, boolean legacyFormat )
{
super( createMetadata( artifact, legacyFormat ), null );
this.legacyFormat = legacyFormat;
}
- public LocalSnapshotMetadata( Metadata metadata, File file, boolean legacyFormat )
+ LocalSnapshotMetadata( Metadata metadata, File file, boolean legacyFormat )
{
super( metadata, file );
this.legacyFormat = legacyFormat;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
index 072ba66..584e166 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
@@ -42,7 +42,7 @@ class LocalSnapshotMetadataGenerator
private final boolean legacyFormat;
- public LocalSnapshotMetadataGenerator( RepositorySystemSession session, InstallRequest request )
+ LocalSnapshotMetadataGenerator( RepositorySystemSession session, InstallRequest request )
{
legacyFormat = ConfigUtils.getBoolean( session.getConfigProperties(), false, "maven.metadata.legacy" );
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
index c6ef3aa..7c2d0ce 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
@@ -41,7 +41,7 @@ final class RelocatedArtifact
private final String version;
- public RelocatedArtifact( Artifact artifact, String groupId, String artifactId, String version )
+ RelocatedArtifact( Artifact artifact, String groupId, String artifactId, String version )
{
this.artifact = Validate.notNull( artifact, "artifact cannot be null" );
// TODO Use StringUtils here
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
index 1e791d8..efcfb4d 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
@@ -47,7 +47,7 @@ final class RemoteSnapshotMetadata
private final Map<String, SnapshotVersion> versions = new LinkedHashMap<>();
- public RemoteSnapshotMetadata( Artifact artifact, boolean legacyFormat )
+ RemoteSnapshotMetadata( Artifact artifact, boolean legacyFormat )
{
super( createRepositoryMetadata( artifact, legacyFormat ), null, legacyFormat );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
index 8258966..3218863 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
@@ -42,7 +42,7 @@ class RemoteSnapshotMetadataGenerator
private final boolean legacyFormat;
- public RemoteSnapshotMetadataGenerator( RepositorySystemSession session, DeployRequest request )
+ RemoteSnapshotMetadataGenerator( RepositorySystemSession session, DeployRequest request )
{
legacyFormat = ConfigUtils.getBoolean( session.getConfigProperties(), false, "maven.metadata.legacy" );
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
index f5e13be..f7df64e 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
@@ -38,13 +38,13 @@ final class VersionsMetadata
private final Artifact artifact;
- public VersionsMetadata( Artifact artifact )
+ VersionsMetadata( Artifact artifact )
{
super( createRepositoryMetadata( artifact ), null );
this.artifact = artifact;
}
- public VersionsMetadata( Artifact artifact, File file )
+ VersionsMetadata( Artifact artifact, File file )
{
super( createRepositoryMetadata( artifact ), file );
this.artifact = artifact;
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java
index 5173001..d6b5c8a 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java
@@ -43,12 +43,12 @@ class VersionsMetadataGenerator
private Map<Object, VersionsMetadata> processedVersions;
- public VersionsMetadataGenerator( RepositorySystemSession session, InstallRequest request )
+ VersionsMetadataGenerator( RepositorySystemSession session, InstallRequest request )
{
this( session, request.getMetadata() );
}
- public VersionsMetadataGenerator( RepositorySystemSession session, DeployRequest request )
+ VersionsMetadataGenerator( RepositorySystemSession session, DeployRequest request )
{
this( session, request.getMetadata() );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
index 5c1392a..187031e 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
@@ -37,7 +37,7 @@ class DefaultSettingsBuildingResult
private List<SettingsProblem> problems;
- public DefaultSettingsBuildingResult( Settings effectiveSettings, List<SettingsProblem> problems )
+ DefaultSettingsBuildingResult( Settings effectiveSettings, List<SettingsProblem> problems )
{
this.effectiveSettings = effectiveSettings;
this.problems = ( problems != null ) ? problems : new ArrayList<SettingsProblem>();
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
index 6721379..65c74c0 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
@@ -37,7 +37,7 @@ class DefaultSettingsProblemCollector
private String source;
- public DefaultSettingsProblemCollector( List<SettingsProblem> problems )
+ DefaultSettingsProblemCollector( List<SettingsProblem> problems )
{
this.problems = ( problems != null ) ? problems : new ArrayList<SettingsProblem>();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cf7b0a3e/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
index 33ee5a1..4458c61 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
@@ -41,7 +41,7 @@ class DefaultSettingsDecryptionResult
private List<SettingsProblem> problems;
- public DefaultSettingsDecryptionResult( List<Server> servers, List<Proxy> proxies, List<SettingsProblem> problems )
+ DefaultSettingsDecryptionResult( List<Server> servers, List<Proxy> proxies, List<SettingsProblem> problems )
{
this.servers = ( servers != null ) ? servers : new ArrayList<Server>();
this.proxies = ( proxies != null ) ? proxies : new ArrayList<Proxy>();
[6/9] maven git commit: upgrade m-site-p to 3.7 + Fluido 1.7 + edit
button
Posted by kh...@apache.org.
upgrade m-site-p to 3.7 + Fluido 1.7 + edit button
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0dc70cc6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0dc70cc6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0dc70cc6
Branch: refs/heads/MNG-6352-print-version
Commit: 0dc70cc691e8968627ce099df02e0570838f04fa
Parents: cf7b0a3
Author: Hervé Boutemy <hb...@apache.org>
Authored: Thu Feb 8 07:38:58 2018 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat Feb 10 11:42:33 2018 +0100
----------------------------------------------------------------------
apache-maven/src/site/site.xml | 8 +++++---
maven-artifact/src/site/site.xml | 8 +++++---
maven-builder-support/src/site/site.xml | 8 +++++---
maven-compat/src/site/site.xml | 8 +++++---
maven-core/src/site/site.xml | 8 +++++---
maven-embedder/src/site/site.xml | 8 +++++---
maven-model-builder/src/site/site.xml | 8 +++++---
maven-model/src/site/site.xml | 8 +++++---
maven-plugin-api/src/site/site.xml | 8 +++++---
maven-repository-metadata/src/site/site.xml | 8 +++++---
maven-resolver-provider/src/site/site.xml | 8 +++++---
maven-settings-builder/src/site/site.xml | 8 +++++---
maven-settings/src/site/site.xml | 8 +++++---
maven-slf4j-provider/src/site/site.xml | 8 +++++---
pom.xml | 1 +
src/site/site.xml | 8 +++++---
16 files changed, 76 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/apache-maven/src/site/site.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/site/site.xml b/apache-maven/src/site/site.xml
index cd5a745..cd7807c 100644
--- a/apache-maven/src/site/site.xml
+++ b/apache-maven/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu ref="parent"/>
<menu ref="reports"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-artifact/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/src/site/site.xml b/maven-artifact/src/site/site.xml
index 3a16bf9..e475330 100644
--- a/maven-artifact/src/site/site.xml
+++ b/maven-artifact/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-builder-support/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/src/site/site.xml b/maven-builder-support/src/site/site.xml
index 3a16bf9..e475330 100644
--- a/maven-builder-support/src/site/site.xml
+++ b/maven-builder-support/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-compat/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-compat/src/site/site.xml b/maven-compat/src/site/site.xml
index 3a16bf9..e475330 100644
--- a/maven-compat/src/site/site.xml
+++ b/maven-compat/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-core/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/site/site.xml b/maven-core/src/site/site.xml
index 9eb3ad0..4ddb7aa 100644
--- a/maven-core/src/site/site.xml
+++ b/maven-core/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-embedder/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/site.xml b/maven-embedder/src/site/site.xml
index 71dc6c8..908e741 100644
--- a/maven-embedder/src/site/site.xml
+++ b/maven-embedder/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-model-builder/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/site/site.xml b/maven-model-builder/src/site/site.xml
index 04f5445..7aaee5a 100644
--- a/maven-model-builder/src/site/site.xml
+++ b/maven-model-builder/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-model/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-model/src/site/site.xml b/maven-model/src/site/site.xml
index 3a16bf9..e475330 100644
--- a/maven-model/src/site/site.xml
+++ b/maven-model/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-plugin-api/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/site/site.xml b/maven-plugin-api/src/site/site.xml
index 9594af1..224f30e 100644
--- a/maven-plugin-api/src/site/site.xml
+++ b/maven-plugin-api/src/site/site.xml
@@ -19,9 +19,11 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-repository-metadata/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-repository-metadata/src/site/site.xml b/maven-repository-metadata/src/site/site.xml
index 0471f89..c24e143 100644
--- a/maven-repository-metadata/src/site/site.xml
+++ b/maven-repository-metadata/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-resolver-provider/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/site/site.xml b/maven-resolver-provider/src/site/site.xml
index 3a16bf9..e475330 100644
--- a/maven-resolver-provider/src/site/site.xml
+++ b/maven-resolver-provider/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-settings-builder/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/site/site.xml b/maven-settings-builder/src/site/site.xml
index 3a16bf9..e475330 100644
--- a/maven-settings-builder/src/site/site.xml
+++ b/maven-settings-builder/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-settings/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-settings/src/site/site.xml b/maven-settings/src/site/site.xml
index 3a16bf9..e475330 100644
--- a/maven-settings/src/site/site.xml
+++ b/maven-settings/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/maven-slf4j-provider/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-slf4j-provider/src/site/site.xml b/maven-slf4j-provider/src/site/site.xml
index 3a16bf9..e475330 100644
--- a/maven-slf4j-provider/src/site/site.xml
+++ b/maven-slf4j-provider/src/site/site.xml
@@ -19,9 +19,11 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 89d8cb1..f540aa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -499,6 +499,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>3.7</version>
<configuration>
<topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</topSiteURL>
</configuration>
http://git-wip-us.apache.org/repos/asf/maven/blob/0dc70cc6/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 6dd30a6..378d783 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -19,8 +19,8 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"
name="Apache Maven">
<bannerLeft>
@@ -35,9 +35,11 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.0</version>
+ <version>1.7</version>
</skin>
+ <edit>${project.scm.url}</edit>
+
<body>
<breadcrumbs>
<item name="Ref" href="../" />
[5/9] maven git commit: [MNG-6320] upgraded JAnsi to 1.17 to fix
encoding issues
Posted by kh...@apache.org.
[MNG-6320] upgraded JAnsi to 1.17 to fix encoding issues
see https://github.com/fusesource/jansi/pull/95
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/91683952
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/91683952
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/91683952
Branch: refs/heads/MNG-6352-print-version
Commit: 916839528cfc26719cb85dc74e3165095447bc97
Parents: 867e5d5
Author: Hervé Boutemy <hb...@apache.org>
Authored: Thu Feb 8 23:46:42 2018 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat Feb 10 11:42:32 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/91683952/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4fb8053..89d8cb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@ under the License.
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>1.16</version>
+ <version>1.17</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
[8/9] maven git commit: upgraded parent pom to version 31
Posted by kh...@apache.org.
upgraded parent pom to version 31
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/40cf5062
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/40cf5062
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/40cf5062
Branch: refs/heads/MNG-6352-print-version
Commit: 40cf506220cd3121fdca8b8bb8a9b9f47faad421
Parents: 0dc70cc
Author: Hervé Boutemy <hb...@apache.org>
Authored: Thu Feb 8 22:46:22 2018 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat Feb 10 11:42:33 2018 +0100
----------------------------------------------------------------------
pom.xml | 53 +----------------------------------------------------
1 file changed, 1 insertion(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/40cf5062/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f540aa3..66b9d27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>27</version>
+ <version>31</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -497,22 +497,6 @@ under the License.
<version>1.4</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.7</version>
- <configuration>
- <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</topSiteURL>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <serverId>apache.releases.https</serverId>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -549,16 +533,6 @@ under the License.
</lifecycleMappingMetadata>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -604,32 +578,10 @@ under the License.
<excludes combine.children="append">
<exclude>bootstrap/**</exclude>
<exclude>README.bootstrap.txt</exclude>
- <exclude>.repository/**</exclude> <!-- jenkins with local maven repository -->
- <exclude>.maven/spy.log</exclude> <!-- hudson maven3 integration log -->
- <exclude>.java-version</exclude>
<exclude>README.md</exclude>
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-maven</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>${maven.version}</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -660,10 +612,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0-M1</version>
<configuration>
- <!-- TODO Remove when we upgrade to maven-parent 31 -->
- <locale>en</locale>
<tags>
<tag>
<name>provisional</name>
[4/9] maven git commit: [MNG-6282] removed workaround for
MingW/GitBash detection
Posted by kh...@apache.org.
[MNG-6282] removed workaround for MingW/GitBash detection
see https://github.com/fusesource/jansi-native/issues/11
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e2bc17b5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e2bc17b5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e2bc17b5
Branch: refs/heads/MNG-6352-print-version
Commit: e2bc17b5087067398cf17c009f74cfb493ace7ca
Parents: 9168395
Author: Hervé Boutemy <hb...@apache.org>
Authored: Thu Feb 8 23:48:49 2018 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat Feb 10 11:42:32 2018 +0100
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/e2bc17b5/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 65be711..a554c66 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -188,14 +188,6 @@ export MAVEN_PROJECTBASEDIR
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
export MAVEN_CMD_LINE_ARGS
-# detect cygwin or mingw pseudo-terminal for Jansi
-# workaround for https://github.com/fusesource/jansi-native/issues/11
-if $cygwin || $mingw; then
- if [ -t 1 ]; then
- MAVEN_OPTS="-Djansi.passthrough=true $MAVEN_OPTS"
- fi
-fi
-
exec "$JAVACMD" \
$MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \
[3/9] maven git commit: [MNG-6255] Maven script cannot parse
jvm.config with CRLF
Posted by kh...@apache.org.
[MNG-6255] Maven script cannot parse jvm.config with CRLF
Both \r and \n should also be replaced with a space to deal with CRLF line endings properly
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/867e5d50
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/867e5d50
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/867e5d50
Branch: refs/heads/MNG-6352-print-version
Commit: 867e5d50be0bca17b1ba23c78e8c7c6d74c6aecd
Parents: a03489b
Author: Andrew Donald Kennedy <an...@gmail.com>
Authored: Mon Jul 10 16:58:33 2017 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat Feb 10 11:42:31 2018 +0100
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/867e5d50/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index e3a5848..65be711 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -167,7 +167,7 @@ find_file_argument_basedir() {
# concatenates all lines of a file
concat_lines() {
if [ -f "$1" ]; then
- echo "`tr -s '\n' ' ' < "$1"`"
+ echo "`tr -s '\r\n' ' ' < "$1"`"
fi
}
[9/9] maven git commit: [MNG-6352] - Printout version information at
the end of the build
Posted by kh...@apache.org.
[MNG-6352] - Printout version information at the end of the build
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/79f501ea
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/79f501ea
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/79f501ea
Branch: refs/heads/MNG-6352-print-version
Commit: 79f501ea6077bc56cf5ed7f8cae8261e686073fe
Parents: 40cf506
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Thu Feb 8 20:47:25 2018 +0100
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Sat Feb 10 13:10:05 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/cli/event/ExecutionEventLogger.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/79f501ea/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index d4171f7..22a6291 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -138,6 +138,7 @@ public class ExecutionEventLogger
logStats( event.getSession() );
infoLine( '-' );
+
}
}
@@ -157,6 +158,8 @@ public class ExecutionEventLogger
buffer.append( project.getName() );
buffer.append( ' ' );
+ buffer.append( project.getVersion() );
+ buffer.append( ' ' );
if ( buffer.length() <= MAX_PROJECT_NAME_LENGTH )
{