You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/01/15 11:17:48 UTC
[maven-integration-testing] 01/01: [MNG-6562] fixed issues caused
by new WARNING on default plugins
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-6562
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 0ba16c2380ffb267d7c60a580769ac866594304c
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Tue Jan 15 12:17:35 2019 +0100
[MNG-6562] fixed issues caused by new WARNING on default plugins
---
.../it/MavenITmng5581LifecycleMappingDelegate.java | 8 ++--
.../mng-5576-cd-friendly-versions/pom.xml | 46 ++++++++++++++++++++++
.../basic/pom.xml | 8 ++++
3 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
index f923550..2af88bf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
@@ -74,18 +74,18 @@ public class MavenITmng5581LifecycleMappingDelegate
{
List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
- boolean result = true;
+ boolean textFound = false;
for ( String line : lines )
{
if ( line.contains( text ) )
{
- result = false;
+ textFound = true;
break;
}
}
- if ( !result )
+ if ( textFound )
{
- throw new VerificationException( "Text not found in log: " + text );
+ throw new VerificationException( "Text found in log: " + text );
}
}
diff --git a/core-it-suite/src/test/resources/mng-5576-cd-friendly-versions/pom.xml b/core-it-suite/src/test/resources/mng-5576-cd-friendly-versions/pom.xml
index 1548ad5..979fea0 100644
--- a/core-it-suite/src/test/resources/mng-5576-cd-friendly-versions/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5576-cd-friendly-versions/pom.xml
@@ -33,5 +33,51 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!-- set versions of default bindings plugins to avoid warning added in MNG-6562 -->
+ <plugin><!-- clean lifecycle -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin><!-- site lifecycle -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.7.1</version>
+ </plugin>
+ <!-- default lifecycle jar packaging -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.5.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
diff --git a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml
index eb79026..b73945d 100644
--- a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml
@@ -43,5 +43,13 @@ under the License.
<version>0.1</version>
</extension>
</extensions>
+ <pluginManagement>
+ <plugins>
+ <plugin><!-- avoid warning introduced in MNG-6562 that interferes with IT log check -->
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>