From a8c2c653000e9e920e3f1c92487dd1201a8c627c Mon Sep 17 00:00:00 2001
From: Gerd Aschemann <gerd@aschemann.net>
Date: Fri, 23 May 2025 18:02:15 +0200
Subject: [PATCH 1/3] Drop archived repositories from sync and build

according to changes from support-and-care/maven-support-and-care#77
---
 aggregator/plexus/pom.xml | 2 --
 default.xml               | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/aggregator/plexus/pom.xml b/aggregator/plexus/pom.xml
index 4dcd2b2..bdf3420 100644
--- a/aggregator/plexus/pom.xml
+++ b/aggregator/plexus/pom.xml
@@ -36,8 +36,6 @@ under the License.
     <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/xml</module>
diff --git a/default.xml b/default.xml
index 78a0aff..b3dd1be 100644
--- a/default.xml
+++ b/default.xml
@@ -88,7 +88,6 @@
   <project path='plugins/tools/maven-toolchains-plugin'     name='maven-toolchains-plugin.git' />
 
   <project path='shared/archiver'                           name='maven-archiver.git' />
-  <project path='shared/artifact-transfer'                  name='maven-artifact-transfer.git' />
   <project path='shared/common-artifact-filters'            name='maven-common-artifact-filters.git' />
   <project path='shared/dependency-analyzer'                name='maven-dependency-analyzer.git' />
   <project path='shared/dependency-tree'                    name='maven-dependency-tree.git' />
@@ -97,7 +96,6 @@
   <project path='shared/invoker'                            name='maven-invoker.git' />
   <project path='shared/jarsigner'                          name='maven-jarsigner.git' />
   <project path='shared/mapping'                            name='maven-mapping.git' />
-  <project path='shared/project-utils'                      name='maven-project-utils.git' />
   <project path='shared/reporting-api'                      name='maven-reporting-api.git' />
   <project path='shared/reporting-exec'                     name='maven-reporting-exec.git' />
   <project path='shared/reporting-impl'                     name='maven-reporting-impl.git' />
@@ -139,10 +137,6 @@
   <project path='studies/maven-eventsound-extension'        name='maven-studies.git' revision="maven-eventsound-extension" />
   <project path='studies/maven-extension-demo'              name='maven-studies.git' revision="maven-extension-demo" />
 
-  <project path='svn/repository-tools'                      name='maven-repository-tools.git'    revision='trunk' />
-  <project path='svn/sandbox'                               name='maven-sandbox.git'             revision='trunk' />
-  <project path='svn/doxia-ide'                             name='maven-doxia-ide.git'           revision='trunk' />
-
   <project path='plexus/codehaus-plexus.github.io'          name='codehaus-plexus.github.io.git' remote='plexus' revision='source' />
   <project path='plexus/modello'                            name='modello.git'                   remote='plexus' />
   <project path='plexus/classworlds'                        name='plexus-classworlds.git'        remote='plexus' />
@@ -158,10 +152,7 @@
   <project path='plexus/components/languages'               name='plexus-languages.git'          remote='plexus' />
   <project path='plexus/components/resources'               name='plexus-resources.git'          remote='plexus' />
   <project path='plexus/components/sec-dispatcher'          name='plexus-sec-dispatcher.git'     remote='plexus' />
-  <project path='plexus/components/swizzle'                 name='plexus-swizzle.git'            remote='plexus' />
   <project path='plexus/components/velocity'                name='plexus-velocity.git'           remote='plexus' />
-  <project path='plexus/plexus-containers'                  name='plexus-containers.git'         remote='plexus' />
-  <project path='plexus/pom/components'                     name='plexus-components.git'         remote='plexus' />
   <project path='plexus/pom/plexus'                         name='plexus-pom.git'                remote='plexus' />
   <project path='plexus/testing'                            name='plexus-testing.git'            remote='plexus' />
   <project path='plexus/utils'                              name='plexus-utils.git'              remote='plexus' />

From 14e70459e1493457d00310ffc75ae16e1d029e05 Mon Sep 17 00:00:00 2001
From: Gerd Aschemann <gerd@aschemann.net>
Date: Fri, 23 May 2025 18:51:34 +0200
Subject: [PATCH 2/3] Add Plexus .github

as it contains shared GitHub action workflow components
---
 default.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.xml b/default.xml
index b3dd1be..f40c8b9 100644
--- a/default.xml
+++ b/default.xml
@@ -137,6 +137,7 @@
   <project path='studies/maven-eventsound-extension'        name='maven-studies.git' revision="maven-eventsound-extension" />
   <project path='studies/maven-extension-demo'              name='maven-studies.git' revision="maven-extension-demo" />
 
+  <project path='plexus/.github'                            name='.github.git'                   remote='plexus' />
   <project path='plexus/codehaus-plexus.github.io'          name='codehaus-plexus.github.io.git' remote='plexus' revision='source' />
   <project path='plexus/modello'                            name='modello.git'                   remote='plexus' />
   <project path='plexus/classworlds'                        name='plexus-classworlds.git'        remote='plexus' />

From ff1c5f68faeb46980d2a802811eac5e610bf163f Mon Sep 17 00:00:00 2001
From: Gerd Aschemann <gerd@aschemann.net>
Date: Fri, 23 May 2025 23:16:44 +0200
Subject: [PATCH 3/3] Further align modules, docs and repo manifest

