You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/05/13 15:06:23 UTC

[maven-sources] branch master updated: improve README + directory to avoid reported confusion

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 95b62b0  improve README + directory to avoid reported confusion
95b62b0 is described below

commit 95b62b049f497191d1db6e3ebe4d04c2b55d6237
Author: Hervé Boutemy <hb...@sonatype.com>
AuthorDate: Fri May 13 16:06:17 2022 +0100

    improve README + directory to avoid reported confusion
---
 README.md                                         | 156 +++++++++++++++++++++-
 {core => aggregator/core}/pom.xml                 |  14 +-
 {doxia => aggregator/doxia}/pom.xml               |  14 +-
 {misc => aggregator/misc}/pom.xml                 |  18 +--
 {plexus => aggregator/plexus}/components/pom.xml  |  26 ++--
 {plexus => aggregator/plexus}/pom.xml             |  14 +-
 {plugins => aggregator/plugins}/core/pom.xml      |  16 +--
 {plugins => aggregator/plugins}/packaging/pom.xml |  20 +--
 {plugins => aggregator/plugins}/pom.xml           |   0
 {plugins => aggregator/plugins}/reporting/pom.xml |  22 +--
 {plugins => aggregator/plugins}/tools/pom.xml     |  42 +++---
 pom.xml => aggregator/pom.xml                     |   2 +-
 {shared => aggregator/shared}/pom.xml             |  42 +++---
 {sisu => aggregator/sisu}/pom.xml                 |   6 +-
 {studies => aggregator/studies}/pom.xml           |  14 +-
 {svn => aggregator/svn}/pom.xml                   |   6 +-
 16 files changed, 279 insertions(+), 133 deletions(-)

diff --git a/README.md b/README.md
index 251ea1b..8a481d4 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
 # Apache Maven Sources
 
