This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-5227
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 8a6ecb1 [MNG-5227] The 'optional' flag of a dependency should be
manageable
add 8f619ac [MNG-6352] - Printout version information at the end of the
build
add 91d1edf [MNG-6323] Deadlock in multithreaded dependency resolution In
fact it was a very long sleep.....
add 3383c37 [maven-release-plugin] prepare release maven-3.5.3
add 85b4e3d [maven-release-plugin] prepare for next development iteration
add faa9ef0 [MNG-6370] ConcurrencyDependencyGraph#getNumberOfBuilds()
does not remove finished projects from unfinished ones
add b753981 update DOAP
add 197b4be removed configuration inherited from parent and more
up-to-date
add b04ad69 [MNG-6377] switch from Git-WIP to GitBox
add af49a31 [MNG-6377] switch from Git-WIP to Gitbox
add 2dbc644 [MNG-6377] switch from Git-WIP to Gitbox
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.
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
new 787cbb6 [MNG-5227] The 'optional' flag of a dependency should be
manageable
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 (8a6ecb1)
\
N -- N -- N refs/heads/MNG-5227 (787cbb6)
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 | 141 +++-----
NOTICE | 2 +-
README.md | 95 ++++-
apache-maven/README.txt | 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 | 49 ++-
maven-artifact/pom.xml | 2 +-
.../java/org/apache/maven/artifact/Artifact.java | 2 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 2 +-
.../maven/artifact/handler/ArtifactHandler.java | 16 +
.../maven/artifact/versioning/VersionRange.java | 2 +-
.../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 +-
.../repository/DefaultArtifactRepository.java | 2 +-
.../java/org/apache/maven/project/ModelUtils.java | 6 +-
.../AbstractStringBasedModelInterpolator.java | 2 +-
.../maven/repository/MetadataResolutionResult.java | 27 +-
.../repository/legacy/LegacyRepositorySystem.java | 4 +-
.../metadata/DefaultClasspathTransformation.java | 2 +-
maven-core/pom.xml | 6 +-
.../repository/LegacyLocalRepositoryManager.java | 4 +-
.../repository/MavenArtifactRepository.java | 4 +-
.../metadata/io/DefaultMetadataReader.java | 8 +-
.../resolver/ArtifactResolutionResult.java | 27 +-
.../maven/artifact/resolver/ResolutionNode.java | 1 +
.../maven/classrealm/DefaultClassRealmManager.java | 8 +-
.../internal/DefaultBeanConfigurator.java | 6 +-
.../apache/maven/exception/ExceptionSummary.java | 5 +-
.../org/apache/maven/execution/BuildSummary.java | 5 +-
.../execution/DefaultMavenExecutionRequest.java | 10 +-
.../execution/DefaultMavenExecutionResult.java | 6 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 19 +-
.../maven/graph/DefaultProjectDependencyGraph.java | 6 +-
.../graph/FilteredProjectDependencyGraph.java | 4 +-
.../maven/lifecycle/internal/MojoExecutor.java | 18 +-
.../multithreaded/ConcurrencyDependencyGraph.java | 6 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 4 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 5 +-
.../maven/plugin/DefaultPluginRealmCache.java | 5 +-
.../plugin/PluginParameterExpressionEvaluator.java | 4 +-
.../plugin/internal/DefaultMavenPluginManager.java | 11 +-
.../plugin/prefix/DefaultPluginPrefixRequest.java | 4 +-
.../version/DefaultPluginVersionRequest.java | 2 +-
.../project/DefaultDependencyResolutionResult.java | 5 +-
.../project/DefaultModelBuildingListener.java | 9 +-
.../maven/project/DefaultProjectBuilder.java | 22 +-
.../project/DefaultProjectBuildingRequest.java | 4 +-
.../maven/project/DefaultProjectRealmCache.java | 8 +-
.../org/apache/maven/project/MavenProject.java | 25 +-
.../apache/maven/project/ProjectModelResolver.java | 5 +-
.../apache/maven/project/ReactorModelCache.java | 8 +-
.../artifact/DefaultProjectArtifactsCache.java | 10 +-
.../maven/project/artifact/ProjectArtifact.java | 7 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 2 +-
.../toolchain/io/DefaultToolchainsReader.java | 8 +-
maven-core/src/site/apt/artifact-handlers.apt | 13 +-
maven-core/src/site/apt/index.apt | 2 +-
.../ConcurrencyDependencyGraphTest.java | 83 +++++
.../lifecycle/internal/stub/MojoExecutorStub.java | 5 +-
.../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 +-
.../java/org/apache/maven/cli/CleanArgument.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 46 ++-
.../maven/cli/event/ExecutionEventLogger.java | 47 ++-
maven-model-builder/pom.xml | 20 +-
.../maven/model/building/DefaultModelBuilder.java | 17 +-
.../model/building/DefaultModelBuildingResult.java | 8 +-
.../model/building/ModelBuildingException.java | 2 +-
.../building/ModelProblemCollectorRequest.java | 7 +-
.../inheritance/DefaultInheritanceAssembler.java | 5 +-
.../AbstractStringBasedModelInterpolator.java | 4 +-
.../model/interpolation/ModelInterpolator.java | 2 +-
.../StringSearchModelInterpolator.java | 3 +-
.../apache/maven/model/io/DefaultModelReader.java | 8 +-
.../apache/maven/model/io/DefaultModelWriter.java | 14 +-
.../apache/maven/model/merge/MavenModelMerger.java | 44 ++-
.../model/validation/DefaultModelValidator.java | 22 +-
.../resources/org/apache/maven/model/pom-4.0.0.xml | 2 +-
maven-model-builder/src/site/apt/index.apt | 8 +
.../DefaultInheritanceAssemblerTest.java | 96 +++---
.../activation/AbstractProfileActivatorTest.java | 5 +-
.../validation/DefaultModelValidatorTest.java | 7 +
...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 +-
.../raw-model/self-referencing-classifier.xml | 28 +-
maven-model/pom.xml | 6 +-
.../org/apache/maven/model/merge/ModelMerger.java | 85 ++++-
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 | 15 +-
.../internal/DefaultArtifactDescriptorReader.java | 39 +--
.../repository/internal/DefaultModelResolver.java | 4 +-
.../internal/DefaultVersionRangeResolver.java | 30 +-
.../internal/DefaultVersionResolver.java | 30 +-
.../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 | 6 +-
maven-settings/src/site/apt/index.apt | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 50 ++-
src/site/resources/images/maven-deps.png | Bin 69010 -> 104566 bytes
src/site/site.xml | 9 -
src/site/xdoc/index.xml | 58 ++--
src/site/xdoc/maven-deps.odg | Bin 18600 -> 19887 bytes
132 files changed, 2120 insertions(+), 747 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/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java
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/{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-embedder/src/examples/simple-project/pom.xml =>
maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml
(63%)