In particular some more components are archived ...
---
 README.md                            | 30 ++++++++++++++++++----------
 aggregator/plexus/components/pom.xml | 11 ++++------
 aggregator/plexus/pom.xml            |  5 +++--
 default.xml                          |  2 --
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index a3218b1..44ca147 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ repo sync
 repo start master --all
 ```
 
-Resulting directory tree looks like:
+The resulting directory tree looks like:
 
 ```
 |-- core
@@ -32,12 +32,18 @@ Resulting directory tree looks like:
 |   |-- site
 |   |-- sitetools
 |   `-- tools
+|       |-- converter
+|       |-- doxia-book-maven-plugin
+|       |-- doxia-book-renderer
+|       `-- linkcheck
 |-- misc
 |   |-- archetypes
 |   |-- dist-tool
 |   |-- gh-actions-shared
 |   |-- indexer
 |   |-- jenkins
+|   |   |-- env
+|   |   `-- lib
 |   |-- plugin-testing
 |   |-- pom
 |   |   |-- apache
@@ -48,13 +54,13 @@ Resulting directory tree looks like:
 |   |   `-- fluido
 |   `-- wagon
 |-- plexus
+|   |-- .github
 |   |-- classworlds
 |   |-- codehaus-plexus.github.io
 |   |-- components
 |   |   |-- archiver
 |   |   |-- cipher
 |   |   |-- compiler
-|   |   |-- digest
 |   |   |-- i18n
 |   |   |-- interactivity
 |   |   |-- interpolation
@@ -62,12 +68,13 @@ Resulting directory tree looks like:
 |   |   |-- languages
 |   |   |-- resources
 |   |   |-- sec-dispatcher
-|   |   |-- testing
 |   |   `-- velocity
 |   |-- modello
 |   |-- plexus-containers
 |   |-- pom
+|   |   `-- plexus
 |   |-- utils
+|   |-- testing
 |   `-- xml
 |-- plugins
 |   |-- core
@@ -123,7 +130,6 @@ Resulting directory tree looks like:
 |       `-- scm
 |-- shared
 |   |-- archiver
-|   |-- artifact-transfer
 |   |-- common-artifact-filters
 |   |-- dependency-analyzer
 |   |-- dependency-tree
@@ -132,7 +138,6 @@ Resulting directory tree looks like:
 |   |-- invoker
 |   |-- jarsigner
 |   |-- mapping
-|   |-- project-utils
 |   |-- reporting-api
 |   |-- reporting-exec
 |   |-- reporting-impl
@@ -148,11 +153,16 @@ Resulting directory tree looks like:
 |-- site
 |-- sources
 |   `-- aggregator
-|-- studies
-`-- svn
-    |-- doxia-ide
-    |-- repository-tools
-    `-- sandbox
+`-- studies
+    |-- consumer-pom
+    |-- master
+    |-- maven-basedir-filesystem
+    |-- maven-ci-extension
+    |-- maven-default-plugins
+    |-- maven-eventsound-extension
+    `-- maven-extension-demo
+
+
 ```
 
 Then simply use the content in this tree with normal `git` commands.
diff --git a/aggregator/plexus/components/pom.xml b/aggregator/plexus/components/pom.xml
index dd273bc..5d8cb92 100644
--- a/aggregator/plexus/components/pom.xml
+++ b/aggregator/plexus/components/pom.xml
@@ -32,19 +32,16 @@ under the License.
 
   <name>Aggregator POM for Plexus Components</name>
   <modules>
+    <module>../../../../plexus/components/archiver</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/interpolation</module>
     <module>../../../../plexus/components/io</module>
+    <module>../../../../plexus/components/languages</module>
     <module>../../../../plexus/components/resources</module>
-    <!--module>../../../plexus/components/swizzle</module-->
+    <module>../../../../plexus/components/sec-dispatcher</module>
     <module>../../../../plexus/components/velocity</module>
   </modules>
 </project>
diff --git a/aggregator/plexus/pom.xml b/aggregator/plexus/pom.xml
index bdf3420..205ccb5 100644
--- a/aggregator/plexus/pom.xml
+++ b/aggregator/plexus/pom.xml
@@ -32,11 +32,12 @@ under the License.
 
   <name>Aggregator POM for Plexus</name>
   <modules>
-    <module>../../../plexus/classworlds</module>
     <module>../../../plexus/codehaus-plexus.github.io</module>
-    <module>components</module>
     <module>../../../plexus/modello</module>
+    <module>../../../plexus/classworlds</module>
+    <module>components</module>
     <module>../../../plexus/pom/plexus</module>
+    <module>../../../plexus/testing</module>
     <module>../../../plexus/utils</module>
     <module>../../../plexus/xml</module>
   </modules>
diff --git a/default.xml b/default.xml
index f40c8b9..d6b37f6 100644
--- a/default.xml
+++ b/default.xml
@@ -143,9 +143,7 @@
   <project path='plexus/classworlds'                        name='plexus-classworlds.git'        remote='plexus' />
   <project path='plexus/components/archiver'                name='plexus-archiver.git'           remote='plexus' />
   <project path='plexus/components/cipher'                  name='plexus-cipher.git'             remote='plexus' />
-  <project path='plexus/components/cli'                     name='plexus-cli.git'                remote='plexus' />
   <project path='plexus/components/compiler'                name='plexus-compiler.git'           remote='plexus' />
-  <project path='plexus/components/digest'                  name='plexus-digest.git'             remote='plexus' />
   <project path='plexus/components/i18n'                    name='plexus-i18n.git'               remote='plexus' />
   <project path='plexus/components/interactivity'           name='plexus-interactivity.git'      remote='plexus' />
   <project path='plexus/components/interpolation'           name='plexus-interpolation.git'      remote='plexus' />