-Manifest to fetch every [Apache Maven](https://maven.apache.org) git repositories using [Google repo](https://source.android.com/source/using-repo).
+Manifest to fetch every [Apache Maven](https://maven.apache.org) git repositories using [Google repo](https://source.android.com/source/using-repo): [`default.xml` file](default.xml) configures the
+directory structure where the different Git repositories will be put.
 
-In addition, an aggregator structure is provided to build everything as one aggregated build.
+In addition, an aggregator build structure is provided to build everything as one aggregated build.
 
 ## Bootstrapping Basics
 
@@ -14,16 +15,161 @@ repo sync
 repo start master --all
 ```
 
-Then simply use the cloned content with normal `git` commands.
+Resulting directory tree looks like:
+
+```
+|-- core
+|   |-- build-cache
+|   |-- its
+|   |-- maven
+|   |-- maven-3
+|   |-- mvnd
+|   |-- resolver
+|   |-- resolver-ant-tasks
+|   `-- wrapper
+|-- doxia
+|   |-- doxia
+|   |-- site
+|   |-- sitetools
+|   `-- tools
+|-- misc
+|   |-- archetypes
+|   |-- dist-tool
+|   |-- gh-actions-shared
+|   |-- indexer
+|   |-- jenkins
+|   |-- plugin-testing
+|   |-- pom
+|   |   |-- apache
+|   |   `-- maven
+|   |-- skins
+|   |   |-- default
+|   |   `-- fluido
+|   `-- wagon
+|-- plexus
+|   |-- classworlds
+|   |-- codehaus-plexus.github.io
+|   |-- components
+|   |   |-- archiver
+|   |   |-- cipher
+|   |   |-- cli
+|   |   |-- compiler
+|   |   |-- digest
+|   |   |-- i18n
+|   |   |-- interactivity
+|   |   |-- interpolation
+|   |   |-- io
+|   |   |-- languages
+|   |   |-- resources
+|   |   |-- sec-dispatcher
+|   |   |-- swizzle
+|   |   `-- velocity
+|   |-- modello
+|   |-- plexus-containers
+|   |-- pom
+|   `-- utils
+|-- plugins
+|   |-- core
+|   |   |-- maven-clean-plugin
+|   |   |-- maven-compiler-plugin
+|   |   |-- maven-deploy-plugin
+|   |   |-- maven-install-plugin
+|   |   |-- maven-resources-plugin
+|   |   |-- maven-site-plugin
+|   |   |-- maven-verifier-plugin
+|   |   `-- surefire
+|   |-- packaging
+|   |   |-- maven-acr-plugin
+|   |   |-- maven-ear-plugin
+|   |   |-- maven-ejb-plugin
+|   |   |-- maven-jar-plugin
+|   |   |-- maven-jlink-plugin
+|   |   |-- maven-jmod-plugin
+|   |   |-- maven-rar-plugin
+|   |   |-- maven-shade-plugin
+|   |   |-- maven-source-plugin
+|   |   `-- maven-war-plugin
+|   |-- reporting
+|   |   |-- jxr
+|   |   |-- maven-changelog-plugin
+|   |   |-- maven-changes-plugin
+|   |   |-- maven-checkstyle-plugin
+|   |   |-- maven-doap-plugin
+|   |   |-- maven-docck-plugin
+|   |   |-- maven-javadoc-plugin
+|   |   |-- maven-jdeps-plugin
+|   |   |-- maven-linkcheck-plugin
+|   |   |-- maven-pmd-plugin
+|   |   `-- maven-project-info-reports-plugin
+|   `-- tools
+|       |-- archetype
+|       |-- enforcer
+|       |-- maven-antrun-plugin
+|       |-- maven-artifact-plugin
+|       |-- maven-assembly-plugin
+|       |-- maven-dependency-plugin
+|       |-- maven-gpg-plugin
+|       |-- maven-help-plugin
+|       |-- maven-invoker-plugin
+|       |-- maven-jarsigner-plugin
+|       |-- maven-jdeprscan-plugin
+|       |-- maven-patch-plugin
+|       |-- maven-pdf-plugin
+|       |-- maven-remote-resources-plugin
+|       |-- maven-scm-publish-plugin
+|       |-- maven-scripting-plugin
+|       |-- maven-stage-plugin
+|       |-- maven-toolchains-plugin
+|       |-- plugin-tools
+|       |-- release
+|       `-- scm
+|-- shared
+|   |-- archiver
+|   |-- artifact-transfer
+|   |-- common-artifact-filters
+|   |-- dependency-analyzer
+|   |-- dependency-tree
+|   |-- file-management
+|   |-- filtering
+|   |-- invoker
+|   |-- jarsigner
+|   |-- mapping
+|   |-- project-utils
+|   |-- reporting-api
+|   |-- reporting-exec
+|   |-- reporting-impl
+|   |-- script-interpreter
+|   |-- shared-incremental
+|   |-- shared-io
+|   |-- shared-jar
+|   |-- shared-resources
+|   |-- shared-utils
+|   `-- verifier
+|-- sisu
+|   |-- inject
+|   |-- mojos
+|   `-- plexus
+|-- site
+|-- sources
+|   `-- aggregator
+|-- studies
+`-- svn
+    |-- doxia-ide
+    |-- repository-tools
+    |-- resources
+    `-- sandbox
+```
+
+Then simply use the content in this tree with normal `git` commands.
 
 ## Building Everything
 
-Once content is cloned with previous instructions, you can build each repository as a separate project.
+Once content is cloned with previous instructions, you can build each local clone as a separate project.
 
 You can also build absolutely everything in one aggregated run (WARNING: more than 400 modules...):
 
 ```
-cd sources
+cd sources/aggregator
 mvn --fail-at-end -Prun-its verify
 mvn --fail-at-end -Preporting site
 ```
diff --git a/core/pom.xml b/aggregator/core/pom.xml
similarity index 81%
rename from core/pom.xml
rename to aggregator/core/pom.xml
index e1f040f..1b53b89 100644
--- a/core/pom.xml
+++ b/aggregator/core/pom.xml
@@ -32,12 +32,12 @@ under the License.
 
   <name>Aggregator POM for core</name>
   <modules>
-    <module>../../core/build-cache</module>
-    <module>../../core/maven</module>
-    <module>../../core/mvnd</module>
-    <module>../../core/its</module>
-    <module>../../core/resolver</module>
-    <module>../../core/resolver-ant-tasks</module>
-    <module>../../core/wrapper</module>
+    <module>../../../core/build-cache</module>
+    <module>../../../core/maven</module>
+    <module>../../../core/mvnd</module>
+    <module>../../../core/its</module>
+    <module>../../../core/resolver</module>
+    <module>../../../core/resolver-ant-tasks</module>
+    <module>../../../core/wrapper</module>
   </modules>
 </project>
diff --git a/doxia/pom.xml b/aggregator/doxia/pom.xml
similarity index 78%
rename from doxia/pom.xml
rename to aggregator/doxia/pom.xml
index 084f873..fa4e92f 100644
--- a/doxia/pom.xml
+++ b/aggregator/doxia/pom.xml
@@ -32,12 +32,12 @@ under the License.
 
   <name>Aggregator POM for Doxia</name>
   <modules>
-    <module>../../doxia/doxia</module>
-    <module>../../doxia/site</module>
-    <module>../../doxia/sitetools</module>
-    <module>../../doxia/tools/doxia-book-maven-plugin</module>
-    <module>../../doxia/tools/doxia-book-renderer</module>
-    <module>../../doxia/tools/converter</module>
-    <module>../../doxia/tools/linkcheck</module>
+    <module>../../../doxia/doxia</module>
+    <module>../../../doxia/site</module>
+    <module>../../../doxia/sitetools</module>
+    <module>../../../doxia/tools/doxia-book-maven-plugin</module>
+    <module>../../../doxia/tools/doxia-book-renderer</module>
+    <module>../../../doxia/tools/converter</module>
+    <module>../../../doxia/tools/linkcheck</module>
   </modules>
 </project>
diff --git a/misc/pom.xml b/aggregator/misc/pom.xml
similarity index 77%
rename from misc/pom.xml
rename to aggregator/misc/pom.xml
index 752749b..ab207d9 100644
--- a/misc/pom.xml
+++ b/aggregator/misc/pom.xml
@@ -32,16 +32,16 @@ under the License.
 
   <name>Aggregator POM for misc</name>
   <modules>
-    <module>../../misc/archetypes</module>
-    <module>../../misc/dist-tool</module>
-    <module>../../misc/indexer</module>
+    <module>../../../misc/archetypes</module>
+    <module>../../../misc/dist-tool</module>
+    <module>../../../misc/indexer</module>
     <!-- not a module: jenkins -->
-    <module>../../misc/plugin-testing</module>
-    <module>../../misc/pom/apache</module>
-    <module>../../misc/pom/maven</module>
-    <module>../../misc/skins/default</module>
-    <module>../../misc/skins/fluido</module>
+    <module>../../../misc/plugin-testing</module>
+    <module>../../../misc/pom/apache</module>
+    <module>../../../misc/pom/maven</module>
+    <module>../../../misc/skins/default</module>
+    <module>../../../misc/skins/fluido</module>
     <!-- not a module: studies -->
-    <module>../../misc/wagon</module>
+    <module>../../../misc/wagon</module>
   </modules>
 </project>
diff --git a/plexus/components/pom.xml b/aggregator/plexus/components/pom.xml
similarity index 64%
rename from plexus/components/pom.xml
rename to aggregator/plexus/components/pom.xml
index 7cbe7a2..6c78c08 100644
--- a/plexus/components/pom.xml
+++ b/aggregator/plexus/components/pom.xml
@@ -32,19 +32,19 @@ under the License.
 
   <name>Aggregator POM for Plexus Components</name>
   <modules>
-    <module>../../../plexus/components/cipher</module>
-    <module>../../../plexus/components/compiler</module>
-    <module>../../../plexus/components/i18n</module>
-    <module>../../../plexus/components/interpolation</module>
-    <module>../../../plexus/components/languages</module>
-    <module>../../../plexus/components/sec-dispatcher</module>
-    <module>../../../plexus/components/archiver</module>
-    <module>../../../plexus/components/cli</module>
-    <module>../../../plexus/components/digest</module>
-    <module>../../../plexus/components/interactivity</module>
-    <module>../../../plexus/components/io</module>
-    <module>../../../plexus/components/resources</module>
+    <module>../../../../plexus/components/cipher</module>
+    <module>../../../../plexus/components/compiler</module>
+    <module>../../../../plexus/components/i18n</module>
+    <module>../../../../plexus/components/interpolation</module>
+    <module>../../../../plexus/components/languages</module>
+    <module>../../../../plexus/components/sec-dispatcher</module>
+    <module>../../../../plexus/components/archiver</module>
+    <module>../../../../plexus/components/cli</module>
+    <module>../../../../plexus/components/digest</module>
+    <module>../../../../plexus/components/interactivity</module>
+    <module>../../../../plexus/components/io</module>
+    <module>../../../../plexus/components/resources</module>
     <!--module>../../../plexus/components/swizzle</module-->
-    <module>../../../plexus/components/velocity</module>
+    <module>../../../../plexus/components/velocity</module>
   </modules>
 </project>
diff --git a/plexus/pom.xml b/aggregator/plexus/pom.xml
similarity index 79%
rename from plexus/pom.xml
rename to aggregator/plexus/pom.xml
index 0492132..cc78ac5 100644
--- a/plexus/pom.xml
+++ b/aggregator/plexus/pom.xml
@@ -32,13 +32,13 @@ under the License.
 
   <name>Aggregator POM for Plexus</name>
   <modules>
-    <module>../../plexus/classworlds</module>
-    <module>../../plexus/codehaus-plexus.github.io</module>
+    <module>../../../plexus/classworlds</module>
+    <module>../../../plexus/codehaus-plexus.github.io</module>
     <module>components</module>
-    <module>../../plexus/modello</module>
-    <module>../../plexus/plexus-containers</module>
-    <module>../../plexus/pom/components</module>
-    <module>../../plexus/pom/plexus</module>
-    <module>../../plexus/utils</module>
+    <module>../../../plexus/modello</module>
+    <module>../../../plexus/plexus-containers</module>
+    <module>../../../plexus/pom/components</module>
+    <module>../../../plexus/pom/plexus</module>
+    <module>../../../plexus/utils</module>
   </modules>
 </project>
diff --git a/plugins/core/pom.xml b/aggregator/plugins/core/pom.xml
similarity index 72%
rename from plugins/core/pom.xml
rename to aggregator/plugins/core/pom.xml
index 2dd4abd..857a737 100644
--- a/plugins/core/pom.xml
+++ b/aggregator/plugins/core/pom.xml
@@ -32,13 +32,13 @@ under the License.
 
   <name>Aggregator POM for Core Plugins</name>
   <modules>
-    <module>../../../plugins/core/maven-clean-plugin</module>
-    <module>../../../plugins/core/maven-compiler-plugin</module>
-    <module>../../../plugins/core/maven-deploy-plugin</module>
-    <module>../../../plugins/core/maven-install-plugin</module>
-    <module>../../../plugins/core/maven-resources-plugin</module>
-    <module>../../../plugins/core/maven-site-plugin</module>
-    <module>../../../plugins/core/surefire</module>
-    <module>../../../plugins/core/maven-verifier-plugin</module>
+    <module>../../../../plugins/core/maven-clean-plugin</module>
+    <module>../../../../plugins/core/maven-compiler-plugin</module>
+    <module>../../../../plugins/core/maven-deploy-plugin</module>
+    <module>../../../../plugins/core/maven-install-plugin</module>
+    <module>../../../../plugins/core/maven-resources-plugin</module>
+    <module>../../../../plugins/core/maven-site-plugin</module>
+    <module>../../../../plugins/core/surefire</module>
+    <module>../../../../plugins/core/maven-verifier-plugin</module>
   </modules>
 </project>
diff --git a/plugins/packaging/pom.xml b/aggregator/plugins/packaging/pom.xml
similarity index 66%
rename from plugins/packaging/pom.xml
rename to aggregator/plugins/packaging/pom.xml
index 63152d8..f838ed9 100644
--- a/plugins/packaging/pom.xml
+++ b/aggregator/plugins/packaging/pom.xml
@@ -32,15 +32,15 @@ under the License.
 
   <name>Aggregator POM for Packaging Plugins</name>
   <modules>
-    <module>../../../plugins/packaging/maven-ear-plugin</module>
-    <module>../../../plugins/packaging/maven-ejb-plugin</module>
-    <module>../../../plugins/packaging/maven-jar-plugin</module>
-    <module>../../../plugins/packaging/maven-rar-plugin</module>
-    <module>../../../plugins/packaging/maven-war-plugin</module>
-    <module>../../../plugins/packaging/maven-acr-plugin</module>
-    <module>../../../plugins/packaging/maven-shade-plugin</module>
-    <module>../../../plugins/packaging/maven-source-plugin</module>
-    <module>../../../plugins/packaging/maven-jlink-plugin</module>
-    <module>../../../plugins/packaging/maven-jmod-plugin</module>
+    <module>../../../../plugins/packaging/maven-ear-plugin</module>
+    <module>../../../../plugins/packaging/maven-ejb-plugin</module>
+    <module>../../../../plugins/packaging/maven-jar-plugin</module>
+    <module>../../../../plugins/packaging/maven-rar-plugin</module>
+    <module>../../../../plugins/packaging/maven-war-plugin</module>
+    <module>../../../../plugins/packaging/maven-acr-plugin</module>
+    <module>../../../../plugins/packaging/maven-shade-plugin</module>
+    <module>../../../../plugins/packaging/maven-source-plugin</module>
+    <module>../../../../plugins/packaging/maven-jlink-plugin</module>
+    <module>../../../../plugins/packaging/maven-jmod-plugin</module>
   </modules>
 </project>
diff --git a/plugins/pom.xml b/aggregator/plugins/pom.xml
similarity index 100%
rename from plugins/pom.xml
rename to aggregator/plugins/pom.xml
diff --git a/plugins/reporting/pom.xml b/aggregator/plugins/reporting/pom.xml
similarity index 64%
rename from plugins/reporting/pom.xml
rename to aggregator/plugins/reporting/pom.xml
index b5327ca..854a85b 100644
--- a/plugins/reporting/pom.xml
+++ b/aggregator/plugins/reporting/pom.xml
@@ -32,16 +32,16 @@ under the License.
 
   <name>Aggregator POM for Reporting Plugins</name>
   <modules>
-    <module>../../../plugins/reporting/maven-changelog-plugin</module>
-    <module>../../../plugins/reporting/maven-changes-plugin</module>
-    <module>../../../plugins/reporting/maven-checkstyle-plugin</module>
-    <module>../../../plugins/reporting/maven-doap-plugin</module>
-    <module>../../../plugins/reporting/maven-docck-plugin</module>
-    <module>../../../plugins/reporting/maven-javadoc-plugin</module>
-    <module>../../../plugins/reporting/maven-jdeps-plugin</module>
-    <module>../../../plugins/reporting/jxr</module>
-    <module>../../../plugins/reporting/maven-linkcheck-plugin</module>
-    <module>../../../plugins/reporting/maven-pmd-plugin</module>
-    <module>../../../plugins/reporting/maven-project-info-reports-plugin</module>
+    <module>../../../../plugins/reporting/maven-changelog-plugin</module>
+    <module>../../../../plugins/reporting/maven-changes-plugin</module>
+    <module>../../../../plugins/reporting/maven-checkstyle-plugin</module>
+    <module>../../../../plugins/reporting/maven-doap-plugin</module>
+    <module>../../../../plugins/reporting/maven-docck-plugin</module>
+    <module>../../../../plugins/reporting/maven-javadoc-plugin</module>
+    <module>../../../../plugins/reporting/maven-jdeps-plugin</module>
+    <module>../../../../plugins/reporting/jxr</module>
+    <module>../../../../plugins/reporting/maven-linkcheck-plugin</module>
+    <module>../../../../plugins/reporting/maven-pmd-plugin</module>
+    <module>../../../../plugins/reporting/maven-project-info-reports-plugin</module>
   </modules>
 </project>
diff --git a/plugins/tools/pom.xml b/aggregator/plugins/tools/pom.xml
similarity index 50%
rename from plugins/tools/pom.xml
rename to aggregator/plugins/tools/pom.xml
index 892ae67..c33cf4d 100644
--- a/plugins/tools/pom.xml
+++ b/aggregator/plugins/tools/pom.xml
@@ -32,26 +32,26 @@ under the License.
 
   <name>Aggregator POM for Tools Plugins</name>
   <modules>
-    <module>../../../plugins/tools/maven-antrun-plugin</module>
-    <module>../../../plugins/tools/archetype</module>
-    <module>../../../plugins/tools/maven-artifact-plugin</module>
-    <module>../../../plugins/tools/maven-assembly-plugin</module>
-    <module>../../../plugins/tools/maven-dependency-plugin</module>
-    <module>../../../plugins/tools/enforcer</module>
-    <module>../../../plugins/tools/maven-gpg-plugin</module>
-    <module>../../../plugins/tools/maven-help-plugin</module>
-    <module>../../../plugins/tools/maven-invoker-plugin</module>
-    <module>../../../plugins/tools/maven-jarsigner-plugin</module>
-    <module>../../../plugins/tools/maven-jdeprscan-plugin</module>
-    <module>../../../plugins/tools/maven-patch-plugin</module>
-    <module>../../../plugins/tools/maven-pdf-plugin</module>
-    <module>../../../plugins/tools/plugin-tools</module>
-    <module>../../../plugins/tools/release</module>
-    <module>../../../plugins/tools/maven-remote-resources-plugin</module>
-    <module>../../../plugins/tools/scm</module>
-    <module>../../../plugins/tools/maven-scm-publish-plugin</module>
-    <module>../../../plugins/tools/maven-scripting-plugin</module>
-    <module>../../../plugins/tools/maven-stage-plugin</module>
-    <module>../../../plugins/tools/maven-toolchains-plugin</module>
+    <module>../../../../plugins/tools/maven-antrun-plugin</module>
+    <module>../../../../plugins/tools/archetype</module>
+    <module>../../../../plugins/tools/maven-artifact-plugin</module>
+    <module>../../../../plugins/tools/maven-assembly-plugin</module>
+    <module>../../../../plugins/tools/maven-dependency-plugin</module>
+    <module>../../../../plugins/tools/enforcer</module>
+    <module>../../../../plugins/tools/maven-gpg-plugin</module>
+    <module>../../../../plugins/tools/maven-help-plugin</module>
+    <module>../../../../plugins/tools/maven-invoker-plugin</module>
+    <module>../../../../plugins/tools/maven-jarsigner-plugin</module>
+    <module>../../../../plugins/tools/maven-jdeprscan-plugin</module>
+    <module>../../../../plugins/tools/maven-patch-plugin</module>
+    <module>../../../../plugins/tools/maven-pdf-plugin</module>
+    <module>../../../../plugins/tools/plugin-tools</module>
+    <module>../../../../plugins/tools/release</module>
+    <module>../../../../plugins/tools/maven-remote-resources-plugin</module>
+    <module>../../../../plugins/tools/scm</module>
+    <module>../../../../plugins/tools/maven-scm-publish-plugin</module>
+    <module>../../../../plugins/tools/maven-scripting-plugin</module>
+    <module>../../../../plugins/tools/maven-stage-plugin</module>
+    <module>../../../../plugins/tools/maven-toolchains-plugin</module>
   </modules>
 </project>
diff --git a/pom.xml b/aggregator/pom.xml
similarity index 98%
rename from pom.xml
rename to aggregator/pom.xml
index 256c9bb..993fed6 100644
--- a/pom.xml
+++ b/aggregator/pom.xml
@@ -64,7 +64,7 @@ under the License.
     <module>shared</module>
     <!--module>sisu</module--><!-- disabled: failing for unknown reason -->
     <module>studies</module>
-    <module>../site</module>
+    <module>../../site</module>
     <module>svn</module>
   </modules>
 </project>
diff --git a/shared/pom.xml b/aggregator/shared/pom.xml
similarity index 55%
rename from shared/pom.xml
rename to aggregator/shared/pom.xml
index 89d4924..e84f4d7 100644
--- a/shared/pom.xml
+++ b/aggregator/shared/pom.xml
@@ -32,26 +32,26 @@ under the License.
 
   <name>Aggregator POM for Shared Components</name>
   <modules>
-    <module>../../shared/archiver</module>
-    <module>../../shared/artifact-transfer</module>
-    <module>../../shared/common-artifact-filters</module>
-    <module>../../shared/dependency-analyzer</module>
-    <module>../../shared/dependency-tree</module>
-    <module>../../shared/file-management</module>
-    <module>../../shared/filtering</module>
-    <module>../../shared/invoker</module>
-    <module>../../shared/jarsigner</module>
-    <module>../../shared/mapping</module>
-    <module>../../shared/project-utils</module>
-    <module>../../shared/reporting-api</module>
-    <module>../../shared/reporting-exec</module>
-    <module>../../shared/reporting-impl</module>
-    <module>../../shared/script-interpreter</module>
-    <module>../../shared/shared-incremental</module>
-    <module>../../shared/shared-io</module>
-    <module>../../shared/shared-jar</module>
-    <module>../../shared/shared-resources</module>
-    <module>../../shared/shared-utils</module>
-    <module>../../shared/verifier</module>
+    <module>../../../shared/archiver</module>
+    <module>../../../shared/artifact-transfer</module>
+    <module>../../../shared/common-artifact-filters</module>
+    <module>../../../shared/dependency-analyzer</module>
+    <module>../../../shared/dependency-tree</module>
+    <module>../../../shared/file-management</module>
+    <module>../../../shared/filtering</module>
+    <module>../../../shared/invoker</module>
+    <module>../../../shared/jarsigner</module>
+    <module>../../../shared/mapping</module>
+    <module>../../../shared/project-utils</module>
+    <module>../../../shared/reporting-api</module>
+    <module>../../../shared/reporting-exec</module>
+    <module>../../../shared/reporting-impl</module>
+    <module>../../../shared/script-interpreter</module>
+    <module>../../../shared/shared-incremental</module>
+    <module>../../../shared/shared-io</module>
+    <module>../../../shared/shared-jar</module>
+    <module>../../../shared/shared-resources</module>
+    <module>../../../shared/shared-utils</module>
+    <module>../../../shared/verifier</module>
   </modules>
 </project>
diff --git a/sisu/pom.xml b/aggregator/sisu/pom.xml
similarity index 91%
rename from sisu/pom.xml
rename to aggregator/sisu/pom.xml
index 254db46..7178d8d 100644
--- a/sisu/pom.xml
+++ b/aggregator/sisu/pom.xml
@@ -33,8 +33,8 @@ under the License.
   <name>Aggregator POM for Sisu</name>
   <modules>
     <!--module>../../sisu/sisu</module-->
-    <module>../../sisu/inject</module>
-    <module>../../sisu/plexus</module>
-    <module>../../sisu/mojos</module>
+    <module>../../../sisu/inject</module>
+    <module>../../../sisu/plexus</module>
+    <module>../../../sisu/mojos</module>
   </modules>
 </project>
diff --git a/studies/pom.xml b/aggregator/studies/pom.xml
similarity index 77%
rename from studies/pom.xml
rename to aggregator/studies/pom.xml
index 90442db..2c6e263 100644
--- a/studies/pom.xml
+++ b/aggregator/studies/pom.xml
@@ -32,12 +32,12 @@ under the License.
 
   <name>Aggregator POM for Maven Studies</name>
   <modules>
-    <module>../../studies/consumer-pom</module>
-    <module>../../studies/maven-basedir-filesystem</module>
-    <module>../../studies/maven-ci-extension</module>
-    <module>../../studies/maven-default-plugins</module>
-    <module>../../studies/maven-eventsound-extension</module>
-    <module>../../studies/maven-extension-demo</module>
-    <module>../../studies/maven-xml</module>
+    <module>../../../studies/consumer-pom</module>
+    <module>../../../studies/maven-basedir-filesystem</module>
+    <module>../../../studies/maven-ci-extension</module>
+    <module>../../../studies/maven-default-plugins</module>
+    <module>../../../studies/maven-eventsound-extension</module>
+    <module>../../../studies/maven-extension-demo</module>
+    <module>../../../studies/maven-xml</module>
   </modules>
 </project>
diff --git a/svn/pom.xml b/aggregator/svn/pom.xml
similarity index 89%
rename from svn/pom.xml
rename to aggregator/svn/pom.xml
index 4c45742..f403bfd 100644
--- a/svn/pom.xml
+++ b/aggregator/svn/pom.xml
@@ -32,10 +32,10 @@ under the License.
 
   <name>Aggregator POM for artifacts still in SVN</name>
   <modules>
-    <module>../../svn/resources</module>
-    <module>../../svn/repository-tools</module>
+    <module>../../../svn/resources</module>
+    <module>../../../svn/repository-tools</module>
     <!--module>../../svn/sandbox</module-->
     <!--module>../../svn/doxia-ide/eclipse/doxia-osgi</module>
-    <module>../../svn/doxia-ide/eclipse/eclipse-plugins</module-->
+    <module>../../../svn/doxia-ide/eclipse/eclipse-plugins</module-->
   </modules>
 </project>