This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MNG-6069
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard f44a585 [MNG-6069] Migrate to non deprecated parts of Commons CLI
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 d2c921f [MNG-6069] Migrate to non deprecated parts of Commons CLI
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 (f44a585)
\
N -- N -- N refs/heads/MNG-6069 (d2c921f)
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 | 4 +-
apache-maven/pom.xml | 27 ++
.../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 +
maven-core/pom.xml | 4 -
.../maven/project/DefaultProjectBuilder.java | 21 +-
.../apache/maven/project/ReactorModelCache.java | 8 +-
.../artifact/DefaultProjectArtifactsCache.java | 5 +-
.../artifact/DefaultProjectArtifactsCacheTest.java | 72 ++++
maven-embedder/pom.xml | 4 -
maven-model-builder/pom.xml | 14 +-
.../inheritance/DefaultInheritanceAssembler.java | 5 +-
.../apache/maven/model/merge/MavenModelMerger.java | 12 +-
.../DefaultInheritanceAssemblerTest.java | 76 ++--
...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/src/main/mdo/maven.mdo | 100 +++++-
pom.xml | 30 +-
22 files changed, 959 insertions(+), 128 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
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%)
