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:47:01 UTC
[maven-integration-testing] branch MNG-5693 updated (8b5dc21 ->
99b66de)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-5693
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
omit 8b5dc21 [MNG-5693] Remove check for link to cwiki
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
add 2a0f3c1 [MNG-6558] - ToolchainsBuildingResult event is not sent on EventSpy
add 8a4b717 Add new bootstrap group
add 24a0aca Document MNG-6613
add c81b582 [MNG-6506] Add regression test for annotations processing Java Java 9+
add 62c8e7a [MNG-6255] Maven script cannot parse jvm.config with CRLF
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 99b66de [MNG-5693] Remove check for link to cwiki
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 (8b5dc21)
\
N -- N -- N refs/heads/MNG-5693 (99b66de)
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 | 10 ++
.../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 +++++----
...enITmng5965ParallelBuildMultipliesWorkTest.java | 2 +-
.../maven/it/MavenITmng6255FixConcatLines.java | 104 ++++++++++++++
...nITmng6256SpecialCharsAlternatePOMLocation.java | 92 ++++++++++++
...va => MavenITmng6506PackageAnnotationTest.java} | 24 ++--
...MavenITmng6558ToolchainsBuildingEventTest.java} | 29 ++--
.../maven/it/MavenITmng6720FailFastTest.java | 77 ++++++++++
...ng6759TransitiveDependencyRepositoriesTest.java | 64 +++++++++
.../src/test/java/org/mortbay/log/StdErrLog.java | 157 ---------------------
.../b/1.0/b-1.0.pom => bootstrap/group-10/pom.xml} | 92 ++++++------
.../src/test/resources/bootstrap/group-7/pom.xml | 25 ++++
.../src/test/resources/bootstrap/group-8/pom.xml | 108 ++++++++++++++
.../b/1.0/b-1.0.pom => bootstrap/group-9/pom.xml} | 92 ++++++------
core-it-suite/src/test/resources/bootstrap/pom.xml | 3 +
.../0.1/maven-it-plugin-b-0.1.pom | 2 +-
core-it-suite/src/test/resources/mng-1957/pom.xml | 18 +++
.../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 +-
.../WEB-INF/web.xml => mng-6255/.mvn/jvm.config} | 0
.../{mng-5889-find.mvn => mng-6255}/pom.xml | 8 +-
.../folder-with- -space}/pom.xml | 12 +-
.../folder-with-)-closing-bracket}/pom.xml | 12 +-
.../mng-6506-package-annotation/plugin}/pom.xml | 28 ++--
.../src/main/java/testmojo/TestAnnotation.java | 15 +-
.../plugin/src/main/java/testmojo/TestMojo.java} | 26 ++--
.../src/main/java/testmojo/package-info.java | 11 +-
.../project}/pom.xml | 19 ++-
.../test/resources/{mng-4936 => mng-6558}/pom.xml | 6 +-
.../resources/{mng-4936 => mng-6558}/spy-0.1.jar | Bin
.../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/maven-it-helper/pom.xml | 2 +-
.../maven/it/AbstractMavenIntegrationTestCase.java | 10 +-
core-it-support/pom.xml | 9 +-
pom.xml | 7 +-
src/site/apt/index.apt | 21 +--
src/site/site.xml | 1 +
106 files changed, 1999 insertions(+), 1258 deletions(-)
create mode 100644 .asf.yaml
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
copy core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng5742BuildExtensionClassloaderTest.java => MavenITmng6506PackageAnnotationTest.java} (67%)
copy core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng4936EventSpyTest.java => MavenITmng6558ToolchainsBuildingEventTest.java} (63%)
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/b/1.0/b-1.0.pom => bootstrap/group-10/pom.xml} (68%)
create mode 100644 core-it-suite/src/test/resources/bootstrap/group-8/pom.xml
copy core-it-suite/src/test/resources/{mng-4883/repo/org/apache/maven/its/mng4883/b/1.0/b-1.0.pom => bootstrap/group-9/pom.xml} (68%)
copy core-it-suite/src/test/resources/{mng-5898/servlets/servlet/src/main/webapp/WEB-INF/web.xml => mng-6255/.mvn/jvm.config} (100%)
copy core-it-suite/src/test/resources/{mng-5889-find.mvn => mng-6255}/pom.xml (86%)
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%)
copy {core-it-support/core-it-plugins/maven-it-plugin-toolchain => core-it-suite/src/test/resources/mng-6506-package-annotation/plugin}/pom.xml (74%)
copy core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java => core-it-suite/src/test/resources/mng-6506-package-annotation/plugin/src/main/java/testmojo/TestAnnotation.java (82%)
copy core-it-suite/src/test/resources/{mng-5578-session-scope/extension-plugin/src/main/java/org/apache/maven/its/mng5530/sessionscope/plugin/TestSessionScopeMojo.java => mng-6506-package-annotation/plugin/src/main/java/testmojo/TestMojo.java} (66%)
copy core-it-support/core-it-plugins/mng5805-plugin-dep/src/main/java/org/apache/maven/its/mng5805/TestClass1.java => core-it-suite/src/test/resources/mng-6506-package-annotation/plugin/src/main/java/testmojo/package-info.java (89%)
copy core-it-suite/src/test/resources/{mng-4091/invalid => mng-6506-package-annotation/project}/pom.xml (72%)
copy core-it-suite/src/test/resources/{mng-4936 => mng-6558}/pom.xml (82%)
copy core-it-suite/src/test/resources/{mng-4936 => mng-6558}/spy-0.1.jar (100%)
copy core-it-suite/src/test/resources/{mng-6391-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-5693] Remove check for link
to cwiki
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-5693
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 99b66def726fc5ac9cbbd72748c6be4764832552
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Dec 30 11:42:08 2018 +0100
[MNG-5693] Remove check for link to cwiki
---
.../org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
index b7167b4..d0acdaf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
@@ -90,7 +90,16 @@ public class MavenITmng5482AetherNotFoundTest
assertTrue( "ClassNotFoundException message was not found in output.", msg >= 0 );
int url = indexOf( lines, ".*http://cwiki.apache.org/confluence/display/MAVEN/AetherClassNotFound.*" );
- assertTrue( "Url to ClassNotFoundAether was not found in output.", url >= 0 );
+
+ boolean versionWithMng5693 = matchesVersionRange( "[3.6.1,)"); // no more link to cwiki
+ if ( versionWithMng5693 )
+ {
+ assertFalse( "Url to ClassNotFoundAether was found in output.", url >= 0 );
+ }
+ else
+ {
+ assertTrue( "Url to ClassNotFoundAether was not found in output.", url >= 0 );
+ }
}
private int indexOf( List<String> logLines, String regex )