This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNG-6164 in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 0db185b [MNG-6164] Collections inconsistently immutable add fef1462 [MNG-6362] - Adding CONTRIBUTING, README.md pull_request_template for GitHub. add 0dbdda8 Add .factorypath from m2e to .gitignore add ef41c0e updated model version to latest 1.1.0 add 9c118d3 [MNG-6363] - Remove secret thread configuration property from code add 97e8a2b because it is so more convenient to have this quick guide here when you are using a console to build maven and do not want to open some web link add 5beb347 Fix missing/improper use of @link add 8e0efaa [MNG-6386] ${project.baseUri} is not a valid URI (according to RFC 3986) add 9abfc88 [MNG-5756] Java home output in mvn -v is misleading add 14365ba [MNG-6403] Artifact#VERSION_FILE_PATTERN does not escape period between date and time add 9021d66 Move ArtifactUtilsTest and friends from maven-compat to maven-artifact add 3c3a590 [MNG-6382][MNG-6372] upgraded Jansi to 1.17.1 add 454a4e7 [MNG-6411] Improve readability of project list returned when --resume-from option value is invalid add 39fdaad added "Run ITs" prefix to IT stage names add 864d180 [MNG-6410] Add groupId to --resume-from suggestion if artifactId is not unique in reactor add 7fde626 simplified Jenkinsfile: avoid copy/paste add 6cb5db1 magnify a bit this line :-) add f1ed22d Build core with JDK8 due to 'Received fatal alert: protocol_version' when downloading https://www.apache.org/licenses/LICENSE-2.0.txt add 5f8ee6d [MNG-6423] Upgrade to Wagon 3.1.0 add 3af07f8 [MNG-6364] run Core ITs also with Java 9 add 29e9b50 [MNG-6344] Upgrade Guice to 4.2.0 add 5b4e173 [MNG-5940] Change the maven-source-plugin jar goal into jar-no-fork in Maven Super POM add 1edded0 [maven-release-plugin] prepare release maven-3.5.4 add 1efd571 [maven-release-plugin] prepare for next development iteration add bf0bd63 Master is now on 3.6.0-SNAPSHOT add 5f526ab [INFRA-16467] move components documentation out of CMS space add a2b800d update doap add 3d3c068 [MNG-6424] - Upgrade plexus-interpolation to 1.25 add 5514aa7 Set https.protocols when running with JDK 7 add a97b03a Set https.protocols when running with JDK 7 add 0e1cc11 Set https.protocols when running with JDK 7 add 870d696 Set https.protocols when running with JDK 7 add 6f41a82 reorganised dependency graph: group consumer vs build modules add 72dca39 Replace org.apache.commons.lang3.Validate#notNull with java.util.Objects#requireNonNull add 768e01c [MNGSITE-339] Broken link: Mailing lists add 2ac9c4a minor grammar fixes add e56fe97 [MNG-6449] - Upgrade parent to 32 add 396f49d [MGN-6383] - ProjectBuilder unnecessarily rebuilds modules with ci-friendly versions o Thanks to Christoph Kunze for offering the fix. add f567471 improved documentation add 1f83d50 fixed typo + little javadoc improvements add d0f1efa fixed dependency schema: model-builder depends on artifact add f87ba98 [MNG-6467] - Remove plugin definition from pom file which is inherited add 0627522 Update Jenkins build to use Maven 3.5.4 (#179) add e0db90a [MNG-6473] Update Mockito to 2.21.0 (#181) add 01f098e [MNG-6475] Remove unused Guava dependencies add 8bc3c20 [MNG-6311] Implement class-level ModelCache in DefaultProjectBuilder to solve slow pom resolutions add 10388b3 [MNG-6478] upgraded parent to 33 for sha512 checksum on release add ce6cc5d [MNG-6414] Add more Apache license header patterns to skip downloading Apache license add 2e8e09f [MNG-5951] add an option to avoid path addition to inherited URLs add 532eb24 [MNG-6358] indented code for better understanding add ed8bc6b [MNG-6358] improved licenses sources for inclusion add 91fa89e [MNG-6479] Upgrade XMLUnit to 2.2.1 (#183) add c3dfa0f [MNG-6480] get non-Apache license from local resource add 421164e Excluded the license files cause they do not contain a license of themselfs. add 7c1e712 [MNG-6415] Project Artifacts Cache does not retain the order of classpath entries. new 186cee3 [MNG-6164] Collections inconsistently immutable 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 (0db185b) \ N -- N -- N refs/heads/MNG-6164 (186cee3) 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: .github/pull_request_template.md | 30 ++ CONTRIBUTING.md | 92 +++++ Jenkinsfile | 139 +++----- README.md | 93 ++++- apache-maven/pom.xml | 34 +- .../main/appended-resources/META-INF/LICENSE.vm | 63 ++-- .../main/appended-resources/licenses/CDDL-1.0.txt | 384 +++++++++++++++++++++ .../main/appended-resources/licenses/EPL-1.0.txt | 210 +++++++++++ .../src/main/appended-resources/licenses/MIT.txt | 14 + doap_Maven.rdf | 15 +- maven-artifact/pom.xml | 2 +- .../java/org/apache/maven/artifact/Artifact.java | 2 +- .../maven/artifact/handler/ArtifactHandler.java | 16 + .../apache/maven/artifact/ArtifactUtilsTest.java | 2 + .../apache/maven/artifact/DefaultArtifactTest.java | 0 .../artifact/handler/ArtifactHandlerMock.java | 0 maven-builder-support/pom.xml | 9 +- .../java/org/apache/maven/building/FileSource.java | 5 +- .../java/org/apache/maven/building/UrlSource.java | 5 +- maven-compat/pom.xml | 2 +- .../AbstractStringBasedModelInterpolator.java | 2 +- maven-core/pom.xml | 6 +- .../repository/LegacyLocalRepositoryManager.java | 4 +- .../metadata/io/DefaultMetadataReader.java | 8 +- .../maven/classrealm/DefaultClassRealmManager.java | 8 +- .../internal/DefaultBeanConfigurator.java | 6 +- .../org/apache/maven/execution/BuildSummary.java | 5 +- .../execution/DefaultMavenExecutionRequest.java | 10 +- .../apache/maven/graph/DefaultGraphBuilder.java | 19 +- .../maven/graph/DefaultProjectDependencyGraph.java | 6 +- .../graph/FilteredProjectDependencyGraph.java | 4 +- .../maven/plugin/DefaultExtensionRealmCache.java | 4 +- .../maven/plugin/DefaultPluginArtifactsCache.java | 5 +- .../maven/plugin/DefaultPluginRealmCache.java | 5 +- .../plugin/internal/DefaultMavenPluginManager.java | 9 +- .../project/DefaultModelBuildingListener.java | 9 +- .../maven/project/DefaultProjectBuilder.java | 21 +- .../project/DefaultProjectBuildingRequest.java | 4 +- .../maven/project/DefaultProjectRealmCache.java | 4 +- .../org/apache/maven/project/MavenProject.java | 6 +- .../apache/maven/project/ReactorModelCache.java | 8 +- .../artifact/DefaultProjectArtifactsCache.java | 10 +- .../toolchain/io/DefaultToolchainsReader.java | 8 +- maven-core/src/site/apt/artifact-handlers.apt | 13 +- maven-core/src/site/apt/index.apt | 2 +- .../apache/maven/project/PomConstructionTest.java | 81 +++-- .../artifact/DefaultProjectArtifactsCacheTest.java | 72 ++++ .../maven/project/harness/PomTestWrapper.java | 6 +- .../pom.xml | 0 maven-embedder/pom.xml | 6 +- .../org/apache/maven/cli/CLIReportingUtils.java | 7 +- .../main/java/org/apache/maven/cli/MavenCli.java | 38 +- .../maven/cli/event/ExecutionEventLogger.java | 4 +- maven-model-builder/pom.xml | 20 +- .../maven/model/building/DefaultModelBuilder.java | 17 +- .../model/building/DefaultModelBuildingResult.java | 8 +- .../building/ModelProblemCollectorRequest.java | 7 +- .../inheritance/DefaultInheritanceAssembler.java | 5 +- .../AbstractStringBasedModelInterpolator.java | 4 +- .../apache/maven/model/io/DefaultModelReader.java | 8 +- .../apache/maven/model/io/DefaultModelWriter.java | 14 +- .../apache/maven/model/merge/MavenModelMerger.java | 12 +- .../resources/org/apache/maven/model/pom-4.0.0.xml | 2 +- .../DefaultInheritanceAssemblerTest.java | 76 ++-- .../activation/AbstractProfileActivatorTest.java | 5 +- ...lat-urls-child.xml => no-append-urls-child.xml} | 0 ...urls-parent.xml => no-append-urls-expected.xml} | 21 +- ...t-urls-parent.xml => no-append-urls-parent.xml} | 11 +- .../inheritance/plugin-configuration-expected.xml | 2 +- maven-model/pom.xml | 6 +- .../org/apache/maven/model/merge/ModelMerger.java | 4 +- maven-model/src/main/mdo/maven.mdo | 100 +++++- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 6 +- .../internal/DefaultArtifactDescriptorReader.java | 15 +- .../internal/DefaultVersionRangeResolver.java | 8 +- .../internal/DefaultVersionResolver.java | 8 +- .../repository/internal/RelocatedArtifact.java | 4 +- maven-settings-builder/pom.xml | 6 +- .../maven/settings/io/DefaultSettingsReader.java | 8 +- .../maven/settings/io/DefaultSettingsWriter.java | 14 +- maven-settings/pom.xml | 2 +- maven-settings/src/main/mdo/settings.mdo | 4 - maven-settings/src/site/apt/index.apt | 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 42 ++- src/site/resources/images/maven-deps.png | Bin 69010 -> 104566 bytes src/site/xdoc/index.xml | 58 ++-- src/site/xdoc/maven-deps.odg | Bin 18600 -> 19887 bytes 90 files changed, 1537 insertions(+), 485 deletions(-) create mode 100644 .github/pull_request_template.md create mode 100644 CONTRIBUTING.md create mode 100644 apache-maven/src/main/appended-resources/licenses/CDDL-1.0.txt create mode 100644 apache-maven/src/main/appended-resources/licenses/EPL-1.0.txt create mode 100644 apache-maven/src/main/appended-resources/licenses/MIT.txt rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java (93%) rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (100%) rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java (100%) create mode 100644 maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java rename maven-core/src/test/resources-project-builder/{baseurl-interpolation => baseuri-interpolation}/pom.xml (100%) copy maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-child.xml => no-append-urls-child.xml} (100%) copy maven-model-builder/src/test/resources/poms/inheritance/{tricky-flat-artifactId-urls-parent.xml => no-append-urls-expected.xml} (78%) copy maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-parent.xml => no-append-urls-parent.xml} (81%)