This is an automated email from the ASF dual-hosted git repository.
stephenc pushed a change to branch mng-5668-poc
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard f4df738 [MNG-5668] Add error reporting if the user tries to invoke a
dynamic phase directly
discard 7b5e32e [MNG-5668] Fix typo in xsi namespace
discard 14e33be [MNG-5668] Add some tests
discard a3eddec [MNG-5668] Proof of concept implementation of dynamic phases
add fa97042 exclude IDE files that may pollute source archive
add 3a80ae0 [MNG-6799] deprecate StringSearchModelInterpolator and remove
@Named
add bd10f00 [MNG-6789] upgrade and configure plugins for Reproducible
Builds
add 0c7c69f [MNG-6778] - Use https for maven schemaLocations
add d657c9c [MNG-6778] - Use https for maven schemaLocations
add 53ccee3 [MNG-6778] use https for schema location
add 88591a7 [MNG-6584] upgrade Wagon to 3.3.4 to get reason phrase
handling back
add 6fa256d update copyright year
add db3e446 [MNG-6759] - Fix issue where MavenMetadataSource failed to
set the right repositories when preparing artifact metadata
add c82409a [MNG-6759] Maven fails to use <repositories> section from
dependency when resolving transitive dependencies in some cases
add f8bd6d5 [MNG-6771] Fix license issues on binary distribution - Update
slf4j to 1.7.29 - Do not download ASL v2 license files but copy from local -
add Jsoup license - keep a specific copy of MIT license for each dependency -
Add NOTICE to binary distribution - Add Eclipse SISU about.html contents
add cecedd3 [maven-release-plugin] prepare release maven-3.6.3
add ead06d2 [maven-release-plugin] prepare for next development iteration
add 8d221f9 Add Apache Maven 3.6.3
new fcd714d [MNG-5668] Proof of concept implementation of dynamic phases
new 56a8e6e [MNG-5668] Add some tests
new 11748bb [MNG-5668] Fix typo in xsi namespace
new 016a7d6 [MNG-5668] Add error reporting if the user tries to invoke a
dynamic phase directly
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 (f4df738)
\
N -- N -- N refs/heads/mng-5668-poc (016a7d6)
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 4 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:
NOTICE | 2 +-
apache-maven/pom.xml | 12 ++-
.../main/appended-resources/META-INF/LICENSE.vm | 64 +++++++-----
.../src/main/appended-resources/META-INF/NOTICE.vm | 116 +++++++++++++++++++++
.../main/appended-resources/licenses/ASL-2.0.txt | 0
.../licenses/MIT-jsoup-1.12.1.txt | 23 ++++
.../licenses/MIT-slf4j-api-1.7.29.txt | 23 ++++
.../src/main/appended-resources/licenses/MIT.txt | 14 ---
apache-maven/src/main/assembly/component.xml | 7 ++
apache-maven/src/main/assembly/src.xml | 8 ++
doap_Maven.rdf | 9 ++
maven-artifact/pom.xml | 4 +-
maven-builder-support/pom.xml | 4 +-
maven-compat/pom.xml | 4 +-
maven-compat/src/test/resources/pom.xml | 2 +-
maven-core/pom.xml | 4 +-
.../project/artifact/MavenMetadataSource.java | 6 ++
.../org/apache/maven/messages/build.properties | 1 -
.../cyclic-reference/module-a/pom.xml | 2 +-
.../cyclic-reference/module-b/pom.xml | 2 +-
.../default-maven/cyclic-reference/pom.xml | 2 +-
.../lifecycle-executor/mojo-configuration/pom.xml | 2 +-
.../pom.xml | 2 +-
.../project-with-inheritance/pom.xml | 2 +-
.../project-with-multiple-executions/pom.xml | 2 +-
.../project-with-inheritance/pom.xml | 2 +-
.../project-builder/MNG-6716/project/pom.xml | 2 +-
.../remote-repo/org/apache/apache/1/apache-1.pom | 2 +-
.../maven-it-plugin/0.1/maven-it-plugin-0.1.pom | 2 +-
.../maven/its/plugins/maven-it-plugin/0.1/pom.xml | 2 +-
.../0.1/maven-clean-plugin-0.1.pom | 2 +-
.../0.1/maven-compiler-plugin-0.1.pom | 2 +-
.../0.1/maven-deploy-plugin-0.1.pom | 2 +-
.../0.1/maven-install-plugin-0.1.pom | 2 +-
.../maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom | 2 +-
.../0.1/maven-plugin-plugin-0.1.pom | 2 +-
.../0.1/maven-resources-plugin-0.1.pom | 2 +-
.../0.1/maven-surefire-plugin-0.1.pom | 2 +-
.../dependency-inheritance/maven-parent.xml | 2 +-
.../dependency-inheritance/pom.xml | 2 +-
.../dependency-inheritance/sub/pom.xml | 2 +-
.../dependency-order/w-plugin-mgmt/pom.xml | 2 +-
.../dependency-order/wo-plugin-mgmt/pom.xml | 2 +-
.../dual-execution-ids/pom.xml | 2 +-
.../nexus-parent.xml | 2 +-
.../duplicate-exclusions-dependency/pom.xml | 2 +-
.../duplicate-exclusions-dependency/sub/pom.xml | 2 +-
.../equal-plugin-deps/pom.xml | 2 +-
.../execution-configuration-subcollections/pom.xml | 2 +-
.../test/resources-project-builder/foo/sub/pom.xml | 2 +-
.../merged-filter-order/pom.xml | 2 +-
.../merged-filter-order/sub/pom.xml | 2 +-
.../resources-project-builder/micromailer/pom.xml | 2 +-
.../micromailer/spice-parent-9.pom | 2 +-
.../multiple-filters/pom.xml | 2 +-
.../platform-file-separator/pom.xml | 2 +-
.../plugin-config-properties/pom.xml | 2 +-
.../profile-default-deactivation/pom.xml | 2 +-
.../profile-plugins/pom.xml | 2 +-
.../properties-no-duplication/pom.xml | 2 +-
.../properties-no-duplication/sub/pom.xml | 2 +-
.../reporting-plugin-config/pom.xml | 2 +-
.../reporting-plugin-config/sub/pom.xml | 2 +-
.../jetty-parent.xml | 2 +-
.../single-configuration-inheritance/pom.xml | 2 +-
.../resources-project-builder/unc-path/pom.xml | 2 +-
.../resources-project-builder/unc-path/sub/pom.xml | 2 +-
.../child/pom.xml | 2 +-
.../unprefixed-expression-interpolation/pom.xml | 2 +-
.../resources-settings/settings-no-pom/pom.xml | 2 +-
maven-core/src/test/resources/canonical-pom.xml | 2 +-
.../test/resources/dependencyManagement-pom.xml | 2 +-
.../test/resources/distributionManagement-pom.xml | 4 +-
.../junit/junit/3.8.1/junit-3.8.1.pom | 2 +-
.../org/apache/apache/3/apache-3.pom | 2 +-
.../3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom | 2 +-
.../test/test-extension/1/test-extension-1.pom | 2 +-
.../1/test-lifecycle-and-artifactHandler-1.pom | 2 +-
.../apache/maven/maven-parent/4/maven-parent-4.pom | 2 +-
.../apache/maven/maven-parent/5/maven-parent-5.pom | 2 +-
.../wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom | 2 +-
.../plexus-active-collections-1.0-beta-1.pom | 2 +-
.../plexus-classworlds-1.2-alpha-10.pom | 2 +-
.../plexus-component-api-1.0-alpha-32.pom | 2 +-
.../plexus-container-default-1.0-alpha-32.pom | 2 +-
.../plexus-containers-1.0-alpha-16.pom | 2 +-
.../plexus-containers-1.0-alpha-32.pom | 2 +-
.../plexus-utils/1.4.5/plexus-utils-1.4.5.pom | 2 +-
.../plexus/plexus/1.0.10/plexus-1.0.10.pom | 2 +-
.../plexus/plexus/1.0.11/plexus-1.0.11.pom | 2 +-
.../codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom | 2 +-
.../codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom | 2 +-
.../resources/org/apache/maven/lifecycle/pom.xml | 2 +-
maven-core/src/test/resources/pom.xml | 2 +-
.../project-dynamism/plugin-level-dep.pom.xml | 2 +-
.../test/resources/project-dynamism/pom-interp.xml | 2 +-
.../resources/project-dynamism/pom-relative.xml | 2 +-
.../src/test/resources/project-dynamism/pom.xml | 2 +-
.../resources/projects/artifactMissingVersion.xml | 2 +-
maven-core/src/test/resources/projects/badPom.xml | 2 +-
.../projects/modelsource/module01/pom.xml | 2 +-
.../test/resources/projects/modelsource/pom.xml | 2 +-
.../resources/withActiveByDefaultProfile-pom.xml | 2 +-
maven-embedder/pom.xml | 4 +-
maven-embedder/src/examples/simple-project/pom.xml | 2 +-
.../src/test/embedder-test-project/pom.xml | 2 +-
.../ext-realm-error/ext/pom.xml | 2 +-
.../missing-module-pom/pom.xml | 2 +-
.../profile-activator-lookup-err/ext/pom.xml | 2 +-
.../project-mojo-failure/pom.xml | 2 +-
.../project/pom.xml | 2 +-
.../parent/1.0-SNAPSHOT/parent-1.0-SNAPSHOT.pom | 2 +-
.../src/test/projects/optional-dep/pom.xml | 2 +-
maven-embedder/src/test/resources/pom2.xml | 2 +-
maven-model-builder/pom.xml | 4 +-
.../StringSearchModelInterpolator.java | 7 +-
.../StringVisitorModelInterpolator.java | 2 +
.../src/test/resources/poms/factory/complex.xml | 2 +-
.../src/test/resources/poms/factory/simple.xml | 2 +-
.../poms/inheritance/empty-urls-child.xml | 4 +-
.../poms/inheritance/empty-urls-expected.xml | 4 +-
.../poms/inheritance/empty-urls-parent.xml | 4 +-
.../resources/poms/inheritance/flat-urls-child.xml | 4 +-
.../poms/inheritance/flat-urls-expected.xml | 2 +-
.../poms/inheritance/flat-urls-parent.xml | 4 +-
.../module-path-not-artifactId-child.xml | 4 +-
.../module-path-not-artifactId-expected.xml | 2 +-
.../module-path-not-artifactId-parent.xml | 4 +-
.../poms/inheritance/no-append-urls-child.xml | 4 +-
.../poms/inheritance/no-append-urls-expected.xml | 2 +-
.../poms/inheritance/no-append-urls-parent.xml | 4 +-
.../poms/inheritance/no-append-urls2-child.xml | 4 +-
.../poms/inheritance/no-append-urls2-expected.xml | 2 +-
.../poms/inheritance/no-append-urls2-parent.xml | 4 +-
.../poms/inheritance/no-append-urls3-child.xml | 4 +-
.../poms/inheritance/no-append-urls3-expected.xml | 2 +-
.../poms/inheritance/no-append-urls3-parent.xml | 4 +-
.../inheritance/plugin-configuration-child.xml | 4 +-
.../inheritance/plugin-configuration-expected.xml | 2 +-
.../inheritance/plugin-configuration-parent.xml | 4 +-
.../tricky-flat-artifactId-urls-child.xml | 4 +-
.../tricky-flat-artifactId-urls-expected.xml | 2 +-
.../tricky-flat-artifactId-urls-parent.xml | 4 +-
.../tricky-flat-directory-urls-child.xml | 4 +-
.../tricky-flat-directory-urls-expected.xml | 2 +-
.../tricky-flat-directory-urls-parent.xml | 4 +-
.../test/resources/poms/inheritance/urls-child.xml | 4 +-
.../resources/poms/inheritance/urls-expected.xml | 2 +-
.../resources/poms/inheritance/urls-parent.xml | 4 +-
.../raw-model/bad-ci-friendly-sha1plus.xml | 4 +-
.../raw-model/bad-ci-friendly-sha1plus2.xml | 4 +-
.../poms/validation/raw-model/bad-ci-friendly.xml | 4 +-
.../raw-model/bad-parent-version-latest.xml | 4 +-
.../raw-model/bad-parent-version-release.xml | 4 +-
.../missing-artifactId-pluginManagement.xml | 4 +-
.../raw-model/missing-ga-pluginManagement.xml | 4 +-
.../raw-model/missing-groupId-pluginManagement.xml | 4 +-
.../missing-plugin-version-pluginManagement.xml | 4 +-
.../raw-model/ok-ci-friendly-all-expressions.xml | 4 +-
.../raw-model/ok-ci-friendly-changelist.xml | 4 +-
.../raw-model/ok-ci-friendly-revision.xml | 4 +-
.../validation/raw-model/ok-ci-friendly-sha1.xml | 4 +-
.../raw-model/self-referencing-classifier.xml | 4 +-
.../poms/validation/raw-model/self-referencing.xml | 4 +-
maven-model/pom.xml | 4 +-
maven-model/src/main/mdo/maven.mdo | 2 +-
maven-model/src/site/apt/index.apt | 2 +-
maven-plugin-api/pom.xml | 4 +-
maven-repository-metadata/pom.xml | 4 +-
maven-resolver-provider/pom.xml | 4 +-
.../repo/ut/simple/artifact/1.0/artifact-1.0.pom | 4 +-
.../ut/simple/dependency/1.0/dependency-1.0.pom | 4 +-
.../repo/ut/simple/parent/1.0/parent-1.0.pom | 4 +-
maven-settings-builder/pom.xml | 4 +-
maven-settings/pom.xml | 4 +-
maven-slf4j-provider/pom.xml | 6 +-
pom.xml | 44 +++++---
177 files changed, 491 insertions(+), 277 deletions(-)
create mode 100644 apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
copy LICENSE => apache-maven/src/main/appended-resources/licenses/ASL-2.0.txt
(100%)
create mode 100644
apache-maven/src/main/appended-resources/licenses/MIT-jsoup-1.12.1.txt
create mode 100644
apache-maven/src/main/appended-resources/licenses/MIT-slf4j-api-1.7.29.txt
delete mode 100644 apache-maven/src/main/appended-resources/licenses/MIT.txt
