From 899bf24f1cd52a8a3ee11bb968a8c5fe0b7e8f5c Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.2022@distributedrebirth.love>
Date: Sat, 15 Jun 2024 16:28:25 +0200
Subject: [PATCH] Flatten tools modules

---
 pom.xml                                       |  3 ++-
 x4o-driver/pom.xml                            |  2 +-
 x4o-eld-doc/pom.xml                           |  2 +-
 x4o-meta/pom.xml                              |  3 +--
 .../.project                                  |  0
 .../pom.xml                                   |  6 ++----
 .../java/org/x4o/tool/ant/plugin/X4OTask.java |  0
 .../org/x4o/tool/ant/plugin/package-info.java |  0
 .../plugin/X4OWriteLanguageDocTaskTest.java   |  0
 .../X4OWriteLanguageSchemaTaskTest.java       |  0
 .../junit/test-write-language-doc.xml         |  0
 .../junit/test-write-language-schema.xml      |  0
 .../.project                                  |  0
 .../pom.xml                                   |  6 ++----
 .../maven/plugin/X4OLanguageTaskMojo.java     |  0
 .../x4o/tool/maven/plugin/package-info.java   |  0
 .../maven/plugin/X4OLanguageTaskMojoTest.java |  0
 .../resources/junit/test-plugin-conf-all.pom  |  0
 .../resources/junit/test-plugin-conf-lang.pom |  0
 .../resources/junit/test-plugin-defaults.pom  |  0
 x4o-tool/pom.xml                              | 19 -------------------
 21 files changed, 9 insertions(+), 32 deletions(-)
 rename {x4o-tool/x4o-tool-ant-plugin => x4o-tool-ant-plugin}/.project (100%)
 rename {x4o-tool/x4o-tool-ant-plugin => x4o-tool-ant-plugin}/pom.xml (98%)
 rename {x4o-tool/x4o-tool-ant-plugin => x4o-tool-ant-plugin}/src/main/java/org/x4o/tool/ant/plugin/X4OTask.java (100%)
 rename {x4o-tool/x4o-tool-ant-plugin => x4o-tool-ant-plugin}/src/main/java/org/x4o/tool/ant/plugin/package-info.java (100%)
 rename {x4o-tool/x4o-tool-ant-plugin => x4o-tool-ant-plugin}/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageDocTaskTest.java (100%)
 rename {x4o-tool/x4o-tool-ant-plugin => x4o-tool-ant-plugin}/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageSchemaTaskTest.java (100%)
 rename {x4o-tool/x4o-tool-ant-plugin => x4o-tool-ant-plugin}/src/test/resources/junit/test-write-language-doc.xml (100%)
 rename {x4o-tool/x4o-tool-ant-plugin => x4o-tool-ant-plugin}/src/test/resources/junit/test-write-language-schema.xml (100%)
 rename {x4o-tool/x4o-tool-maven-plugin => x4o-tool-maven-plugin}/.project (100%)
 rename {x4o-tool/x4o-tool-maven-plugin => x4o-tool-maven-plugin}/pom.xml (93%)
 rename {x4o-tool/x4o-tool-maven-plugin => x4o-tool-maven-plugin}/src/main/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojo.java (100%)
 rename {x4o-tool/x4o-tool-maven-plugin => x4o-tool-maven-plugin}/src/main/java/org/x4o/tool/maven/plugin/package-info.java (100%)
 rename {x4o-tool/x4o-tool-maven-plugin => x4o-tool-maven-plugin}/src/test/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojoTest.java (100%)
 rename {x4o-tool/x4o-tool-maven-plugin => x4o-tool-maven-plugin}/src/test/resources/junit/test-plugin-conf-all.pom (100%)
 rename {x4o-tool/x4o-tool-maven-plugin => x4o-tool-maven-plugin}/src/test/resources/junit/test-plugin-conf-lang.pom (100%)
 rename {x4o-tool/x4o-tool-maven-plugin => x4o-tool-maven-plugin}/src/test/resources/junit/test-plugin-defaults.pom (100%)
 delete mode 100644 x4o-tool/pom.xml

diff --git a/pom.xml b/pom.xml
index 8ec5366..f507529 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,8 @@
 		<module>x4o-eld-doc</module>
 		<module>x4o-html</module>
 		<module>x4o-meta</module>
-		<module>x4o-tool</module>
+		<module>x4o-tool-ant-plugin</module>
+		<module>x4o-tool-maven-plugin</module>
 	</modules>
 	<properties>
 
diff --git a/x4o-driver/pom.xml b/x4o-driver/pom.xml
index 2f8e9b3..b5b8071 100644
--- a/x4o-driver/pom.xml
+++ b/x4o-driver/pom.xml
@@ -2,8 +2,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>x4o</artifactId>
 		<groupId>org.x4o</groupId>
+		<artifactId>x4o</artifactId>
 		<version>0.8.7-SNAPSHOT</version>
 	</parent>
 	<artifactId>x4o-driver</artifactId>
diff --git a/x4o-eld-doc/pom.xml b/x4o-eld-doc/pom.xml
index 4a7d3d4..bd496a1 100644
--- a/x4o-eld-doc/pom.xml
+++ b/x4o-eld-doc/pom.xml
@@ -2,8 +2,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>x4o</artifactId>
 		<groupId>org.x4o</groupId>
+		<artifactId>x4o</artifactId>
 		<version>0.8.7-SNAPSHOT</version>
 	</parent>
 	<artifactId>x4o-eld-doc</artifactId>
diff --git a/x4o-meta/pom.xml b/x4o-meta/pom.xml
index b28c4d0..c929fec 100644
--- a/x4o-meta/pom.xml
+++ b/x4o-meta/pom.xml
@@ -2,10 +2,9 @@
 	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>
