Merge pull request #182 from hazendaz/master

[reorg] Properly name all the folder and fix test module name
revelc · Apr 5, 2024 · e685c2d · e685c2d
2 parents e9738ce + f7973a4
commit e685c2d
Show file tree

Hide file tree

Showing 28 changed files with 11 additions and 15 deletions.
diff --git a/...urator/formatter.feature/build.properties → ...c.code.formatter.feature/build.properties b/...urator/formatter.feature/build.properties → ...c.code.formatter.feature/build.properties
diff --git a/...ator/formatter.feature/feature.properties → ...code.formatter.feature/feature.properties b/...ator/formatter.feature/feature.properties → ...code.formatter.feature/feature.properties
diff --git a/...onfigurator/formatter.feature/feature.xml → ...revelc.code.formatter.feature/feature.xml b/...onfigurator/formatter.feature/feature.xml → ...revelc.code.formatter.feature/feature.xml
diff --git a/...nfigurator/formatter.feature/license.html → ...evelc.code.formatter.feature/license.html b/...nfigurator/formatter.feature/license.html → ...evelc.code.formatter.feature/license.html
diff --git a/m2e-configurator/formatter.feature/pom.xml → net.revelc.code.formatter.feature/pom.xml b/m2e-configurator/formatter.feature/pom.xml → net.revelc.code.formatter.feature/pom.xml
@@ -19,9 +19,8 @@
 
   <parent>
     <groupId>net.revelc.code.formatter</groupId>
-    <artifactId>formatter-m2e-configurator-parent</artifactId>
+    <artifactId>formatter-m2e-configurator</artifactId>
     <version>2.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>net.revelc.code.formatter.feature</artifactId>

diff --git a/m2e-configurator/formatter.site/category.xml → net.revelc.code.formatter.site/category.xml b/m2e-configurator/formatter.site/category.xml → net.revelc.code.formatter.site/category.xml
diff --git a/m2e-configurator/formatter.site/pom.xml → net.revelc.code.formatter.site/pom.xml b/m2e-configurator/formatter.site/pom.xml → net.revelc.code.formatter.site/pom.xml
@@ -19,9 +19,8 @@
 
   <parent>
     <groupId>net.revelc.code.formatter</groupId>
-    <artifactId>formatter-m2e-configurator-parent</artifactId>
+    <artifactId>formatter-m2e-configurator</artifactId>
     <version>2.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>net.revelc.code.formatter.site</artifactId>

diff --git a/...ator/formatter.tests/META-INF/MANIFEST.MF → ....code.formatter.test/META-INF/MANIFEST.MF b/...ator/formatter.tests/META-INF/MANIFEST.MF → ....code.formatter.test/META-INF/MANIFEST.MF
diff --git a/...igurator/formatter.tests/build.properties → ...velc.code.formatter.test/build.properties b/...igurator/formatter.tests/build.properties → ...velc.code.formatter.test/build.properties
diff --git a/.../formatter.tests/plugin_customization.ini → ...e.formatter.test/plugin_customization.ini b/.../formatter.tests/plugin_customization.ini → ...e.formatter.test/plugin_customization.ini
diff --git a/m2e-configurator/formatter.tests/pom.xml → net.revelc.code.formatter.test/pom.xml b/m2e-configurator/formatter.tests/pom.xml → net.revelc.code.formatter.test/pom.xml
@@ -20,12 +20,11 @@
 
   <parent>
     <groupId>net.revelc.code.formatter</groupId>
-    <artifactId>formatter-m2e-configurator-parent</artifactId>
+    <artifactId>formatter-m2e-configurator</artifactId>
     <version>2.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
-  <artifactId>net.revelc.code.formatter.tests</artifactId>
+  <artifactId>net.revelc.code.formatter.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
 </project>
