This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-6401-2
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard a9b8387 [MNG-6401] Proxy.active & port to String to support
interpolation
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.
add ca45efd [MNG-6486] Upgrade to Wagon 3.2.0
add 2786490 Fixed typo in exception logging LegacyRepositorySystem
add 44826ab [MNG-6164] Collections inconsistently immutable
add 0345cd1 [MNG-6489] Upgrade Maven Resolver to 1.3.0
add 13a0a5f [MNG-6491] upgraded commons-lang3 to fix tests failure with
JDK 10/11
add 6e619a1 [MNG-6496] Upgrade Maven Resolver to 1.3.1
add 42c77a7 Repair Jenkins job - add a full path to workspace when run on
Windows
add 23f5c88 [MNG-6391] - Printout version of last built module in reactor
build
add e4b53d3 [MNG-6490] Maven shall not fail reporting circular dependency
when the dependency is a classified secondary artifact
add ba74b96 [MNG-6492] - Minor improvement on Array construction,
conversion performance
add 6688d76 [MNG-6497] - Upgrade guava / guice
add 97c98ec [maven-release-plugin] prepare release maven-3.6.0
add 6e376d4 [maven-release-plugin] prepare for next development iteration
add b5014bf removed extra # in generated content
add 0ee5dfb Updated DOAP for Maven Core Release 3.6.0
add 114a0e9 Updated Quick Build information.
add db462ae [MNG-6059] renamed attributes to get more flexibility for scm
urls
add f97316c [MNG-6505] inherit child.x.y.inherit.append.path values
add 07bd550 [MNG-6505] tweaked distributionManagement.site inheritance
add 78f605e [MNG-6515] Fix Javadoc build errors
add f92bd9e [MNG-6481] Run Maven Core Integration Tests with Java 7, 8
and 11
add 86d4a91 [MNGSITE-357] README.md: Maven user list link not working
add 9f07b03 [MNG-6261] - using File apis to compare
add e4e33f7 [MNG-6261] Relative parent POM resolution failing in 3.5.0
with complex multimodule builds
add 732e7de [MNG-6529] ProjectBuilder.build(List<Project> ...) honor
request.isResolveDependency
add c6bdafe [MNG-5965] Parallel build multiplies work if multiple goals
are given
add 6c4c2e3 Change to keep only 5 artifacts on master and on branches
only 1 artifact.
add c7ab987 [MNG-6544] Replace CacheUtils#{eq,hash} with Objects
add 71128cb spelling: vertices
add 9c94626 [MNG-6213] Validate scope in dependencyManagement
new 0fb40ce [MNG-6401] Proxy.active & port to String to support
interpolation
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 (a9b8387)
\
N -- N -- N refs/heads/MNG-6401-2 (0fb40ce)
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:
Jenkinsfile | 12 +-
README.md | 4 +-
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 | 11 +
maven-artifact/pom.xml | 2 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 2 +-
.../maven/artifact/handler/ArtifactHandler.java | 16 +
.../maven/artifact/versioning/VersionRange.java | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
.../repository/DefaultArtifactRepository.java | 2 +-
.../java/org/apache/maven/project/ModelUtils.java | 6 +-
.../maven/repository/MetadataResolutionResult.java | 27 +-
.../repository/legacy/LegacyRepositorySystem.java | 4 +-
.../metadata/DefaultClasspathTransformation.java | 2 +-
maven-core/pom.xml | 6 +-
.../repository/MavenArtifactRepository.java | 4 +-
.../resolver/ArtifactResolutionResult.java | 27 +-
.../maven/artifact/resolver/ResolutionNode.java | 1 +
.../apache/maven/exception/ExceptionSummary.java | 5 +-
.../execution/DefaultMavenExecutionResult.java | 6 +-
.../maven/lifecycle/internal/MojoExecutor.java | 18 +-
.../multithreaded/ConcurrencyDependencyGraph.java | 9 +-
.../multithreaded/MultiThreadedBuilder.java | 10 +-
.../java/org/apache/maven/plugin/CacheUtils.java | 53 +--
.../plugin/PluginParameterExpressionEvaluator.java | 4 +-
.../plugin/internal/DefaultMavenPluginManager.java | 2 +-
.../plugin/prefix/DefaultPluginPrefixRequest.java | 4 +-
.../version/DefaultPluginVersionRequest.java | 2 +-
.../project/DefaultDependencyResolutionResult.java | 5 +-
.../maven/project/DefaultProjectBuilder.java | 37 +-
.../maven/project/DefaultProjectRealmCache.java | 4 +-
.../org/apache/maven/project/MavenProject.java | 19 +-
.../apache/maven/project/ProjectModelResolver.java | 5 +-
.../org/apache/maven/project/ProjectSorter.java | 2 +-
.../apache/maven/project/ReactorModelCache.java | 8 +-
.../artifact/DefaultProjectArtifactsCache.java | 5 +-
.../maven/project/artifact/ProjectArtifact.java | 7 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 2 +-
maven-core/src/site/apt/artifact-handlers.apt | 13 +-
maven-core/src/site/apt/index.apt | 2 +-
.../internal/ConcurrencyDependencyGraphTest.java | 2 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 5 +-
.../apache/maven/project/ProjectBuilderTest.java | 42 +++
.../artifact/DefaultProjectArtifactsCacheTest.java | 72 ++++
.../projects/basic-resolveDependencies.xml | 15 +
maven-embedder/pom.xml | 6 +-
.../java/org/apache/maven/cli/CleanArgument.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 8 +-
.../maven/cli/event/ExecutionEventLogger.java | 38 +-
maven-model-builder/pom.xml | 16 +-
.../maven/model/building/DefaultModelBuilder.java | 11 +-
.../maven/model/building/FileModelSource.java | 23 ++
.../model/building/ModelBuildingException.java | 2 +-
.../inheritance/DefaultInheritanceAssembler.java | 5 +-
.../model/interpolation/ModelInterpolator.java | 2 +-
.../StringSearchModelInterpolator.java | 3 +-
.../apache/maven/model/merge/MavenModelMerger.java | 44 ++-
.../model/validation/DefaultModelValidator.java | 32 +-
maven-model-builder/src/site/apt/index.apt | 8 +
.../maven/model/building/FileModelSourceTest.java | 75 ++++
.../DefaultInheritanceAssemblerTest.java | 96 +++---
.../validation/DefaultModelValidatorTest.java | 17 +
...lat-urls-child.xml => no-append-urls-child.xml} | 0
...urls-parent.xml => no-append-urls-expected.xml} | 30 +-
...t-urls-parent.xml => no-append-urls-parent.xml} | 13 +-
...at-urls-child.xml => no-append-urls2-child.xml} | 9 +
...s-expected.xml => no-append-urls2-expected.xml} | 20 +-
...{urls-parent.xml => no-append-urls2-parent.xml} | 18 +-
...at-urls-child.xml => no-append-urls3-child.xml} | 7 +
...rls-parent.xml => no-append-urls3-expected.xml} | 29 +-
...{urls-parent.xml => no-append-urls3-parent.xml} | 18 +-
.../inheritance/plugin-configuration-expected.xml | 2 +-
...ier.xml => bad-dependency-management-scope.xml} | 38 +-
.../raw-model/self-referencing-classifier.xml | 28 +-
maven-model/pom.xml | 2 +-
.../org/apache/maven/model/merge/ModelMerger.java | 81 +++++
maven-model/src/main/mdo/maven.mdo | 171 ++++++++-
maven-plugin-api/pom.xml | 2 +-
.../java/org/apache/maven/plugin/AbstractMojo.java | 5 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 11 +-
.../internal/DefaultArtifactDescriptorReader.java | 24 +-
.../repository/internal/DefaultModelResolver.java | 4 +-
.../internal/DefaultVersionRangeResolver.java | 22 +-
.../internal/DefaultVersionResolver.java | 22 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-settings/src/main/mdo/settings.mdo | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 41 ++-
src/site/resources/images/maven-deps.png | Bin 98224 -> 104566 bytes
src/site/xdoc/index.xml | 32 +-
src/site/xdoc/maven-deps.odg | Bin 19695 -> 19887 bytes
98 files changed, 1764 insertions(+), 458 deletions(-)
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
create mode 100644
maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java
create mode 100644
maven-core/src/test/resources/projects/basic-resolveDependencies.xml
create mode 100644
maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
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/{urls-parent.xml
=> no-append-urls-expected.xml} (65%)
copy
maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-parent.xml
=> no-append-urls-parent.xml} (74%)
copy
maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-child.xml =>
no-append-urls2-child.xml} (77%)
copy
maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-expected.xml
=> no-append-urls2-expected.xml} (69%)
copy maven-model-builder/src/test/resources/poms/inheritance/{urls-parent.xml
=> no-append-urls2-parent.xml} (76%)
copy
maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-child.xml =>
no-append-urls3-child.xml} (81%)
copy
maven-model-builder/src/test/resources/poms/inheritance/{tricky-flat-artifactId-urls-parent.xml
=> no-append-urls3-expected.xml} (72%)
copy maven-model-builder/src/test/resources/poms/inheritance/{urls-parent.xml
=> no-append-urls3-parent.xml} (76%)
copy
maven-model-builder/src/test/resources/poms/validation/{bad-import-scope-classifier.xml
=> bad-dependency-management-scope.xml} (53%)
copy maven-embedder/src/examples/simple-project/pom.xml =>
maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml
(63%)
