You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/01/26 01:29:09 UTC
[maven] branch simplify_code updated (aa7a6ab -> 427e10f)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch simplify_code
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard aa7a6ab Remove redundant code
discard c3b2634 Simplify some code
new 633b6f5 Simplify some code
new 427e10f Remove redundant code
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (aa7a6ab)
\
N -- N -- N refs/heads/simplify_code (427e10f)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/maven/repository/ArtifactTransferEvent.java | 5 ++++-
pom.xml | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
[maven] 01/02: Simplify some code
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch simplify_code
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 633b6f5f7b83b2ea344d9c93b09e58ed3b035584
Author: Lipmanpoi <ch...@foxmal.com>
AuthorDate: Sat Aug 17 01:44:56 2019 +0800
Simplify some code
Closes #279
---
.../plugin/version/PluginVersionResolutionException.java | 12 ++++++------
.../org/apache/maven/repository/ArtifactTransferEvent.java | 5 ++---
.../maven/cli/transfer/AbstractMavenTransferListener.java | 2 +-
.../org/apache/maven/model/building/DefaultModelBuilder.java | 8 ++++----
pom.xml | 5 +++++
5 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
index dd14b30..c1b5ccf 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
@@ -82,29 +82,29 @@ public class PluginVersionResolutionException
private static String format( LocalRepository localRepository, List<RemoteRepository> remoteRepositories )
{
- String repos = "[";
+ StringBuilder repos = new StringBuilder( "[" );
if ( localRepository != null )
{
- repos += localRepository.getId() + " (" + localRepository.getBasedir() + ")";
+ repos.append( localRepository.getId() ).append( " (" ).append( localRepository.getBasedir() ).append( ")" );
}
if ( remoteRepositories != null && !remoteRepositories.isEmpty() )
{
for ( RemoteRepository repository : remoteRepositories )
{
- repos += ", ";
+ repos.append( ", " );
if ( repository != null )
{
- repos += repository.getId() + " (" + repository.getUrl() + ")";
+ repos.append( repository.getId() ).append( " (" ).append( repository.getUrl() ).append( ")" );
}
}
}
- repos += "]";
+ repos.append( "]" );
- return repos;
+ return repos.toString();
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
index c8150ec..f560c54 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
@@ -330,11 +330,10 @@ public class ArtifactTransferEvent
{
return false;
}
- else if ( !source.equals( other.source ) )
+ else
{
- return false;
+ return source.equals( other.source );
}
- return true;
}
}
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 984902e..72bffc3 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
@@ -192,7 +192,7 @@ public abstract class AbstractMavenTransferListener
public String formatProgress( long progressedSize, long size )
{
Validate.isTrue( progressedSize >= 0L, "progressed file size cannot be negative: %s", progressedSize );
- Validate.isTrue( size >= 0L && progressedSize <= size || size < 0L,
+ Validate.isTrue( size < 0L || progressedSize <= size,
"progressed file size cannot be greater than size: %s > %s", progressedSize, size );
if ( size >= 0L && progressedSize != size )
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 6676d3a..2d01e126 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -360,15 +360,15 @@ public class DefaultModelBuilder
}
else if ( !parentIds.add( parentData.getId() ) )
{
- String message = "The parents form a cycle: ";
+ StringBuilder message = new StringBuilder( "The parents form a cycle: " );
for ( String modelId : parentIds )
{
- message += modelId + " -> ";
+ message.append( modelId ).append( " -> " );
}
- message += parentData.getId();
+ message.append( parentData.getId() );
problems.add( new ModelProblemCollectorRequest( ModelProblem.Severity.FATAL, ModelProblem.Version.BASE )
- .setMessage( message ) );
+ .setMessage( message.toString() ) );
throw problems.newModelBuildingException();
}
diff --git a/pom.xml b/pom.xml
index 3148a97..cd6e8c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -633,6 +633,11 @@ under the License.
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.13.0-SNAPSHOT</version>
+ </plugin>
</plugins>
</build>
[maven] 02/02: Remove redundant code
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch simplify_code
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 427e10f9fb7645cb983968560a5d41bd9a2e8602
Author: thelproad <th...@outlook.com>
AuthorDate: Sat Aug 17 17:04:15 2019 +0800
Remove redundant code
Closes #280
---
.../artifact/repository/metadata/AbstractRepositoryMetadata.java | 3 +--
.../java/org/apache/maven/classrealm/DefaultClassRealmManager.java | 5 ++---
.../org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java | 2 +-
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 4 ++--
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
index 46c41b9..196b4b7 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
@@ -123,8 +123,7 @@ public abstract class AbstractRepositoryMetadata
// beware meta-versions!
String version = metadata.getVersion();
- if ( version != null && ( Artifact.LATEST_VERSION.equals( version ) || Artifact.RELEASE_VERSION.equals(
- version ) ) )
+ if ( Artifact.LATEST_VERSION.equals( version ) || Artifact.RELEASE_VERSION.equals( version ) )
{
// meta-versions are not valid <version/> values...don't write them.
metadata.setVersion( null );
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index a4835fd..cf3d746 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -243,12 +243,11 @@ public class DefaultClassRealmManager
{
Objects.requireNonNull( plugin, "plugin cannot be null" );
- ClassLoader parent = PARENT_CLASSLOADER;
-
Map<String, ClassLoader> foreignImports =
Collections.<String, ClassLoader>singletonMap( "", getMavenApiRealm() );
- return createRealm( getKey( plugin, true ), RealmType.Extension, parent, null, foreignImports, artifacts );
+ return createRealm( getKey( plugin, true ), RealmType.Extension, PARENT_CLASSLOADER, null,
+ foreignImports, artifacts );
}
private boolean isProvidedArtifact( Artifact artifact )
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
index edb8dce..4bafa30 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
@@ -190,7 +190,7 @@ public class MojoDescriptorCreator
plugin.setArtifactId( tok.nextToken() );
goal = tok.nextToken();
}
- else if ( numTokens <= 2 )
+ else
{
// We have a prefix and goal
//
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 5ca0602..79e1ffe 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
@@ -337,7 +337,7 @@ public class MavenCli
"-D%s system property is not set.", MULTIMODULE_PROJECT_DIRECTORY );
throw new ExitException( 1 );
}
- File basedir = basedirProperty != null ? new File( basedirProperty ) : new File( "" );
+ File basedir = new File( basedirProperty );
try
{
cliRequest.multiModuleProjectDirectory = basedir.getCanonicalFile();
@@ -764,7 +764,7 @@ public class MavenCli
MavenExecutionRequest request = DefaultMavenExecutionRequest.copy( cliRequest.request );
- request = populateRequest( cliRequest, request );
+ populateRequest( cliRequest, request );
request = executionRequestPopulator.populateDefaults( request );