From b23329a222db603f91809a33e62eb9e44cd61ffb Mon Sep 17 00:00:00 2001
From: Andrzej Jarmoniuk <gh@jarmoniuk.nl>
Date: Sat, 18 Feb 2023 20:34:15 +0100
Subject: [PATCH] Issue #74: Going back to maven-embedder internal

---
 pom.xml                                       |   1 -
 versions-common/pom.xml                       |   4 +
 versions-model-core-extensions/pom.xml        |  63 ----------
 .../src/main/mdo/core-extensions.mdo          | 118 ------------------
 4 files changed, 4 insertions(+), 182 deletions(-)
 delete mode 100644 versions-model-core-extensions/pom.xml
 delete mode 100644 versions-model-core-extensions/src/main/mdo/core-extensions.mdo

diff --git a/pom.xml b/pom.xml
index 6cd63535bf..43017a9a05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,6 @@
     <module>versions-maven-plugin</module>
     <module>versions-model-report</module>
     <module>versions-model</module>
-    <module>versions-model-core-extensions</module>
     <module>versions-test</module>
   </modules>
 
diff --git a/versions-common/pom.xml b/versions-common/pom.xml
index f6e1188af0..763eb60e1b 100644
--- a/versions-common/pom.xml
+++ b/versions-common/pom.xml
@@ -38,6 +38,10 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-embedder</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-provider-api</artifactId>
diff --git a/versions-model-core-extensions/pom.xml b/versions-model-core-extensions/pom.xml
deleted file mode 100644
index 3acd01a6f4..0000000000
--- a/versions-model-core-extensions/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.codehaus.mojo.versions</groupId>
-    <artifactId>versions</artifactId>
-    <version>2.15.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>versions-model-core-extensions</artifactId>
-  <name>Versions Model Core Extensions</name>
-  <description>Model classes and parser for Core Extensions</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <models>
-            <model>src/main/mdo/core-extensions.mdo</model>
-          </models>
-          <version>1.1.0</version>
-        </configuration>
-        <executions>
-          <execution>
-            <id>generate-java-classes</id>
-            <goals>
-              <goal>xpp3-reader</goal>
-              <goal>java</goal>
-            </goals>
-            <phase>generate-sources</phase>
-          </execution>
-          <execution>
-            <id>generate-site-doc</id>
-            <goals>
-              <goal>xdoc</goal>
-            </goals>
-            <phase>pre-site</phase>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-    </plugins>
-
-  </build>
-
-</project>
diff --git a/versions-model-core-extensions/src/main/mdo/core-extensions.mdo b/versions-model-core-extensions/src/main/mdo/core-extensions.mdo
deleted file mode 100644
index 32ee24e244..0000000000
--- a/versions-model-core-extensions/src/main/mdo/core-extensions.mdo
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Copyright MojoHaus and Contributors
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0 http://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
-  xml.namespace="http://maven.apache.org/EXTENSIONS/${version}"
-  xml.schemaLocation="http://maven.apache.org/xsd/core-extensions-${version}.xsd">
-
-  <id>core-extensions</id>
-  <name>CoreExtensions</name>
-  <description><![CDATA[
-  <p>This is a reference for the Core Extensions descriptor.</p>
-  <p>The default location for the Core Extensions descriptor file is <code>${maven.projectBasedir}/.mvn/extensions.xml</code></p>
-  ]]></description>
-
-  <defaults>
-    <default>
-      <key>package</key>
-      <value>org.apache.maven.cli.internal.extension.model</value>
-    </default>
-  </defaults>
-
-  <classes>
-    <class rootElement="true" xml.tagName="extensions" xsd.compositor="sequence">
-      <name>CoreExtensions</name>
-      <description>Extensions to load.</description>
-      <version>1.0.0+</version>
-      <fields>
-        <field>
-          <name>extensions</name>
-          <description>A set of build extensions to use from this project.</description>
-          <version>1.0.0+</version>
-          <association xml.itemsStyle="flat">
-            <type>CoreExtension</type>
-            <multiplicity>*</multiplicity>
-          </association>
-        </field>
-      </fields>
-    </class>
-    <class xml.tagName="extension">
-      <name>CoreExtension</name>
-      <description>Describes a build extension to utilise.</description>
-      <version>1.0.0+</version>
-      <fields>
-        <field>
-          <name>groupId</name>
-          <description>The group ID of the extension's artifact.</description>
-          <version>1.0.0+</version>
-          <required>true</required>
-          <type>String</type>
-        </field>
-        <field>
-          <name>artifactId</name>
-          <description>The artifact ID of the extension.</description>
-          <version>1.0.0+</version>
-          <required>true</required>
-          <type>String</type>
-        </field>
-        <field>
-          <name>version</name>
-          <description>The version of the extension.</description>
-          <version>1.0.0+</version>
-          <required>true</required>
-          <type>String</type>
-        </field>
-        <field>
-          <name>classLoadingStrategy</name>
-          <description>The class loading strategy: 'self-first' (the default), 'parent-first' (loads classes from the parent, then from the extension) or 'plugin' (follows the rules from extensions defined as plugins).</description>
-          <version>1.1.0+</version>
-          <defaultValue>self-first</defaultValue>
-          <required>false</required>
-          <type>String</type>
-        </field>
-      </fields>
-      <codeSegments>
-        <codeSegment>
-          <version>1.0.0+</version>
-          <code>
-            <![CDATA[
-    /**
-     * Gets the identifier of the extension.
-     *
-     * @return The extension id in the form {@code <groupId>:<artifactId>:<version>}, never {@code null}.
-     */
-    public String getId()
-    {
-        StringBuilder id = new StringBuilder( 128 );
-
-        id.append( ( getGroupId() == null ) ? "[unknown-group-id]" : getGroupId() );
-        id.append( ":" );
-        id.append( ( getArtifactId() == null ) ? "[unknown-artifact-id]" : getArtifactId() );
-        id.append( ":" );
-        id.append( ( getVersion() == null ) ? "[unknown-version]" : getVersion() );
-
-        return id.toString();
-    }
-            ]]>
-          </code>
-        </codeSegment>
-      </codeSegments>
-    </class>
-  </classes>
-</model>