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:19:42 UTC
[maven-integration-testing] branch MNG-6562 updated (0ba16c2 ->
dcbddc2)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-6562
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
discard 0ba16c2 [MNG-6562] fixed issues caused by new WARNING on default plugins
add 7e1f5ed [MNG-6513] Migrate Plexus Javadoc Tags to Plexus Annotations
add 3e2b601 [MNG-6265] Add integration test
add c7d8684 Fix Maven version range for MNG-5965
add e8302f3 Add missing depenencies for MNG-3372 + MNG-6555
add 4894603 [MNG-6522] Prepare to run ITs tests with Java 12-ea
add 733a3cc [MNG-6522] Fix typos
add 09e395a [MNG-6522] Prepare to run ITs tests with Java 13-ea
new dcbddc2 [MNG-6562] fixed issues caused by new WARNING on default plugins
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 (0ba16c2)
\
N -- N -- N refs/heads/MNG-6562 (dcbddc2)
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 1 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:
.../org/apache/maven/it/IntegrationTestSuite.java | 1 +
...enITmng5965ParallelBuildMultipliesWorkTest.java | 2 +-
...nITmng6256SpecialCharsAlternatePOMLocation.java | 92 ++++++++++++++++++++++
.../src/test/resources/bootstrap/group-7/pom.xml | 25 ++++++
core-it-suite/src/test/resources/mng-1957/pom.xml | 18 +++++
.../folder-with- -space}/pom.xml | 12 +--
.../folder-with-)-closing-bracket}/pom.xml | 12 +--
.../maven-it-plugin-configuration/pom.xml | 4 +
.../plugin/coreit/CustomComponentConfigurator.java | 4 +-
.../maven-it-plugin-no-default-comp/pom.xml | 4 +
.../maven/plugin/coreit/ConcreteComponent.java | 7 +-
.../maven-it-plugin-plexus-lifecycle/pom.xml | 4 +
.../plexuslifecycle/DefaultFakeComponent.java | 5 +-
.../maven-it-plugin-singleton-component/pom.xml | 4 +
.../maven/plugin/coreit/DefaultComponent.java | 7 +-
core-it-support/core-it-wagon/pom.xml | 4 +
.../wagon/providers/coreit/CoreItHttpWagon.java | 4 +-
.../maven/wagon/providers/coreit/CoreItWagon.java | 4 +-
.../providers/ssh/external/ScpExternalWagon.java | 4 +-
core-it-support/maven-it-helper/pom.xml | 2 +-
.../maven/it/AbstractMavenIntegrationTestCase.java | 10 ++-
21 files changed, 189 insertions(+), 40 deletions(-)
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
copy core-it-suite/src/test/resources/{mng-5452-maven-build-timestamp-utc => mng-6256-special-chars-alternate-pom-location/folder-with- -space}/pom.xml (52%)
copy core-it-suite/src/test/resources/{mng-5452-maven-build-timestamp-utc => mng-6256-special-chars-alternate-pom-location/folder-with-)-closing-bracket}/pom.xml (52%)
[maven-integration-testing] 01/01: [MNG-6562] fixed issues caused
by new WARNING on default plugins
Posted by hb...@apache.org.
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 dcbddc2a2de8fff53a19f540c2d844d0b1dbc333
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>