Merge branch 'master' into pom-update-28122023

oaplatform · Dec 28, 2023 · 60ab3d2 · 60ab3d2
2 parents 6fe78d8 + ec2c74d
commit 60ab3d2
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 1 deletion.
diff --git a/maven/oap-application-maven/pom.xml → ...aven-plugin/oap-application-maven/pom.xml b/maven/oap-application-maven/pom.xml → ...aven-plugin/oap-application-maven/pom.xml
diff --git a/...application/maven/StartupScriptsMojo.java → ...application/maven/StartupScriptsMojo.java b/...application/maven/StartupScriptsMojo.java → ...application/maven/StartupScriptsMojo.java
diff --git a/maven/oap-dictionary-maven/pom.xml → ...maven-plugin/oap-dictionary-maven/pom.xml b/maven/oap-dictionary-maven/pom.xml → ...maven-plugin/oap-dictionary-maven/pom.xml
diff --git a/.../oap/dictionary/maven/DictionaryMojo.java → .../oap/dictionary/maven/DictionaryMojo.java b/.../oap/dictionary/maven/DictionaryMojo.java → .../oap/dictionary/maven/DictionaryMojo.java
diff --git a/.../dictionary/maven/DictionaryMojoTest.java → .../dictionary/maven/DictionaryMojoTest.java b/.../dictionary/maven/DictionaryMojoTest.java → .../dictionary/maven/DictionaryMojoTest.java
diff --git a/...est-dictionary-externalIdAsCharacter.json → ...est-dictionary-externalIdAsCharacter.json b/...est-dictionary-externalIdAsCharacter.json → ...est-dictionary-externalIdAsCharacter.json
diff --git a/...resources/dictionary/test-dictionary.json → ...resources/dictionary/test-dictionary.json b/...resources/dictionary/test-dictionary.json → ...resources/dictionary/test-dictionary.json
diff --git a/...nary/maven/DictionaryMojoTest/Child1.java → ...nary/maven/DictionaryMojoTest/Child1.java b/...nary/maven/DictionaryMojoTest/Child1.java → ...nary/maven/DictionaryMojoTest/Child1.java
diff --git a/...nary/maven/DictionaryMojoTest/Child2.java → ...nary/maven/DictionaryMojoTest/Child2.java b/...nary/maven/DictionaryMojoTest/Child2.java → ...nary/maven/DictionaryMojoTest/Child2.java
diff --git a/.../TestDictionaryExternalIdAsCharacter.java → .../TestDictionaryExternalIdAsCharacter.java b/.../TestDictionaryExternalIdAsCharacter.java → .../TestDictionaryExternalIdAsCharacter.java
diff --git a/maven/oap-maven/pom.xml → oap-maven-plugin/oap-maven/pom.xml b/maven/oap-maven/pom.xml → oap-maven-plugin/oap-maven/pom.xml
diff --git a/...ven/src/main/java/oap/maven/CopyMojo.java → ...ven/src/main/java/oap/maven/CopyMojo.java b/...ven/src/main/java/oap/maven/CopyMojo.java → ...ven/src/main/java/oap/maven/CopyMojo.java
diff --git a/...aven/src/main/java/oap/maven/FileSet.java → ...aven/src/main/java/oap/maven/FileSet.java b/...aven/src/main/java/oap/maven/FileSet.java → ...aven/src/main/java/oap/maven/FileSet.java
diff --git a/maven/pom.xml → oap-maven-plugin/pom.xml b/maven/pom.xml → oap-maven-plugin/pom.xml
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
         <module>oap-jpath</module>
         <module>oap-pnio</module>
         <module>oap-hadoop</module>
-        <module>maven</module>
+        <module>oap-maven-plugin</module>
     </modules>
 
     <repositories>