diff --git a/...dular-sample/modular-sample-child/pom.xml → ...dular-sample/modular-sample-child/pom.xml b/...dular-sample/modular-sample-child/pom.xml → ...dular-sample/modular-sample-child/pom.xml
diff --git a/...ter.tests/projects/modular-sample/pom.xml → ...tter.test/projects/modular-sample/pom.xml b/...ter.tests/projects/modular-sample/pom.xml → ...tter.test/projects/modular-sample/pom.xml
diff --git a/...ple/src/config/eclipse/formatter/java.xml → ...ple/src/config/eclipse/formatter/java.xml b/...ple/src/config/eclipse/formatter/java.xml → ...ple/src/config/eclipse/formatter/java.xml
diff --git a/...c/config/eclipse/formatter/javascript.xml → ...c/config/eclipse/formatter/javascript.xml b/...c/config/eclipse/formatter/javascript.xml → ...c/config/eclipse/formatter/javascript.xml
diff --git a/...tter.tests/projects/simple-sample/pom.xml → ...atter.test/projects/simple-sample/pom.xml b/...tter.tests/projects/simple-sample/pom.xml → ...atter.test/projects/simple-sample/pom.xml
diff --git a/...ple/src/config/eclipse/formatter/java.xml → ...ple/src/config/eclipse/formatter/java.xml b/...ple/src/config/eclipse/formatter/java.xml → ...ple/src/config/eclipse/formatter/java.xml
diff --git a/...c/config/eclipse/formatter/javascript.xml → ...c/config/eclipse/formatter/javascript.xml b/...c/config/eclipse/formatter/javascript.xml → ...c/config/eclipse/formatter/javascript.xml
diff --git a/...configurator/formatter.tests/settings.xml → net.revelc.code.formatter.test/settings.xml b/...configurator/formatter.tests/settings.xml → net.revelc.code.formatter.test/settings.xml
diff --git a/...code/formatter/tests/BuildhelperTest.java → ...code/formatter/tests/BuildhelperTest.java b/...code/formatter/tests/BuildhelperTest.java → ...code/formatter/tests/BuildhelperTest.java
diff --git a/...nfigurator/formatter/META-INF/MANIFEST.MF → ...evelc.code.formatter/META-INF/MANIFEST.MF b/...nfigurator/formatter/META-INF/MANIFEST.MF → ...evelc.code.formatter/META-INF/MANIFEST.MF
diff --git a/m2e-configurator/formatter/build.properties → net.revelc.code.formatter/build.properties b/m2e-configurator/formatter/build.properties → net.revelc.code.formatter/build.properties
diff --git a/.../formatter/lifecycle-mapping-metadata.xml → ....formatter/lifecycle-mapping-metadata.xml b/.../formatter/lifecycle-mapping-metadata.xml → ....formatter/lifecycle-mapping-metadata.xml
diff --git a/m2e-configurator/formatter/plugin.xml → net.revelc.code.formatter/plugin.xml b/m2e-configurator/formatter/plugin.xml → net.revelc.code.formatter/plugin.xml
diff --git a/m2e-configurator/formatter/pom.xml → net.revelc.code.formatter/pom.xml b/m2e-configurator/formatter/pom.xml → net.revelc.code.formatter/pom.xml
@@ -19,9 +19,8 @@
 
   <parent>
     <groupId>net.revelc.code.formatter</groupId>
-    <artifactId>formatter-m2e-configurator-parent</artifactId>
+    <artifactId>formatter-m2e-configurator</artifactId>
     <version>2.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>net.revelc.code.formatter</artifactId>

diff --git a/...de/formatter/connector/FormatterCore.java → ...de/formatter/connector/FormatterCore.java b/...de/formatter/connector/FormatterCore.java → ...de/formatter/connector/FormatterCore.java
diff --git a/...nternal/FormatterProjectConfigurator.java → ...nternal/FormatterProjectConfigurator.java b/...nternal/FormatterProjectConfigurator.java → ...nternal/FormatterProjectConfigurator.java
diff --git a/pom.xml b/pom.xml
@@ -26,11 +26,11 @@
   </parent>
 
   <groupId>net.revelc.code.formatter</groupId>
-  <artifactId>formatter-m2e-configurator-parent</artifactId>
+  <artifactId>formatter-m2e-configurator</artifactId>
   <version>2.6.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>
-  <name>parent</name>
+  <name>formatter-m2e-configurator</name>
 
   <description>M2E configurator for the formatter-maven-plugin</description>
   <url>https://github.com/revelc/formatter-m2e-configurator/</url>
@@ -70,11 +70,11 @@
   </developers>
 
   <modules>
-    <module>m2e-configurator/formatter</module>
-    <module>m2e-configurator/formatter.feature</module>
-    <module>m2e-configurator/formatter.site</module>
+    <module>net.revelc.code.formatter</module>
+    <module>net.revelc.code.formatter.feature</module>
+    <module>net.revelc.code.formatter.site</module>
     <!--
-    <module>m2e-configurator/formatter.tests</module>
+    <module>net.revelc.code.formatter.test</module>
     -->
   </modules>