You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/02/19 22:35:25 UTC
[maven-integration-testing] branch master updated: [MNG-7244] Remove deprecated WARNING for usage of pom.X placeholders
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 7fceb5f [MNG-7244] Remove deprecated WARNING for usage of pom.X placeholders
7fceb5f is described below
commit 7fceb5f99844d44e1d91046a3c81e013e22cb920
Author: Giovanni van der Schelde <Gi...@infosupport.com>
AuthorDate: Tue Feb 1 15:02:17 2022 +0100
[MNG-7244] Remove deprecated WARNING for usage of pom.X placeholders
This closes #139
---
.../org/apache/maven/it/IntegrationTestSuite.java | 1 +
.../MavenIT0140InterpolationWithPomPrefixTest.java | 6 ++-
...1DeprecatedPomInterpolationExpressionsTest.java | 6 ++-
...MavenITmng7244IgnorePomPrefixInExpressions.java | 57 ++++++++++++++++++++++
core-it-suite/src/test/resources/it0012/pom.xml | 5 +-
.../test/resources/mng-2124/parent/child/pom.xml | 2 +-
.../test/resources/mng-3396/dependencies/b/pom.xml | 2 +-
.../test/resources/mng-3396/plugin/plugin/pom.xml | 4 +-
.../src/test/resources/mng-3396/pluginuser/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-3671/pom.xml | 2 +-
.../org/apache/maven/its/mng4403/b/0.1/b-0.1.pom | 3 +-
.../apache/maven/its/mng4403/b/0.1/b-0.1.pom.md5 | 2 +-
.../apache/maven/its/mng4403/b/0.1/b-0.1.pom.sha1 | 2 +-
.../pom.xml | 12 +++++
14 files changed, 89 insertions(+), 17 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 92e471e..2c3e744 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,6 +106,7 @@ public class IntegrationTestSuite
// Tests that don't run stable and need to be fixed
// -------------------------------------------------------------------------------------------------------------
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
+ suite.addTestSuite( MavenITmng7244IgnorePomPrefixInExpressions.class );
suite.addTestSuite( MavenITmng7349RelocationWarningTest.class );
suite.addTestSuite( MavenITmng6326CoreExtensionsNotFoundTest.class );
suite.addTestSuite( MavenITmng5561PluginRelocationLosesConfigurationTest.class );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
index d0134e7..1e03241 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
@@ -25,16 +25,18 @@ import java.io.File;
import java.util.Properties;
/**
+ * <a href="https://issues.apache.org/jira/browse/MNG-7244">MNG-7244</a> removes the deprecation of
+ * <code>pom.X</code>.
+ * See {@link MavenITmng7244IgnorePomPrefixInExpressions}.
*
* @author Benjamin Bentmann
- *
*/
public class MavenIT0140InterpolationWithPomPrefixTest
extends AbstractMavenIntegrationTestCase
{
public MavenIT0140InterpolationWithPomPrefixTest()
{
- super( ALL_MAVEN_VERSIONS );
+ super( "[2.0,4.0.0-alpha-1)" );
}
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
index 394a978..ad01376 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
@@ -28,6 +28,10 @@ import java.util.Properties;
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4421">MNG-4421</a>.
*
+ * But <a href="https://issues.apache.org/jira/browse/MNG-7244">MNG-7244</a> removes the deprecation of
+ * <code>pom.X</code>.
+ * See {@link MavenITmng7244IgnorePomPrefixInExpressions}.
+ *
* @author Benjamin Bentmann
*/
public class MavenITmng4421DeprecatedPomInterpolationExpressionsTest
@@ -36,7 +40,7 @@ public class MavenITmng4421DeprecatedPomInterpolationExpressionsTest
public MavenITmng4421DeprecatedPomInterpolationExpressionsTest()
{
- super( "[3.0-alpha-3,)" );
+ super( "[3.0-alpha-3,4.0.0-alpha-1)" );
}
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java
new file mode 100644
index 0000000..a523eb4
--- /dev/null
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.it;
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+public class MavenITmng7244IgnorePomPrefixInExpressions extends AbstractMavenIntegrationTestCase
+{
+ private static final String PROJECT_PATH = "/mng-7244-ignore-pom-prefix-in-expressions";
+
+ public MavenITmng7244IgnorePomPrefixInExpressions()
+ {
+ super( "[4.0.0-alpha-1,)" );
+ }
+
+ public void testIgnorePomPrefixInExpressions() throws IOException, VerificationException
+ {
+ final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
+ final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
+
+ verifier.executeGoal( "validate" );
+
+ verifyLogDoesNotContainUnexpectedWarning( verifier );
+ }
+
+ private void verifyLogDoesNotContainUnexpectedWarning( Verifier verifier ) throws IOException
+ {
+ List<String> loadedLines = verifier.loadLines( "log.txt", "UTF-8" );
+ for ( String line : loadedLines )
+ {
+ if ( line.startsWith( "[WARNING]" ) && line.contains( "The expression ${pom.version} is deprecated." ) )
+ {
+ fail( "Log contained unexpected deprecation warning" );
+ }
+ }
+ }
+}
diff --git a/core-it-suite/src/test/resources/it0012/pom.xml b/core-it-suite/src/test/resources/it0012/pom.xml
index f03cba0..05531f9 100644
--- a/core-it-suite/src/test/resources/it0012/pom.xml
+++ b/core-it-suite/src/test/resources/it0012/pom.xml
@@ -32,19 +32,16 @@ under the License.
<properties>
<test>
-POM content (available with 3 prefixes):
+POM content (available with 2 prefixes):
project.version: ${project.version}
- pom.version: ${pom.version}
version: ${version}
basedir (available with 2 prefixes):
basedir: ${basedir}
project.basedir: ${project.basedir}
- pom.basedir: ${pom.basedir}
baseUri (available with 2 prefixes):
project.baseUri: ${project.baseUri}
- pom.baseUri: ${pom.baseUri}
build.timestamp (only if build start time defined):
build.timestamp: ${build.timestamp}
diff --git a/core-it-suite/src/test/resources/mng-2124/parent/child/pom.xml b/core-it-suite/src/test/resources/mng-2124/parent/child/pom.xml
index b54b8e7..96f51b6 100644
--- a/core-it-suite/src/test/resources/mng-2124/parent/child/pom.xml
+++ b/core-it-suite/src/test/resources/mng-2124/parent/child/pom.xml
@@ -32,7 +32,7 @@ under the License.
<packaging>pom</packaging>
<name>child</name>
- <description>${pom.parent.artifactId}, ${pom.artifactId}, ${parent.artifactId}, ${pom.artifactId}</description>
+ <description>${project.parent.artifactId}, ${project.artifactId}, ${parent.artifactId}, ${project.artifactId}</description>
<build>
<plugins>
diff --git a/core-it-suite/src/test/resources/mng-3396/dependencies/b/pom.xml b/core-it-suite/src/test/resources/mng-3396/dependencies/b/pom.xml
index 132a95c..7c9b736 100644
--- a/core-it-suite/src/test/resources/mng-3396/dependencies/b/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3396/dependencies/b/pom.xml
@@ -12,7 +12,7 @@
<version>1.0</version>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>A</artifactId>
<version>[1.0,2.0)</version>
</dependency>
diff --git a/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml b/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml
index 12cccf0..cde4ac1 100644
--- a/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml
@@ -19,7 +19,7 @@
<version>2.0.4</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>B</artifactId>
<version>1.0</version>
</dependency>
@@ -27,7 +27,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>A</artifactId>
<version>3.0</version>
</dependency>
diff --git a/core-it-suite/src/test/resources/mng-3396/pluginuser/pom.xml b/core-it-suite/src/test/resources/mng-3396/pluginuser/pom.xml
index 87cc38b..ed7f3b5 100644
--- a/core-it-suite/src/test/resources/mng-3396/pluginuser/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3396/pluginuser/pom.xml
@@ -10,7 +10,7 @@
<build>
<plugins>
<plugin>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>plugin</artifactId>
<version>1.0</version>
<executions>
diff --git a/core-it-suite/src/test/resources/mng-3671/pom.xml b/core-it-suite/src/test/resources/mng-3671/pom.xml
index b9dafc4..cc7a6be 100644
--- a/core-it-suite/src/test/resources/mng-3671/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3671/pom.xml
@@ -24,7 +24,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom b/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom
index 28ed21f..477a089 100644
--- a/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom
+++ b/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom
@@ -80,8 +80,7 @@ under the License.
<!-- duplicate dependency with different version (MNG-4005), last declaration wins -->
<groupId>org.apache.maven.its.mng4403</groupId>
<artifactId>a</artifactId>
- <!-- deprecated expression prefix (MNG-4421) -->
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<!-- dependency managed by duplicate declarations -->
diff --git a/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom.md5 b/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom.md5
index 54fb184..ac6000c 100644
--- a/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom.md5
+++ b/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom.md5
@@ -1 +1 @@
-7715ed576590b23bd48ffe59fb765592
\ No newline at end of file
+745853997ed31ec0b494faefcaa5616f
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom.sha1 b/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom.sha1
index c7bb4ba..236af5a 100644
--- a/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom.sha1
+++ b/core-it-suite/src/test/resources/mng-4403/repo/org/apache/maven/its/mng4403/b/0.1/b-0.1.pom.sha1
@@ -1 +1 @@
-e4ca48b3c2c97cbe74dc167a57338d62f13f0ce5
\ No newline at end of file
+c75f5314c692293d24b5b4c1bdb78d1f4c920523
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7244-ignore-pom-prefix-in-expressions/pom.xml b/core-it-suite/src/test/resources/mng-7244-ignore-pom-prefix-in-expressions/pom.xml
new file mode 100644
index 0000000..2f034e1
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-7244-ignore-pom-prefix-in-expressions/pom.xml
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng7244</groupId>
+ <artifactId>deprecated-pom-placeholders-should-be-ignored</artifactId>
+ <version>1.0</version>
+
+ <properties>
+ <projectVersion>${pom.version}</projectVersion>
+ </properties>
+
+</project>