From a776815a1962d0a0476f6c04160e4abf4d5a5d5e Mon Sep 17 00:00:00 2001 From: akilantech Date: Mon, 12 Aug 2019 17:14:45 +0800 Subject: [PATCH 1/7] 363:Force update parent version with real version. if parent version is RELEASE or LATEST --- .../mojo/versions/AbstractVersionsUpdaterMojo.java | 8 +++++++- .../org/codehaus/mojo/versions/UpdateParentMojo.java | 10 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java index f5b3c65ce..41e8f3a7e 100644 --- a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java @@ -414,10 +414,16 @@ protected abstract void update( ModifiedPomXMLEventReader pom ) * @return true if the update should be applied. * @since 1.0-alpha-1 */ - protected boolean shouldApplyUpdate( Artifact artifact, String currentVersion, ArtifactVersion updateVersion ) + protected boolean shouldApplyUpdate( Artifact artifact, String currentVersion, ArtifactVersion updateVersion, Boolean forceUpdate ) { getLog().debug( "Proposal is to update from " + currentVersion + " to " + updateVersion ); + if ( forceUpdate == Boolean.TRUE ) + { + getLog().info( "Force update enabled. LATEST or RELEASE versions will be overwritten with real version" ); + return true; + } + if ( updateVersion == null ) { getLog().warn( "Not updating version: could not resolve any versions" ); diff --git a/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java b/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java index 840c6a034..6941262c4 100644 --- a/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java @@ -54,6 +54,14 @@ public class UpdateParentMojo @Parameter( property = "parentVersion", defaultValue = "null" ) protected String parentVersion = null; + /** + * to update parent version by force when it is RELEASE or LATEST + * + * @since 2.8 + */ + @Parameter( property = "forceUpdate", defaultValue = "False" ) + protected Boolean forceUpdate = null; + // -------------------------- OTHER METHODS -------------------------- /** @@ -111,7 +119,7 @@ protected void update( ModifiedPomXMLEventReader pom ) throw new MojoExecutionException( e.getMessage(), e ); } - if ( !shouldApplyUpdate( artifact, currentVersion, artifactVersion ) ) + if ( !shouldApplyUpdate( artifact, currentVersion, artifactVersion, forceUpdate ) ) { return; } From 987f4eba5291142cfe39aabc677e2864b7b16432 Mon Sep 17 00:00:00 2001 From: akilantech Date: Fri, 25 Jun 2021 23:28:27 +0800 Subject: [PATCH 2/7] Changed Boolean wrapper object to boolean to avoid NPE --- src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java b/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java index 6941262c4..3088d853a 100644 --- a/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java @@ -60,7 +60,7 @@ public class UpdateParentMojo * @since 2.8 */ @Parameter( property = "forceUpdate", defaultValue = "False" ) - protected Boolean forceUpdate = null; + protected boolean forceUpdate = false; // -------------------------- OTHER METHODS -------------------------- From 2dfcd6a915086268d0ed6e7a193b1b98997eba39 Mon Sep 17 00:00:00 2001 From: Akilan Irudayaraja Date: Wed, 30 Jun 2021 18:36:09 +0800 Subject: [PATCH 3/7] Update src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java Co-authored-by: Olivier Lamy --- .../java/org/codehaus/mojo/versions/UpdateParentMojo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java b/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java index 3088d853a..3474d0534 100644 --- a/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java @@ -59,7 +59,7 @@ public class UpdateParentMojo * * @since 2.8 */ - @Parameter( property = "forceUpdate", defaultValue = "False" ) + @Parameter( property = "forceUpdate", defaultValue = "false" ) protected boolean forceUpdate = false; // -------------------------- OTHER METHODS -------------------------- @@ -132,4 +132,4 @@ protected void update( ModifiedPomXMLEventReader pom ) } } -} \ No newline at end of file +} From 026310bdce7c3dc578de27172588ccba9a49bf36 Mon Sep 17 00:00:00 2001 From: Akilan Irudayaraja Date: Wed, 30 Jun 2021 18:36:27 +0800 Subject: [PATCH 4/7] Update src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java Co-authored-by: Olivier Lamy --- .../org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java index 4fb5b5b60..4b934d0bb 100644 --- a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java @@ -421,7 +421,7 @@ protected boolean shouldApplyUpdate( Artifact artifact, String currentVersion, A { getLog().debug( "Proposal is to update from " + currentVersion + " to " + updateVersion ); - if ( forceUpdate == Boolean.TRUE ) + if ( forceUpdate ) { getLog().info( "Force update enabled. LATEST or RELEASE versions will be overwritten with real version" ); return true; From 3127d7fe3ee7f1f694f88cb97f85598afab9b251 Mon Sep 17 00:00:00 2001 From: akilantech Date: Wed, 30 Jun 2021 22:45:40 +0800 Subject: [PATCH 5/7] 1) Deprecated existing method. 2) Corrected version from. --- .../versions/AbstractVersionsUpdaterMojo.java | 51 ++++++++++++++++++- .../mojo/versions/UpdateParentMojo.java | 2 +- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java index 4b934d0bb..8383d95e7 100644 --- a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java @@ -409,6 +409,10 @@ protected abstract void update( ModifiedPomXMLEventReader pom ) throws MojoExecutionException, MojoFailureException, XMLStreamException, ArtifactMetadataRetrievalException; /** + * @deprecated + * This method no longer supported. + * use shouldApplyUpdate( Artifact artifact, String currentVersion, ArtifactVersion updateVersion, Boolean forceUpdate ) + * * Returns true if the update should be applied. * * @param artifact The artifact. @@ -417,7 +421,52 @@ protected abstract void update( ModifiedPomXMLEventReader pom ) * @return true if the update should be applied. * @since 1.0-alpha-1 */ - protected boolean shouldApplyUpdate( Artifact artifact, String currentVersion, ArtifactVersion updateVersion, Boolean forceUpdate ) + @Deprecated + protected boolean shouldApplyUpdate( Artifact artifact, String currentVersion, ArtifactVersion updateVersion ) + { + getLog().debug( "Proposal is to update from " + currentVersion + " to " + updateVersion ); + + + if ( updateVersion == null ) + { + getLog().warn( "Not updating version: could not resolve any versions" ); + return false; + } + + artifact.setVersion( updateVersion.toString() ); + try + { + resolver.resolveAlways( artifact, remoteArtifactRepositories, localRepository ); + } + catch ( ArtifactResolutionException e ) + { + getLog().warn( "Not updating version: could not resolve " + artifact.toString(), e ); + return false; + } + catch ( ArtifactNotFoundException e ) + { + getLog().warn( "Not updating version: could not find " + artifact.toString(), e ); + return false; + } + + if ( currentVersion.equals( updateVersion.toString() ) ) + { + getLog().info( "Current version of " + artifact.toString() + " is the latest." ); + return false; + } + return true; + } + + /** + * Returns true if the update should be applied. + * + * @param artifact The artifact. + * @param currentVersion The current version of the artifact. + * @param updateVersion The proposed new version of the artifact. + * @return true if the update should be applied to the pom. + * @since 1.0-alpha-1 + */ + protected boolean shouldApplyUpdate( Artifact artifact, String currentVersion, ArtifactVersion updateVersion, boolean forceUpdate ) { getLog().debug( "Proposal is to update from " + currentVersion + " to " + updateVersion ); diff --git a/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java b/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java index 3474d0534..57335e6b9 100644 --- a/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java @@ -57,7 +57,7 @@ public class UpdateParentMojo /** * to update parent version by force when it is RELEASE or LATEST * - * @since 2.8 + * @since 2.9 */ @Parameter( property = "forceUpdate", defaultValue = "false" ) protected boolean forceUpdate = false; From 47e99c2055497ef3216c54d892bda523e07a4ca4 Mon Sep 17 00:00:00 2001 From: akilantech Date: Mon, 5 Jul 2021 18:53:01 +0800 Subject: [PATCH 6/7] 1) Removed duplicate code as mentioned in the review comment. --- .../versions/AbstractVersionsUpdaterMojo.java | 32 +------------------ 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java index 8383d95e7..f91229e9e 100644 --- a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java @@ -424,37 +424,7 @@ protected abstract void update( ModifiedPomXMLEventReader pom ) @Deprecated protected boolean shouldApplyUpdate( Artifact artifact, String currentVersion, ArtifactVersion updateVersion ) { - getLog().debug( "Proposal is to update from " + currentVersion + " to " + updateVersion ); - - - if ( updateVersion == null ) - { - getLog().warn( "Not updating version: could not resolve any versions" ); - return false; - } - - artifact.setVersion( updateVersion.toString() ); - try - { - resolver.resolveAlways( artifact, remoteArtifactRepositories, localRepository ); - } - catch ( ArtifactResolutionException e ) - { - getLog().warn( "Not updating version: could not resolve " + artifact.toString(), e ); - return false; - } - catch ( ArtifactNotFoundException e ) - { - getLog().warn( "Not updating version: could not find " + artifact.toString(), e ); - return false; - } - - if ( currentVersion.equals( updateVersion.toString() ) ) - { - getLog().info( "Current version of " + artifact.toString() + " is the latest." ); - return false; - } - return true; + return shouldApplyUpdate(artifact,currentVersion,updateVersion,false); } /** From bac3498e0305d464a83a32aeadf53e316d0e6fe2 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 8 Jul 2021 19:43:20 +1000 Subject: [PATCH 7/7] Update src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java --- .../org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java index f91229e9e..234cf25b9 100644 --- a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java @@ -434,7 +434,7 @@ protected boolean shouldApplyUpdate( Artifact artifact, String currentVersion, A * @param currentVersion The current version of the artifact. * @param updateVersion The proposed new version of the artifact. * @return true if the update should be applied to the pom. - * @since 1.0-alpha-1 + * @since 2.9 */ protected boolean shouldApplyUpdate( Artifact artifact, String currentVersion, ArtifactVersion updateVersion, boolean forceUpdate ) {