You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/04/24 13:45:35 UTC
[maven-integration-testing] branch master updated: [MNG-7457] Warn about deprecated plugin Mojo
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 46f258254 [MNG-7457] Warn about deprecated plugin Mojo
46f258254 is described below
commit 46f258254a6bf8814503eb45b80b48e84b3d8495
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sat Apr 23 21:48:58 2022 +0200
[MNG-7457] Warn about deprecated plugin Mojo
---
.../org/apache/maven/it/IntegrationTestSuite.java | 2 +-
....java => MavenITmng5222MojoDeprecatedTest.java} | 22 +++++++++++++++++-----
.../maven/plugin/coreit/DeprecatedConfigMojo.java | 2 ++
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index cc2c0bd66..9d04ad440 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,7 +106,7 @@ public class IntegrationTestSuite
// Tests that don't run stable and need to be fixed
// -------------------------------------------------------------------------------------------------------------
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
- suite.addTestSuite( MavenITmng5222MojoDeprecatedParamsTest.class );
+ suite.addTestSuite( MavenITmng5222MojoDeprecatedTest.class );
suite.addTestSuite( MavenITmng7390SelectModuleOutsideCwdTest.class );
suite.addTestSuite( MavenITmng7244IgnorePomPrefixInExpressions.class );
suite.addTestSuite( MavenITmng7349RelocationWarningTest.class );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedParamsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
similarity index 93%
rename from core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedParamsTest.java
rename to core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
index cd17f1b1b..5f6ff86a7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedParamsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
@@ -28,12 +28,14 @@ import java.util.regex.Pattern;
import org.apache.maven.it.util.ResourceExtractor;
/**
- * Test for <a href="https://issues.apache.org/jira/browse/MNG-5222">MNG-5222</a>
+ * Test for
+ * <a href="https://issues.apache.org/jira/browse/MNG-5222">MNG-5222</a>
+ * <a href="https://issues.apache.org/jira/browse/MNG-7457">MNG-7457</a>
*/
-public class MavenITmng5222MojoDeprecatedParamsTest
+public class MavenITmng5222MojoDeprecatedTest
extends AbstractMavenIntegrationTestCase
{
- public MavenITmng5222MojoDeprecatedParamsTest()
+ public MavenITmng5222MojoDeprecatedTest()
{
super( "[3.9.0,)" );
}
@@ -58,7 +60,11 @@ public class MavenITmng5222MojoDeprecatedParamsTest
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
List<String> warnLines = findDeprecationWarning( logLines );
- assertTrue( "Log contains warnings: " + warnLines, warnLines.isEmpty() );
+
+ assertTrue( warnLines.remove(
+ "[WARNING] Goal 'deprecated-config' is deprecated: This goal is deprecated" ) );
+
+ assertTrue( "Not verified line: " + warnLines, warnLines.isEmpty() );
Properties configProps = verifier.loadProperties( "target/config.properties" );
@@ -106,6 +112,9 @@ public class MavenITmng5222MojoDeprecatedParamsTest
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
List<String> warnLines = findDeprecationWarning( logLines );
+ assertTrue( warnLines.remove(
+ "[WARNING] Goal 'deprecated-config' is deprecated: This goal is deprecated" ) );
+
assertTrue( warnLines.remove(
"[WARNING] Parameter 'deprecatedParam2' (user property 'config.deprecatedParam2') is deprecated: No reason given" ) );
@@ -170,6 +179,9 @@ public class MavenITmng5222MojoDeprecatedParamsTest
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
List<String> warnLines = findDeprecationWarning( logLines );
+ assertTrue( warnLines.remove(
+ "[WARNING] Goal 'deprecated-config' is deprecated: This goal is deprecated" ) );
+
assertTrue( warnLines.remove(
"[WARNING] Parameter 'deprecatedParam' is deprecated: I'm deprecated param" ) );
@@ -238,7 +250,7 @@ public class MavenITmng5222MojoDeprecatedParamsTest
private List<String> findDeprecationWarning( List<String> logLines )
{
- Pattern pattern = Pattern.compile( "\\[WARNING] Parameter .* is deprecated:.*" );
+ Pattern pattern = Pattern.compile( "\\[WARNING] (Parameter|Goal) .* is deprecated:.*" );
List<String> result = new ArrayList<>();
for ( String line : logLines )
{
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/DeprecatedConfigMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/DeprecatedConfigMojo.java
index 642b12330..f94ec9fca 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/DeprecatedConfigMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/DeprecatedConfigMojo.java
@@ -36,7 +36,9 @@ import org.apache.maven.plugins.annotations.Parameter;
* Dumps this mojo's configuration into a properties file.
*
* @author Slawomir Jaranowski
+ * @deprecated This goal is deprecated
*/
+@Deprecated
@Mojo( name = "deprecated-config", defaultPhase = LifecyclePhase.VALIDATE )
public class DeprecatedConfigMojo
extends AbstractMojo