You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:21:35 UTC

[maven-sources] branch mvn4 updated (3295a0f -> 1e8c33c)

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-sources.git.


 discard 3295a0f  mvn4 aggregator
    omit c31b559  add Maven Build Cache Extension
    omit 3c66ce6  maven-xml study is now unused
    omit 456c54b  drop unused maven-wrapper
    omit 02c2781  add maven-gh-actions-shared
    omit 84181a3  add mvnd
    omit 504a762  s/maven-wrapper/wrapper/ for shorter directory
    omit b754664  [MWRAPPER-14] s/maven-wrapper-plugin/maven-wrapper/
    omit fc95f0f  add maven-wrapper import
    omit a330c8b  add Maven 3 in parallel to Maven (4)
    omit 48656cf  remove sisu website Git repository (that disappeared)
    omit 9d2ac6a  drop maven-buildinfo-plugin study, replaced by maven-artifact-plugin
    omit 7e9f7ec  fixed location
    omit 5d36ba8  added maven-artifact-plugin
    omit affbdf1  add maven-wrapper-plugin
    omit fd00a05  retired osgi and repository-builder
    omit ce01e43  last Doxia tools have their own Git repo now
    omit 85d99dc  added full aggragated build instructions
    omit e13e84c  expand studies into 1 checkout per study
    omit b260f11  disabled sisu: failing for unknown reason
    omit ad528f1  switched to Git
    omit 9cffe29  maven-runtime is retired
    omit b29d66c  maven-downloader is retired
    omit e0de5f5  maven-artifact-resolver is retired
    omit 76b34e0  maven-repository-plugin is retired
    omit 1c9c0ed  maven-ant-plugin is retired
    omit 34cf20f  added link to documentation
    omit ddd29c8  added aggregator POMs to easily build *everything*
    omit 5709048  updated GitHub repository description
    omit 6fa2b2e  added forgotten components
    omit 41892ad  added Sisu entries
    omit 9a94eeb  plexus-containers is now on master branch
    omit 58190a7  reorganized directories to match https://maven.apache.org/scm.html overview
    omit 6ae87f5  plexus-containers useful branch is plexus-containers-1.x
    omit dba0259  moved resolver to core directory
    omit 9bd84fe  added codehaus-plexus.github.io.git
    omit bf62f0d  maven-site.git and maven-doxia-site.git use master branch now
    omit 4a2ff20  Maven site & Doxia site switched to GitBox
    omit 4419501  [MARCHETYPES-60] Archetypes Bundles switched to Git
    omit 9a4a98b  [ARCHETYPE-542] Archetype switched from Git-WIP to GitBox
    omit afe0505  [MNG-6377] Maven core & ITs switched from Git-WIP to GitBox
    omit adef079  [MINDEXER-109] indexer switched from Git-WIP to GitBox
    omit 9ea29c3  [MPLUGINTESTING-54] plugin-testing switched from Git-WIP to GitBox
    omit 2d41ba8  [RESOLVER-44] resolver switched from Git-WIP to GitBox
    omit a751c22  [SCM-876] scm switched from Git-WIP to GitBox
    omit d103c1d  [SUREFIRE-1504] Surefire switch from Git-WIP to GitBox
    omit 498cf48  [WAGON-504] wagon switched from Git-WIP to GitBox
    omit 98cde68  added studies repo for studies/experiments = git-native sandbox = each experiment in its own Git orphan branch to work together before deciding what the the result of the  study will
    omit 481a7fe  remaining svn2git mirrors are now available
    omit 68bbe42  INFRA Jira issues for missing svn2git mirrors
    omit 7c580a3  Added missing maven-file-management.git repository.
    omit 93b90e4  added revision='trunk' for svn2git mirrors
    omit 1482eb7  prepare Apache import as maven-sources.git
    omit 11de2b2  added svn2git mirrors (and missing mirrors in comments)
    omit 0f713da  added Apache License
    omit f725ff3  added Plexus repos
    omit 923a0f2  shared and plugins moved to git
    omit bc9279f  resolver-ant-tasks has now its own gitbox repo
    omit 50b2eba  added jenkins env & lib
    omit ae6997c  [MRESOLVER-28] demos merged in maven-resolver
    omit b5367f4  s/gitbox/origin/
    omit 93fce65  added pom/* doxia-tools/* skins/*
    omit 26590a7  added 6 test repositories
    omit f57650d  added README
    omit b9cc1ea  added every Maven git repo
    omit 52c44d0  init default repo
     add be92580  Initial commit
     add 534f9ab  Update submodules (#1)
     new 1e8c33c  mvn4 aggregator

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   (3295a0f)
            \
             N -- N -- N   refs/heads/mvn4 (1e8c33c)

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:
 .asf.yaml                                          |  16 -
 .gitignore                                         |  15 -
 .gitmodules                                        | 379 ++++++++++++++++++++-
 README.md                                          |  33 --
 core/build-cache                                   |   1 +
 core/its                                           |   1 +
 core/maven                                         |   1 +
 core/mvnd                                          |   1 +
 core/pom.xml                                       |  16 +-
 core/resolver                                      |   1 +
 core/resolver-ant-tasks                            |   1 +
 core/wrapper                                       |   1 +
 default.xml                                        | 174 ----------
 doxia/doxia                                        |   1 +
 doxia/pom.xml                                      |  12 +-
 doxia/site                                         |   1 +
 doxia/sitetools                                    |   1 +
 doxia/tools/converter                              |   1 +
 doxia/tools/linkcheck                              |   1 +
 misc/archetypes                                    |   1 +
 misc/dist-tool                                     |   1 +
 misc/indexer                                       |   1 +
 misc/jenkins/env                                   |   1 +
 misc/jenkins/lib                                   |   1 +
 misc/plugin-testing                                |   1 +
 misc/pom.xml                                       |  18 +-
 misc/pom/apache                                    |   1 +
 misc/pom/maven                                     |   1 +
 misc/skins/default                                 |   1 +
 misc/skins/fluido                                  |   1 +
 misc/wagon                                         |   1 +
 plexus/components/pom.xml                          |  50 ---
 plexus/pom.xml                                     |  44 ---
 plugins/core/maven-clean-plugin                    |   1 +
 plugins/core/maven-compiler-plugin                 |   1 +
 plugins/core/maven-deploy-plugin                   |   1 +
 plugins/core/maven-install-plugin                  |   1 +
 plugins/core/maven-resources-plugin                |   1 +
 plugins/core/maven-site-plugin                     |   1 +
 plugins/core/maven-verifier-plugin                 |   1 +
 plugins/core/pom.xml                               |  16 +-
 plugins/core/surefire                              |   1 +
 plugins/packaging/maven-acr-plugin                 |   1 +
 plugins/packaging/maven-ear-plugin                 |   1 +
 plugins/packaging/maven-ejb-plugin                 |   1 +
 plugins/packaging/maven-jar-plugin                 |   1 +
 plugins/packaging/maven-jlink-plugin               |   1 +
 plugins/packaging/maven-jmod-plugin                |   1 +
 plugins/packaging/maven-rar-plugin                 |   1 +
 plugins/packaging/maven-shade-plugin               |   1 +
 plugins/packaging/maven-source-plugin              |   1 +
 plugins/packaging/maven-war-plugin                 |   1 +
 plugins/packaging/pom.xml                          |  20 +-
 plugins/reporting/jxr                              |   1 +
 plugins/reporting/maven-changelog-plugin           |   1 +
 plugins/reporting/maven-changes-plugin             |   1 +
 plugins/reporting/maven-checkstyle-plugin          |   1 +
 plugins/reporting/maven-doap-plugin                |   1 +
 plugins/reporting/maven-docck-plugin               |   1 +
 plugins/reporting/maven-javadoc-plugin             |   1 +
 plugins/reporting/maven-jdeps-plugin               |   1 +
 plugins/reporting/maven-linkcheck-plugin           |   1 +
 plugins/reporting/maven-pmd-plugin                 |   1 +
 .../reporting/maven-project-info-reports-plugin    |   1 +
 plugins/reporting/pom.xml                          |  22 +-
 plugins/tools/archetype                            |   1 +
 plugins/tools/enforcer                             |   1 +
 plugins/tools/maven-antrun-plugin                  |   1 +
 plugins/tools/maven-artifact-plugin                |   1 +
 plugins/tools/maven-assembly-plugin                |   1 +
 plugins/tools/maven-dependency-plugin              |   1 +
 plugins/tools/maven-gpg-plugin                     |   1 +
 plugins/tools/maven-help-plugin                    |   1 +
 plugins/tools/maven-invoker-plugin                 |   1 +
 plugins/tools/maven-jarsigner-plugin               |   1 +
 plugins/tools/maven-jdeprscan-plugin               |   1 +
 plugins/tools/maven-patch-plugin                   |   1 +
 plugins/tools/maven-remote-resources-plugin        |   1 +
 plugins/tools/maven-scm-publish-plugin             |   1 +
 plugins/tools/maven-scripting-plugin               |   1 +
 plugins/tools/maven-stage-plugin                   |   1 +
 plugins/tools/maven-toolchains-plugin              |   1 +
 plugins/tools/plugin-tools                         |   1 +
 plugins/tools/pom.xml                              |  41 ++-
 plugins/tools/release                              |   1 +
 plugins/tools/scm                                  |   1 +
 pom.xml                                            |  77 ++++-
 shared/archiver                                    |   1 +
 shared/artifact-transfer                           |   1 +
 shared/common-artifact-filters                     |   1 +
 shared/dependency-analyzer                         |   1 +
 shared/dependency-tree                             |   1 +
 shared/file-management                             |   1 +
 shared/filtering                                   |   1 +
 shared/invoker                                     |   1 +
 shared/jarsigner                                   |   1 +
 shared/mapping                                     |   1 +
 shared/pom.xml                                     |  42 +--
 shared/project-utils                               |   1 +
 shared/reporting-api                               |   1 +
 shared/reporting-exec                              |   1 +
 shared/reporting-impl                              |   1 +
 shared/script-interpreter                          |   1 +
 shared/shared-incremental                          |   1 +
 shared/shared-io                                   |   1 +
 shared/shared-jar                                  |   1 +
 shared/shared-resources                            |   1 +
 shared/shared-utils                                |   1 +
 shared/verifier                                    |   1 +
 sisu/pom.xml                                       |  40 ---
 site                                               |   1 +
 studies/pom.xml                                    |  43 ---
 svn/pom.xml                                        |  41 ---
 113 files changed, 637 insertions(+), 556 deletions(-)
 delete mode 100644 .asf.yaml
 delete mode 100644 README.md
 create mode 160000 core/build-cache
 create mode 160000 core/its
 create mode 160000 core/maven
 create mode 160000 core/mvnd
 create mode 160000 core/resolver
 create mode 160000 core/resolver-ant-tasks
 create mode 160000 core/wrapper
 delete mode 100644 default.xml
 create mode 160000 doxia/doxia
 create mode 160000 doxia/site
 create mode 160000 doxia/sitetools
 create mode 160000 doxia/tools/converter
 create mode 160000 doxia/tools/linkcheck
 create mode 160000 misc/archetypes
 create mode 160000 misc/dist-tool
 create mode 160000 misc/indexer
 create mode 160000 misc/jenkins/env
 create mode 160000 misc/jenkins/lib
 create mode 160000 misc/plugin-testing
 create mode 160000 misc/pom/apache
 create mode 160000 misc/pom/maven
 create mode 160000 misc/skins/default
 create mode 160000 misc/skins/fluido
 create mode 160000 misc/wagon
 delete mode 100644 plexus/components/pom.xml
 delete mode 100644 plexus/pom.xml
 create mode 160000 plugins/core/maven-clean-plugin
 create mode 160000 plugins/core/maven-compiler-plugin
 create mode 160000 plugins/core/maven-deploy-plugin
 create mode 160000 plugins/core/maven-install-plugin
 create mode 160000 plugins/core/maven-resources-plugin
 create mode 160000 plugins/core/maven-site-plugin
 create mode 160000 plugins/core/maven-verifier-plugin
 create mode 160000 plugins/core/surefire
 create mode 160000 plugins/packaging/maven-acr-plugin
 create mode 160000 plugins/packaging/maven-ear-plugin
 create mode 160000 plugins/packaging/maven-ejb-plugin
 create mode 160000 plugins/packaging/maven-jar-plugin
 create mode 160000 plugins/packaging/maven-jlink-plugin
 create mode 160000 plugins/packaging/maven-jmod-plugin
 create mode 160000 plugins/packaging/maven-rar-plugin
 create mode 160000 plugins/packaging/maven-shade-plugin
 create mode 160000 plugins/packaging/maven-source-plugin
 create mode 160000 plugins/packaging/maven-war-plugin
 create mode 160000 plugins/reporting/jxr
 create mode 160000 plugins/reporting/maven-changelog-plugin
 create mode 160000 plugins/reporting/maven-changes-plugin
 create mode 160000 plugins/reporting/maven-checkstyle-plugin
 create mode 160000 plugins/reporting/maven-doap-plugin
 create mode 160000 plugins/reporting/maven-docck-plugin
 create mode 160000 plugins/reporting/maven-javadoc-plugin
 create mode 160000 plugins/reporting/maven-jdeps-plugin
 create mode 160000 plugins/reporting/maven-linkcheck-plugin
 create mode 160000 plugins/reporting/maven-pmd-plugin
 create mode 160000 plugins/reporting/maven-project-info-reports-plugin
 create mode 160000 plugins/tools/archetype
 create mode 160000 plugins/tools/enforcer
 create mode 160000 plugins/tools/maven-antrun-plugin
 create mode 160000 plugins/tools/maven-artifact-plugin
 create mode 160000 plugins/tools/maven-assembly-plugin
 create mode 160000 plugins/tools/maven-dependency-plugin
 create mode 160000 plugins/tools/maven-gpg-plugin
 create mode 160000 plugins/tools/maven-help-plugin
 create mode 160000 plugins/tools/maven-invoker-plugin
 create mode 160000 plugins/tools/maven-jarsigner-plugin
 create mode 160000 plugins/tools/maven-jdeprscan-plugin
 create mode 160000 plugins/tools/maven-patch-plugin
 create mode 160000 plugins/tools/maven-remote-resources-plugin
 create mode 160000 plugins/tools/maven-scm-publish-plugin
 create mode 160000 plugins/tools/maven-scripting-plugin
 create mode 160000 plugins/tools/maven-stage-plugin
 create mode 160000 plugins/tools/maven-toolchains-plugin
 create mode 160000 plugins/tools/plugin-tools
 create mode 160000 plugins/tools/release
 create mode 160000 plugins/tools/scm
 create mode 160000 shared/archiver
 create mode 160000 shared/artifact-transfer
 create mode 160000 shared/common-artifact-filters
 create mode 160000 shared/dependency-analyzer
 create mode 160000 shared/dependency-tree
 create mode 160000 shared/file-management
 create mode 160000 shared/filtering
 create mode 160000 shared/invoker
 create mode 160000 shared/jarsigner
 create mode 160000 shared/mapping
 create mode 160000 shared/project-utils
 create mode 160000 shared/reporting-api
 create mode 160000 shared/reporting-exec
 create mode 160000 shared/reporting-impl
 create mode 160000 shared/script-interpreter
 create mode 160000 shared/shared-incremental
 create mode 160000 shared/shared-io
 create mode 160000 shared/shared-jar
 create mode 160000 shared/shared-resources
 create mode 160000 shared/shared-utils
 create mode 160000 shared/verifier
 delete mode 100644 sisu/pom.xml
 create mode 160000 site
 delete mode 100644 studies/pom.xml
 delete mode 100644 svn/pom.xml

[maven-sources] 01/01: mvn4 aggregator

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-sources.git

commit 1e8c33cfd2dc3214594ae5445b06a80f2802e5c8
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:09:13 2022 +0100

    mvn4 aggregator
---
 .gitmodules                                        | 110 ++++++++++++++++++---
 core/maven-3                                       |   1 -
 core/pom.xml                                       |   3 +-
 doxia/pom.xml                                      |   2 -
 doxia/sitetools                                    |   2 +-
 doxia/tools/doxia-book-maven-plugin                |   1 -
 doxia/tools/doxia-book-renderer                    |   1 -
 plugins/core/surefire                              |   2 +-
 .../reporting/maven-project-info-reports-plugin    |   2 +-
 plugins/tools/maven-assembly-plugin                |   2 +-
 plugins/tools/maven-pdf-plugin                     |   1 -
 plugins/tools/pom.xml                              |   1 -
 pom.xml                                            |  71 +++++++++++++
 shared/reporting-exec                              |   2 +-
 sources                                            |   1 -
 15 files changed, 172 insertions(+), 30 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 38fd907..8d90ec5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,301 +1,379 @@
 [submodule "site"]
 	path = site
 	url = https://gitbox.apache.org/repos/asf/maven-site.git
-[submodule "sources"]
-	path = sources
-	url = https://gitbox.apache.org/repos/asf/maven-sources.git
+	branch = mvn4
 [submodule "core/maven"]
 	path = core/maven
 	url = https://gitbox.apache.org/repos/asf/maven.git
+	branch = mvn4
 [submodule "core/its"]
 	path = core/its
 	url = https://gitbox.apache.org/repos/asf/maven-integration-testing.git
+	branch = mvn4
 [submodule "core/resolver"]
 	path = core/resolver
 	url = https://gitbox.apache.org/repos/asf/maven-resolver.git
+	branch = mvn4
 [submodule "core/resolver-ant-tasks"]
 	path = core/resolver-ant-tasks
 	url = https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git
+	branch = mvn4
 [submodule "core/maven-wrapper-plugin"]
 	path = core/maven-wrapper-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-wrapper-plugin.git
 [submodule "plugins/core/maven-clean-plugin"]
 	path = plugins/core/maven-clean-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-clean-plugin.git
+	branch = mvn4
 [submodule "plugins/core/maven-compiler-plugin"]
 	path = plugins/core/maven-compiler-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
+	branch = mvn4
 [submodule "plugins/core/maven-deploy-plugin"]
 	path = plugins/core/maven-deploy-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git
+	branch = mvn4
 [submodule "plugins/core/maven-install-plugin"]
 	path = plugins/core/maven-install-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-install-plugin.git
+	branch = mvn4
 [submodule "plugins/core/maven-resources-plugin"]
 	path = plugins/core/maven-resources-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
+	branch = mvn4
 [submodule "plugins/core/maven-site-plugin"]
 	path = plugins/core/maven-site-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-site-plugin.git
+	branch = mvn4
 [submodule "plugins/core/surefire"]
 	path = plugins/core/surefire
 	url = https://gitbox.apache.org/repos/asf/maven-surefire.git
+	branch = mvn4
 [submodule "plugins/core/maven-verifier-plugin"]
 	path = plugins/core/maven-verifier-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-verifier-plugin.git
+	branch = mvn4
 [submodule "plugins/packaging/maven-ear-plugin"]
 	path = plugins/packaging/maven-ear-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-ear-plugin.git
+	branch = mvn4
 [submodule "plugins/reporting/maven-changelog-plugin"]
 	path = plugins/reporting/maven-changelog-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/maven-antrun-plugin"]
 	path = plugins/tools/maven-antrun-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git
-[submodule "doxia/tools/doxia-book-maven-plugin"]
-	path = doxia/tools/doxia-book-maven-plugin
-	url = https://gitbox.apache.org/repos/asf/maven-doxia-book-maven-plugin.git
+	branch = mvn4
 [submodule "misc/archetypes"]
 	path = misc/archetypes
 	url = https://gitbox.apache.org/repos/asf/maven-archetypes.git
+	branch = mvn4
 [submodule "misc/pom/maven"]
 	path = misc/pom/maven
 	url = https://gitbox.apache.org/repos/asf/maven-parent.git
+	branch = mvn4
 [submodule "misc/skins/default"]
 	path = misc/skins/default
 	url = https://gitbox.apache.org/repos/asf/maven-default-skin.git
+	branch = mvn4
 [submodule "misc/jenkins/env"]
 	path = misc/jenkins/env
 	url = https://gitbox.apache.org/repos/asf/maven-jenkins-env.git
+	branch = mvn4
 [submodule "plugins/packaging/maven-jar-plugin"]
 	path = plugins/packaging/maven-jar-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-jar-plugin.git
+	branch = mvn4
 [submodule "plugins/packaging/maven-rar-plugin"]
 	path = plugins/packaging/maven-rar-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-rar-plugin.git
+	branch = mvn4
 [submodule "plugins/packaging/maven-war-plugin"]
 	path = plugins/packaging/maven-war-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-war-plugin.git
+	branch = mvn4
 [submodule "plugins/packaging/maven-acr-plugin"]
 	path = plugins/packaging/maven-acr-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-acr-plugin.git
+	branch = mvn4
 [submodule "plugins/packaging/maven-shade-plugin"]
 	path = plugins/packaging/maven-shade-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
+	branch = mvn4
 [submodule "plugins/packaging/maven-source-plugin"]
 	path = plugins/packaging/maven-source-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-source-plugin.git
+	branch = mvn4
 [submodule "plugins/packaging/maven-jlink-plugin"]
 	path = plugins/packaging/maven-jlink-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git
+	branch = mvn4
 [submodule "plugins/reporting/maven-changes-plugin"]
 	path = plugins/reporting/maven-changes-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-changes-plugin.git
+	branch = mvn4
 [submodule "plugins/reporting/maven-checkstyle-plugin"]
 	path = plugins/reporting/maven-checkstyle-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
+	branch = mvn4
 [submodule "plugins/reporting/maven-doap-plugin"]
 	path = plugins/reporting/maven-doap-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-doap-plugin.git
+	branch = mvn4
 [submodule "plugins/reporting/maven-docck-plugin"]
 	path = plugins/reporting/maven-docck-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-docck-plugin.git
+	branch = mvn4
 [submodule "plugins/reporting/maven-javadoc-plugin"]
 	path = plugins/reporting/maven-javadoc-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
+	branch = mvn4
 [submodule "plugins/reporting/maven-jdeps-plugin"]
 	path = plugins/reporting/maven-jdeps-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-jdeps-plugin.git
+	branch = mvn4
 [submodule "plugins/reporting/jxr"]
 	path = plugins/reporting/jxr
 	url = https://gitbox.apache.org/repos/asf/maven-jxr.git
+	branch = mvn4
 [submodule "plugins/reporting/maven-linkcheck-plugin"]
 	path = plugins/reporting/maven-linkcheck-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-linkcheck-plugin.git
+	branch = mvn4
 [submodule "plugins/reporting/maven-pmd-plugin"]
 	path = plugins/reporting/maven-pmd-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git
+	branch = mvn4
 [submodule "plugins/reporting/maven-project-info-reports-plugin"]
 	path = plugins/reporting/maven-project-info-reports-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin
+	branch = mvn4
 [submodule "plugins/tools/archetype"]
 	path = plugins/tools/archetype
 	url = https://gitbox.apache.org/repos/asf/maven-archetype.git
+	branch = mvn4
 [submodule "plugins/tools/maven-artifact-plugin"]
 	path = plugins/tools/maven-artifact-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/maven-assembly-plugin"]
 	path = plugins/tools/maven-assembly-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/maven-dependency-plugin"]
 	path = plugins/tools/maven-dependency-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/enforcer"]
 	path = plugins/tools/enforcer
 	url = https://gitbox.apache.org/repos/asf/maven-enforcer.git
+	branch = mvn4
 [submodule "plugins/tools/maven-gpg-plugin"]
 	path = plugins/tools/maven-gpg-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-gpg-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/maven-help-plugin"]
 	path = plugins/tools/maven-help-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-help-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/maven-invoker-plugin"]
 	path = plugins/tools/maven-invoker-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/maven-jarsigner-plugin"]
 	path = plugins/tools/maven-jarsigner-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-jarsigner-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/maven-jdeprscan-plugin"]
 	path = plugins/tools/maven-jdeprscan-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-jdeprscan-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/maven-patch-plugin"]
 	path = plugins/tools/maven-patch-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-patch-plugin.git
-[submodule "plugins/tools/maven-pdf-plugin"]
-	path = plugins/tools/maven-pdf-plugin
-	url = https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/plugin-tools"]
 	path = plugins/tools/plugin-tools
 	url = https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
+	branch = mvn4
 [submodule "plugins/tools/release"]
 	path = plugins/tools/release
 	url = https://gitbox.apache.org/repos/asf/maven-release.git
+	branch = mvn4
 [submodule "plugins/tools/maven-remote-resources-plugin"]
 	path = plugins/tools/maven-remote-resources-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin
+	branch = mvn4
 [submodule "plugins/tools/scm"]
 	path = plugins/tools/scm
 	url = https://gitbox.apache.org/repos/asf/maven-scm.git
+	branch = mvn4
 [submodule "plugins/tools/maven-scm-publish-plugin"]
 	path = plugins/tools/maven-scm-publish-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/maven-scripting-plugin"]
 	path = plugins/tools/maven-scripting-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/maven-stage-plugin"]
 	path = plugins/tools/maven-stage-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-stage-plugin.git
+	branch = mvn4
 [submodule "plugins/tools/maven-toolchains-plugin"]
 	path = plugins/tools/maven-toolchains-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-toolchains-plugin.git
+	branch = mvn4
 [submodule "shared/archiver"]
 	path = shared/archiver
 	url = https://gitbox.apache.org/repos/asf/maven-archiver.git
+	branch = mvn4
 [submodule "shared/artifact-transfer"]
 	path = shared/artifact-transfer
 	url = https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git
+	branch = mvn4
 [submodule "shared/common-artifact-filters"]
 	path = shared/common-artifact-filters
 	url = https://gitbox.apache.org/repos/asf/maven-common-artifact-filters.git
+	branch = mvn4
 [submodule "shared/dependency-analyzer"]
 	path = shared/dependency-analyzer
 	url = https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git
+	branch = mvn4
 [submodule "shared/dependency-tree"]
 	path = shared/dependency-tree
 	url = https://gitbox.apache.org/repos/asf/maven-dependency-tree.git
+	branch = mvn4
 [submodule "shared/file-management"]
 	path = shared/file-management
 	url = https://gitbox.apache.org/repos/asf/maven-file-management.git
+	branch = mvn4
 [submodule "shared/filtering"]
 	path = shared/filtering
 	url = https://gitbox.apache.org/repos/asf/maven-filtering.git
+	branch = mvn4
 [submodule "shared/invoker"]
 	path = shared/invoker
 	url = https://gitbox.apache.org/repos/asf/maven-invoker.git
+	branch = mvn4
 [submodule "shared/jarsigner"]
 	path = shared/jarsigner
 	url = https://gitbox.apache.org/repos/asf/maven-jarsigner.git
+	branch = mvn4
 [submodule "shared/mapping"]
 	path = shared/mapping
 	url = https://gitbox.apache.org/repos/asf/maven-mapping.git
+	branch = mvn4
 [submodule "shared/project-utils"]
 	path = shared/project-utils
 	url = https://gitbox.apache.org/repos/asf/maven-project-utils.git
+	branch = mvn4
 [submodule "shared/reporting-api"]
 	path = shared/reporting-api
 	url = https://gitbox.apache.org/repos/asf/maven-reporting-api.git
+	branch = mvn4
 [submodule "shared/reporting-exec"]
 	path = shared/reporting-exec
 	url = https://gitbox.apache.org/repos/asf/maven-reporting-exec.git
+	branch = mvn4
 [submodule "shared/reporting-impl"]
 	path = shared/reporting-impl
 	url = https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
+	branch = mvn4
 [submodule "shared/script-interpreter"]
 	path = shared/script-interpreter
 	url = https://gitbox.apache.org/repos/asf/maven-script-interpreter.git
+	branch = mvn4
 [submodule "shared/shared-incremental"]
 	path = shared/shared-incremental
 	url = https://gitbox.apache.org/repos/asf/maven-shared-incremental.git
+	branch = mvn4
 [submodule "shared/shared-io"]
 	path = shared/shared-io
 	url = https://gitbox.apache.org/repos/asf/maven-shared-io.git
+	branch = mvn4
 [submodule "shared/shared-jar"]
 	path = shared/shared-jar
 	url = https://gitbox.apache.org/repos/asf/maven-shared-jar.git
+	branch = mvn4
 [submodule "shared/shared-resources"]
 	path = shared/shared-resources
 	url = https://gitbox.apache.org/repos/asf/maven-shared-resources.git
+	branch = mvn4
 [submodule "shared/shared-utils"]
 	path = shared/shared-utils
 	url = https://gitbox.apache.org/repos/asf/maven-shared-utils.git
+	branch = mvn4
 [submodule "shared/verifier"]
 	path = shared/verifier
 	url = https://gitbox.apache.org/repos/asf/maven-verifier.git
+	branch = mvn4
 [submodule "doxia/doxia"]
 	path = doxia/doxia
 	url = https://gitbox.apache.org/repos/asf/maven-doxia.git
+	branch = mvn4
 [submodule "doxia/site"]
 	path = doxia/site
 	url = https://gitbox.apache.org/repos/asf/maven-doxia-site.git
+	branch = mvn4
 [submodule "doxia/sitetools"]
 	path = doxia/sitetools
 	url = https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
-[submodule "doxia/tools/doxia-book-renderer"]
-	path = doxia/tools/doxia-book-renderer
-	url = https://gitbox.apache.org/repos/asf/maven-doxia-book-renderer.git
+	branch = mvn4
 [submodule "doxia/tools/converter"]
 	path = doxia/tools/converter
 	url = https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
+	branch = mvn4
 [submodule "doxia/tools/linkcheck"]
 	path = doxia/tools/linkcheck
 	url = https://gitbox.apache.org/repos/asf/maven-doxia-linkcheck.git
+	branch = mvn4
 [submodule "misc/pom/apache"]
 	path = misc/pom/apache
 	url = https://gitbox.apache.org/repos/asf/maven-apache-parent.git
+	branch = mvn4
 [submodule "misc/skins/fluido"]
 	path = misc/skins/fluido
 	url = https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
+	branch = mvn4
 [submodule "misc/dist-tool"]
 	path = misc/dist-tool
 	url = https://gitbox.apache.org/repos/asf/maven-dist-tool.git
+	branch = mvn4
 [submodule "misc/jenkins/lib"]
 	path = misc/jenkins/lib
 	url = https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git
+	branch = mvn4
 [submodule "misc/indexer"]
 	path = misc/indexer
 	url = https://gitbox.apache.org/repos/asf/maven-indexer.git
+	branch = mvn4
 [submodule "misc/plugin-testing"]
 	path = misc/plugin-testing
 	url = https://gitbox.apache.org/repos/asf/maven-plugin-testing.git
+	branch = mvn4
 [submodule "misc/wagon"]
 	path = misc/wagon
 	url = https://gitbox.apache.org/repos/asf/maven-wagon.git
+	branch = mvn4
 [submodule "plugins/packaging/maven-ejb-plugin"]
 	path = plugins/packaging/maven-ejb-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-ejb-plugin.git
+	branch = mvn4
 [submodule "plugins/packaging/maven-jmod-plugin"]
 	path = plugins/packaging/maven-jmod-plugin
 	url = https://gitbox.apache.org/repos/asf/maven-jmod-plugin.git
+	branch = mvn4
 [submodule "core/build-cache"]
 	path = core/build-cache
 	url = https://github.com/apache/maven-build-cache-extension.git
+	branch = mvn4
 [submodule "core/mvnd"]
 	path = core/mvnd
 	url = https://github.com/apache/maven-mvnd.git
-[submodule "core/maven-3"]
-	path = core/maven-3
-	url = https://github.com/apache/maven.git
-	branch = maven-3.8.x
+	branch = mvn4
 [submodule "core/wrapper"]
 	path = core/wrapper
 	url = https://github.com/apache/maven-wrapper.git
+	branch = mvn4
diff --git a/core/maven-3 b/core/maven-3
deleted file mode 160000
index 83257bf..0000000
--- a/core/maven-3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 83257bfde0dd5b4d391063412494957c1b7e15e8
diff --git a/core/pom.xml b/core/pom.xml
index f10fd8f..dc7adf4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -33,11 +33,12 @@ under the License.
   <name>Aggregator POM for core</name>
   <modules>
     <module>maven</module>
-    <module>maven-3</module>
     <module>its</module>
     <module>resolver</module>
     <module>resolver-ant-tasks</module>
+    <!-- disable until the required PR is merged into master
     <module>build-cache</module>
+    -->
     <module>mvnd</module>
     <module>wrapper</module>
   </modules>
diff --git a/doxia/pom.xml b/doxia/pom.xml
index 182ee2d..1f3f810 100644
--- a/doxia/pom.xml
+++ b/doxia/pom.xml
@@ -35,8 +35,6 @@ under the License.
     <module>doxia</module>
     <module>site</module>
     <module>sitetools</module>
-    <module>tools/doxia-book-maven-plugin</module>
-    <module>tools/doxia-book-renderer</module>
     <module>tools/converter</module>
     <module>tools/linkcheck</module>
   </modules>
diff --git a/doxia/sitetools b/doxia/sitetools
index ff0a33f..2a2fd87 160000
--- a/doxia/sitetools
+++ b/doxia/sitetools
@@ -1 +1 @@
-Subproject commit ff0a33f6ef514a6f53f5e4948f7f41d3b7807144
+Subproject commit 2a2fd87d412fb60f51e17a227f88d663f14fb724
diff --git a/doxia/tools/doxia-book-maven-plugin b/doxia/tools/doxia-book-maven-plugin
deleted file mode 160000
index d7c7281..0000000
--- a/doxia/tools/doxia-book-maven-plugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d7c72810087033d0d9c2c74ee8df0accccf2705c
diff --git a/doxia/tools/doxia-book-renderer b/doxia/tools/doxia-book-renderer
deleted file mode 160000
index 0712f5b..0000000
--- a/doxia/tools/doxia-book-renderer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0712f5baa906b9280956e4e216f7b754843987e5
diff --git a/plugins/core/surefire b/plugins/core/surefire
index 5482b7f..cdb7c9c 160000
--- a/plugins/core/surefire
+++ b/plugins/core/surefire
@@ -1 +1 @@
-Subproject commit 5482b7f97da73b665fcaeed45a7a73040a9c9db1
+Subproject commit cdb7c9cb69b72a916b927743069373ac863df1c1
diff --git a/plugins/reporting/maven-project-info-reports-plugin b/plugins/reporting/maven-project-info-reports-plugin
index 9817c85..51a051b 160000
--- a/plugins/reporting/maven-project-info-reports-plugin
+++ b/plugins/reporting/maven-project-info-reports-plugin
@@ -1 +1 @@
-Subproject commit 9817c856e3837cf7a1cec03e90260d667e04c970
+Subproject commit 51a051b23dd5a97d472c45ac0850b949907fafef
diff --git a/plugins/tools/maven-assembly-plugin b/plugins/tools/maven-assembly-plugin
index 60c81ed..7c1cc21 160000
--- a/plugins/tools/maven-assembly-plugin
+++ b/plugins/tools/maven-assembly-plugin
@@ -1 +1 @@
-Subproject commit 60c81edfd0cdbf4fcf2322b37f4279949486a51b
+Subproject commit 7c1cc21d094fb02b2ea4ee1f63c74b6ae84e3b8b
diff --git a/plugins/tools/maven-pdf-plugin b/plugins/tools/maven-pdf-plugin
deleted file mode 160000
index 7cba9f6..0000000
--- a/plugins/tools/maven-pdf-plugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7cba9f683d6b256987282161386edca8a454b32d
diff --git a/plugins/tools/pom.xml b/plugins/tools/pom.xml
index b339193..4f729c4 100644
--- a/plugins/tools/pom.xml
+++ b/plugins/tools/pom.xml
@@ -44,7 +44,6 @@ under the License.
     <module>maven-jarsigner-plugin</module>
     <module>maven-jdeprscan-plugin</module>
     <module>maven-patch-plugin</module>
-    <module>maven-pdf-plugin</module>
     <module>plugin-tools</module>
     <module>release</module>
     <module>maven-remote-resources-plugin</module>
diff --git a/pom.xml b/pom.xml
index 745c114..ff50627 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,4 +63,75 @@ under the License.
     <module>shared</module>
     <!-- module>studies</module> -->
   </modules>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.13.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>1.10.12</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-digester</groupId>
+        <artifactId>commons-digester</artifactId>
+        <version>2.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.11.0</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.6</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>3.12.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>4.5.13</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>4.5.13</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpmime</artifactId>
+        <version>4.5.13</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
+        <version>2.1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-interpolation</artifactId>
+        <version>1.26</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>3.4.1</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
 </project>
diff --git a/shared/reporting-exec b/shared/reporting-exec
index 7bfd4cf..21caf75 160000
--- a/shared/reporting-exec
+++ b/shared/reporting-exec
@@ -1 +1 @@
-Subproject commit 7bfd4cf5aae8a99f44ca1221c73683f5eaa64006
+Subproject commit 21caf7585ddf087f4ea28c0cb13647ce5ca49a14
diff --git a/sources b/sources
deleted file mode 160000
index 7e9f7ec..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7e9f7ec8961eae9481124bec27cb4e43ccbac4ea