You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/12/26 14:48:14 UTC
[maven-integration-testing] branch MNG-6071 updated (d436e6c ->
d2c36a6)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6071
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
discard d436e6c [MNG-6071] GetResource should return not null for custom pom
add c0ad4eb [MNG-6556] Packaging 'maven-plugin' binding plugin upgrades
add 1dc554e [MNG-4385] Avoid failse positive for unrelated errors
add ef38c8f added some output to investigate unexpected failures
add 3ccccc4 [MNG-6720] MultiThreadedBuilder: wait for parallel running projects when using --fail-fast
add 1d5db0a [MNG-6725] Skip '.mavenrc' via MAVEN_SKIP_RC=1 and '-Dmaven.skip.rc=true' on child ITs (by default on Jenkins CI).
add 65b534a Ensure any forked Maven executions are not spied on by Jenkins
add fee37c6 [MNG-6720] MultiThreadedBuilder: wait for parallel running projects when using --fail-fast
add 12f31a4 Add new bootstrap groups
add a2e1d33 better toc configuration: remove level 1
add fd0183c more links to bootstrap
add 9380423 display verifier.forkMode
add b6b593d [INFRA-18812] Revert unnecessary commits after fixing root cause
add 482756e fixed the IT 4554 as LocalPort is -1 if Jetty connector is not open. Error message in logs: [WARNING] Could not transfer metadata org.apache.maven.its.mng4554/maven-metadata.xml from/to central (http://localhost:-1/repo-1): Connect to localhost:80 [localhost/127.0.0.1, localhost/0:0:0:0:0:0:0:1] failed: Connection refused: connect
add 2e3c13a fixed the IT 4554 as LocalPort is -1 if Jetty connector is not open. Error message in logs: [WARNING] Could not transfer metadata org.apache.maven.its.mng4554/maven-metadata.xml from/to central (http://localhost:-1/repo-1): Connect to localhost:80 [localhost/127.0.0.1, localhost/0:0:0:0:0:0:0:1] failed: Connection refused: connect
add 389b1ec LocalPort is -1 if Jetty connector is not open. Error message in logs: [WARNING] Could not transfer metadata org.apache.maven.its.mng4554/maven-metadata.xml from/to central (http://localhost:-1/repo-1): Connect to localhost:80 [localhost/127.0.0.1, localhost/0:0:0:0:0:0:0:1] failed: Connection refused: connect
add 95fd13d [MNG-6731] Jetty getLocalPort() returns -1 resulting in build failures
add 6e480ac details on expected failure (typically on ASF Jenkins)
add 5f32015 clarify Core ITs vs Core IT Support vs Core ITs Suite
add ee183c7 [MNG-6584] new detailed message
add 9e98d89 [REGRESSION] Maven fails to use <repositories> section from dependency when resolving transitive dependencies in some cases
add 5695f74 [MNG-6759] Fix module name
add c46c871 updated GitHub repository description
new d2c36a6 [MNG-6071] GetResource should return not null for custom pom
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 (d436e6c)
\
N -- N -- N refs/heads/MNG-6071 (d2c36a6)
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:
.asf.yaml | 8 ++
core-it-suite/pom.xml | 35 +----
core-it-suite/src/site/apt/bootstrap.apt.vm | 8 +-
core-it-suite/src/site/apt/index.apt.vm | 36 ++++-
core-it-suite/src/site/site.xml | 2 -
.../test/java/org/apache/maven/it/HttpServer.java | 13 +-
.../org/apache/maven/it/IntegrationTestSuite.java | 5 +
.../it/MavenIT0146InstallerSnapshotNaming.java | 39 +++--
.../MavenITmng0553SettingsAuthzEncryptionTest.java | 60 ++++----
.../maven/it/MavenITmng0768OfflineModeTest.java | 36 +++--
.../it/MavenITmng2305MultipleProxiesTest.java | 57 +++++---
.../maven/it/MavenITmng2387InactiveProxyTest.java | 42 +++---
.../it/MavenITmng2576MakeLikeReactorTest.java | 2 +-
...41PluginMetadataResolutionErrorMessageTest.java | 6 +-
.../MavenITmng3415JunkRepositoryMetadataTest.java | 34 +++--
.../maven/it/MavenITmng3461MirrorMatchingTest.java | 35 +++--
...MavenITmng3599useHttpProxyForWebDAVMk2Test.java | 31 ++--
.../MavenITmng3599useHttpProxyForWebDAVTest.java | 32 +++--
.../it/MavenITmng3652UserAgentHeaderTest.java | 66 +++++----
.../MavenITmng3953AuthenticatedDeploymentTest.java | 69 ++++-----
.../it/MavenITmng4068AuthenticatedMirrorTest.java | 57 ++++----
...enITmng4235HttpAuthDeploymentChecksumsTest.java | 95 +++++++------
...4326LocalSnapshotSuppressesRemoteCheckTest.java | 32 +++--
...venITmng4343MissingReleaseUpdatePolicyTest.java | 59 +++++---
...ITmng4348NoUnnecessaryRepositoryAccessTest.java | 35 ++---
.../maven/it/MavenITmng4360WebDavSupportTest.java | 35 ++---
...LifecycleMappingFromExtensionInReactorTest.java | 4 +
...avenITmng4413MirroringOfDependencyRepoTest.java | 48 ++++---
.../it/MavenITmng4428FollowHttpRedirectTest.java | 66 +++++----
...469AuthenticatedDeploymentToCustomRepoTest.java | 70 ++++-----
...Tmng4470AuthenticatedDeploymentToProxyTest.java | 90 ++++++------
...MavenITmng4489MirroringOfExtensionRepoTest.java | 48 ++++---
...Tmng4500NoUpdateOfTimestampedSnapshotsTest.java | 38 ++---
...avenITmng4554PluginPrefixMappingUpdateTest.java | 64 ++++++---
...nITmng4555MetaversionResolutionOfflineTest.java | 31 ++--
.../MavenITmng4561MirroringOfPluginRepoTest.java | 48 ++++---
...729MirrorProxyAuthUsedByProjectBuilderTest.java | 48 ++++---
...refixResolutionDoesntTouchDisabledRepoTest.java | 43 +++---
...rsionResolutionDoesntTouchDisabledRepoTest.java | 36 ++---
...nITmng4781DeploymentToNexusStagingRepoTest.java | 65 ++++-----
.../maven/it/MavenITmng4991NonProxyHostsTest.java | 36 +++--
.../MavenITmng5064SuppressSnapshotUpdatesTest.java | 36 ++---
.../maven/it/MavenITmng5175WagonHttpTest.java | 39 ++---
.../MavenITmng5230MakeReactorWithExcludesTest.java | 2 +-
...g5280SettingsProfilesRepositoriesOrderTest.java | 63 +++++----
.../maven/it/MavenITmng6720FailFastTest.java | 77 ++++++++++
...ng6759TransitiveDependencyRepositoriesTest.java | 64 +++++++++
.../src/test/java/org/mortbay/log/StdErrLog.java | 157 ---------------------
.../c/1.0/c-1.0.pom => bootstrap/group-10/pom.xml} | 92 ++++++------
.../src/test/resources/bootstrap/group-8/pom.xml | 10 ++
.../c/1.0/c-1.0.pom => bootstrap/group-9/pom.xml} | 92 ++++++------
core-it-suite/src/test/resources/bootstrap/pom.xml | 2 +
.../0.1/maven-it-plugin-b-0.1.pom | 2 +-
.../extension-plugin/pom.xml | 6 +
.../sessionscope/plugin/TestSessionScopeMojo.java | 8 +-
.../mng-5530-mojo-execution-scope/plugin/pom.xml | 6 +
.../mojoexecutionscope/TestExecutionScopeMojo.java | 8 +-
.../extension-plugin/pom.xml | 6 +
.../sessionscope/plugin/TestSessionScopeMojo.java | 8 +-
.../mng-5578-session-scope/plugin/pom.xml | 6 +
.../mng5530/sessionscope/TestSessionScopeMojo.java | 8 +-
.../plugin/pom.xml | 6 +
.../plugin/BuildExtensionClassloaderMojo.java | 11 +-
.../plugin/pom.xml | 6 +
.../apache/maven/its/mng5753/plugin/TestMojo.java | 12 +-
.../plugin/pom.xml | 6 +
.../apache/maven/its/mng5783/plugin/TestMojo.java | 14 +-
.../module-1/pom.xml | 13 +-
.../module-1/src/test/java/Module1Test.java | 12 ++
.../module-2/pom.xml | 14 +-
.../module-2/src/test/java/Module2Test.java | 11 ++
.../module-3/pom.xml | 17 ++-
.../module-3/src/test/java/Module3Test.java | 10 ++
.../project => mng-6720-fail-fast}/pom.xml | 14 +-
.../dependency-in-custom-repo/pom.xml | 19 +++
.../module1/pom.xml | 18 +++
.../module2/pom.xml | 25 ++++
.../pom.xml | 32 +++++
.../maven-it-plugin-packaging/pom.xml | 2 +-
.../pom.xml | 19 ++-
.../apache/maven/its/mng6759}/plugin/TestMojo.java | 54 ++++---
core-it-support/core-it-plugins/pom.xml | 1 +
core-it-support/pom.xml | 9 +-
pom.xml | 7 +-
src/site/apt/index.apt | 21 +--
src/site/site.xml | 1 +
86 files changed, 1574 insertions(+), 1136 deletions(-)
create mode 100644 .asf.yaml
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
delete mode 100644 core-it-suite/src/test/java/org/mortbay/log/StdErrLog.java
copy core-it-suite/src/test/resources/{mng-4883/repo/org/apache/maven/its/mng4883/c/1.0/c-1.0.pom => bootstrap/group-10/pom.xml} (68%)
copy core-it-suite/src/test/resources/{mng-4883/repo/org/apache/maven/its/mng4883/c/1.0/c-1.0.pom => bootstrap/group-9/pom.xml} (68%)
copy core-it-suite/src/test/resources/{mng-6352-print-version-aggregator => mng-6720-fail-fast}/module-1/pom.xml (81%)
create mode 100644 core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/src/test/java/Module1Test.java
copy core-it-suite/src/test/resources/{mng-6352-print-version-aggregator => mng-6720-fail-fast}/module-2/pom.xml (81%)
create mode 100644 core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/src/test/java/Module2Test.java
copy core-it-suite/src/test/resources/{mng-6352-print-version => mng-6720-fail-fast}/module-3/pom.xml (80%)
create mode 100644 core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/src/test/java/Module3Test.java
copy core-it-suite/src/test/resources/{mng-6127-plugin-execution-configuration-interference/project => mng-6720-fail-fast}/pom.xml (85%)
create mode 100644 core-it-suite/src/test/resources/mng-6759-transitive-dependency-repositories/dependency-in-custom-repo/pom.xml
create mode 100644 core-it-suite/src/test/resources/mng-6759-transitive-dependency-repositories/module1/pom.xml
create mode 100644 core-it-suite/src/test/resources/mng-6759-transitive-dependency-repositories/module2/pom.xml
create mode 100644 core-it-suite/src/test/resources/mng-6759-transitive-dependency-repositories/pom.xml
copy core-it-support/core-it-plugins/{mng5805-plugin => mng6759-plugin-resolves-project-dependencies}/pom.xml (73%)
copy {core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/java/org/apache/maven/its/mng5753 => core-it-support/core-it-plugins/mng6759-plugin-resolves-project-dependencies/src/main/java/org/apache/maven/its/mng6759}/plugin/TestMojo.java (52%)
[maven-integration-testing] 01/01: [MNG-6071] GetResource should
return not null for custom pom
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6071
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit d2c36a6a42e7e21265458e277805046aad6366f8
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat May 25 23:14:41 2019 +0200
[MNG-6071] GetResource should return not null for custom pom
---
.../org/apache/maven/it/IntegrationTestSuite.java | 1 +
.../it/MavenITmng6071GetResourceWithCustomPom.java | 37 ++++++++++++++++++++
core-it-suite/src/test/resources/mng-6071/pom.xml | 28 +++++++++++++++
.../src/test/java/com/mycompany/app/AppTest.java | 40 ++++++++++++++++++++++
4 files changed, 106 insertions(+)
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 6d61985..882c025 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
@@ -107,6 +107,7 @@ public class IntegrationTestSuite
// -------------------------------------------------------------------------------------------------------------
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
+ suite.addTestSuite( MavenITmng6071GetResourceWithCustomPom.class );
suite.addTestSuite( MavenITmng6759TransitiveDependencyRepositoriesTest.class );
suite.addTestSuite( MavenITmng6720FailFastTest.class );
suite.addTestSuite( MavenITmng6506PackageAnnotationTest.class );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
new file mode 100644
index 0000000..f6c5b3e
--- /dev/null
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
@@ -0,0 +1,37 @@
+package org.apache.maven.it;
+
+import org.apache.maven.it.util.ResourceExtractor;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-6071">MNG-6071</a>:
+ * check that getClass().getResource("/") returns consistent results when Maven is run with <code>-f ./pom.xml</code>.
+ */
+public class MavenITmng6071GetResourceWithCustomPom
+ extends AbstractMavenIntegrationTestCase
+{
+ public MavenITmng6071GetResourceWithCustomPom()
+ {
+ super( "[3.6.2-SNAPSHOT,)" );
+ }
+
+ /**
+ * check when path to POM set by <code>-f ./pom.xml</code>
+ */
+ @Test
+ public void testRunCustomPomWithDot( )
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6071" );
+
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.getCliOptions().add( "-f ./pom.xml" );
+ verifier.setForkJvm( true );
+ verifier.executeGoal( "verify" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+ }
+}
diff --git a/core-it-suite/src/test/resources/mng-6071/pom.xml b/core-it-suite/src/test/resources/mng-6071/pom.xml
new file mode 100644
index 0000000..adc780b
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6071/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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>mng-6071</groupId>
+ <artifactId>mng-6071</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>my-app</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/core-it-suite/src/test/resources/mng-6071/src/test/java/com/mycompany/app/AppTest.java b/core-it-suite/src/test/resources/mng-6071/src/test/java/com/mycompany/app/AppTest.java
new file mode 100644
index 0000000..8e62a78
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6071/src/test/java/com/mycompany/app/AppTest.java
@@ -0,0 +1,40 @@
+package com.mycompany.app;
+
+/*
+ * 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.
+ */
+
+import org.junit.Test;
+
+import java.net.URL;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+{
+ @Test
+ public void shouldAnswerWithTrue()
+ {
+ URL resource = getClass().getResource( "/" );
+ System.out.println( resource );
+ assertNotNull( resource );
+ }
+}