-		<artifactId>x4o</artifactId>
 		<groupId>org.x4o</groupId>
+		<artifactId>x4o</artifactId>
 		<version>0.8.7-SNAPSHOT</version>
-		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>x4o-meta</artifactId>
 	<packaging>jar</packaging>
diff --git a/x4o-tool/x4o-tool-ant-plugin/.project b/x4o-tool-ant-plugin/.project
similarity index 100%
rename from x4o-tool/x4o-tool-ant-plugin/.project
rename to x4o-tool-ant-plugin/.project
diff --git a/x4o-tool/x4o-tool-ant-plugin/pom.xml b/x4o-tool-ant-plugin/pom.xml
similarity index 98%
rename from x4o-tool/x4o-tool-ant-plugin/pom.xml
rename to x4o-tool-ant-plugin/pom.xml
index 2c27b66..0fbc165 100644
--- a/x4o-tool/x4o-tool-ant-plugin/pom.xml
+++ b/x4o-tool-ant-plugin/pom.xml
@@ -2,8 +2,8 @@
 	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.x4o.tool</groupId>
-		<artifactId>x4o-tool</artifactId>
+		<groupId>org.x4o</groupId>
+		<artifactId>x4o</artifactId>
 		<version>0.8.7-SNAPSHOT</version>
 	</parent>
 	<artifactId>x4o-tool-ant-plugin</artifactId>
@@ -13,12 +13,10 @@
 		<dependency>
 			<groupId>org.x4o</groupId>
 			<artifactId>x4o-driver</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.x4o</groupId>
 			<artifactId>x4o-eld-doc</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ant</groupId>
diff --git a/x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/X4OTask.java b/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/X4OTask.java
similarity index 100%
rename from x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/X4OTask.java
rename to x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/X4OTask.java
diff --git a/x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/package-info.java b/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/package-info.java
similarity index 100%
rename from x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/package-info.java
rename to x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/package-info.java
diff --git a/x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageDocTaskTest.java b/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageDocTaskTest.java
similarity index 100%
rename from x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageDocTaskTest.java
rename to x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageDocTaskTest.java
diff --git a/x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageSchemaTaskTest.java b/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageSchemaTaskTest.java
similarity index 100%
rename from x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageSchemaTaskTest.java
rename to x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageSchemaTaskTest.java
diff --git a/x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-doc.xml b/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-doc.xml
similarity index 100%
rename from x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-doc.xml
rename to x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-doc.xml
diff --git a/x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-schema.xml b/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-schema.xml
similarity index 100%
rename from x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-schema.xml
rename to x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-schema.xml
diff --git a/x4o-tool/x4o-tool-maven-plugin/.project b/x4o-tool-maven-plugin/.project
similarity index 100%
rename from x4o-tool/x4o-tool-maven-plugin/.project
rename to x4o-tool-maven-plugin/.project
diff --git a/x4o-tool/x4o-tool-maven-plugin/pom.xml b/x4o-tool-maven-plugin/pom.xml
similarity index 93%
rename from x4o-tool/x4o-tool-maven-plugin/pom.xml
rename to x4o-tool-maven-plugin/pom.xml
index 7598c44..ef955fa 100644
--- a/x4o-tool/x4o-tool-maven-plugin/pom.xml
+++ b/x4o-tool-maven-plugin/pom.xml
@@ -2,8 +2,8 @@
 	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.x4o.tool</groupId>
-		<artifactId>x4o-tool</artifactId>
+		<groupId>org.x4o</groupId>
+		<artifactId>x4o</artifactId>
 		<version>0.8.7-SNAPSHOT</version>
 	</parent>
 	<artifactId>x4o-tool-maven-plugin</artifactId>
@@ -14,12 +14,10 @@
 		<dependency>
 			<groupId>org.x4o</groupId>
 			<artifactId>x4o-driver</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.x4o</groupId>
 			<artifactId>x4o-eld-doc</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
diff --git a/x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojo.java b/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojo.java
similarity index 100%
rename from x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojo.java
rename to x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojo.java
diff --git a/x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/package-info.java b/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/package-info.java
similarity index 100%
rename from x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/package-info.java
rename to x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/package-info.java
diff --git a/x4o-tool/x4o-tool-maven-plugin/src/test/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojoTest.java b/x4o-tool-maven-plugin/src/test/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojoTest.java
similarity index 100%
rename from x4o-tool/x4o-tool-maven-plugin/src/test/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojoTest.java
rename to x4o-tool-maven-plugin/src/test/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojoTest.java
diff --git a/x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-all.pom b/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-all.pom
similarity index 100%
rename from x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-all.pom
rename to x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-all.pom
diff --git a/x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-lang.pom b/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-lang.pom
similarity index 100%
rename from x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-lang.pom
rename to x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-lang.pom
diff --git a/x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-defaults.pom b/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-defaults.pom
similarity index 100%
rename from x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-defaults.pom
rename to x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-defaults.pom
diff --git a/x4o-tool/pom.xml b/x4o-tool/pom.xml
deleted file mode 100644
index fda180d..0000000
--- a/x4o-tool/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<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>
-		<artifactId>x4o</artifactId>
-		<groupId>org.x4o</groupId>
-		<version>0.8.7-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>x4o-tool</artifactId>
-	<groupId>org.x4o.tool</groupId>
-	<packaging>pom</packaging>
-	<name>x4o-tool</name>
-	<description>x4o tools to use and plugin for other applications</description>
-	<modules>
-		<module>x4o-tool-ant-plugin</module>
-		<module>x4o-tool-maven-plugin</module>
-	</modules>
-</project>
\ No newline at end of file