Merge pull request #50 from aodn/bug/5633-skip-module-codeartifact

remove the need to push geonetwork-api to code artifact
aodn · Jun 5, 2024 · bebfda4 · bebfda4
2 parents 2e433bc + 1f0e740
commit bebfda4
Show file tree

Hide file tree

Showing 40 changed files with 20 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,16 +13,16 @@ ENV GN_DIR /opt/geonetwork
 #
 
 # Override log4j as we need to add our log appear, by default ROOT level is off which is very strange design
-COPY ./geonetwork/target/classes/log4j-imos.xml ${GN_DIR}/WEB-INF/classes/log4j2.xml
-COPY ./geonetwork/target/classes/log4j-imos-index.xml ${GN_DIR}/WEB-INF/classes/log4j2-index.xml
+COPY ./geonetwork-core/target/classes/log4j-imos.xml ${GN_DIR}/WEB-INF/classes/log4j2.xml
+COPY ./geonetwork-core/target/classes/log4j-imos-index.xml ${GN_DIR}/WEB-INF/classes/log4j2-index.xml
 
 # Copy our jar to the lib folder so that scan can happens
-COPY ./geonetwork/target/geonetwork-*.jar ${GN_DIR}/WEB-INF/lib/
+COPY ./geonetwork-core/target/geonetwork4-*.jar ${GN_DIR}/WEB-INF/lib/
 COPY ./geonetwork-api/target/geonetwork-api-*.jar ${GN_DIR}/WEB-INF/lib/
 
-COPY ./geonetwork/target/dependency/* ${GN_DIR}/WEB-INF/lib/
-COPY ./geonetwork/target/classes/schema_plugins/converter/*.xsl ${GN_DIR}/WEB-INF/data/config/schema_plugins/iso19139/process/
-COPY ./geonetwork/target/classes/schema_plugins/converter/*.xsl ${GN_DIR}/WEB-INF/data/config/schema_plugins/iso19115-3.2018/process/
+COPY ./geonetwork-core/target/dependency/* ${GN_DIR}/WEB-INF/lib/
+COPY ./geonetwork-core/target/classes/schema_plugins/converter/*.xsl ${GN_DIR}/WEB-INF/data/config/schema_plugins/iso19139/process/
+COPY ./geonetwork-core/target/classes/schema_plugins/converter/*.xsl ${GN_DIR}/WEB-INF/data/config/schema_plugins/iso19115-3.2018/process/
 
 # Config override
-COPY ./geonetwork/target/classes/gnconfig/config-overrides.xml ${GN_DIR}/WEB-INF/
+COPY ./geonetwork-core/target/classes/gnconfig/config-overrides.xml ${GN_DIR}/WEB-INF/
diff --git a/geonetwork-api/pom.xml b/geonetwork-api/pom.xml
@@ -64,6 +64,17 @@
     </dependencies>
     <build>
         <plugins>
+            <!--
+            No need to push this api to code repo as it is not something in common, we just need this to
+            be part of the binary.
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>

diff --git a/geonetwork/pom.xml → geonetwork-core/pom.xml b/geonetwork/pom.xml → geonetwork-core/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>geonetwork</artifactId>
+    <artifactId>geonetwork4-core</artifactId>
     <packaging>jar</packaging>
 
     <description>AODN customized Geonetwork Instance</description>

diff --git a/.../org/aodn/geonetwork4/ActuatorConfig.java → .../org/aodn/geonetwork4/ActuatorConfig.java b/.../org/aodn/geonetwork4/ActuatorConfig.java → .../org/aodn/geonetwork4/ActuatorConfig.java
diff --git a/.../java/au/org/aodn/geonetwork4/Config.java → .../java/au/org/aodn/geonetwork4/Config.java b/.../java/au/org/aodn/geonetwork4/Config.java → .../java/au/org/aodn/geonetwork4/Config.java
diff --git a/...ava/au/org/aodn/geonetwork4/S3Config.java → ...ava/au/org/aodn/geonetwork4/S3Config.java b/...ava/au/org/aodn/geonetwork4/S3Config.java → ...ava/au/org/aodn/geonetwork4/S3Config.java
diff --git a/...n/java/au/org/aodn/geonetwork4/Setup.java → ...n/java/au/org/aodn/geonetwork4/Setup.java b/...n/java/au/org/aodn/geonetwork4/Setup.java → ...n/java/au/org/aodn/geonetwork4/Setup.java
diff --git a/.../org/aodn/geonetwork4/controller/Api.java → .../org/aodn/geonetwork4/controller/Api.java b/.../org/aodn/geonetwork4/controller/Api.java → .../org/aodn/geonetwork4/controller/Api.java
diff --git a/.../geonetwork4/enumeration/Environment.java → .../geonetwork4/enumeration/Environment.java b/.../geonetwork4/enumeration/Environment.java → .../geonetwork4/enumeration/Environment.java
diff --git a/...twork4/handler/GenericEntityListener.java → ...twork4/handler/GenericEntityListener.java b/...twork4/handler/GenericEntityListener.java → ...twork4/handler/GenericEntityListener.java
diff --git a/...g/aodn/geonetwork4/model/ConfigTypes.java → ...g/aodn/geonetwork4/model/ConfigTypes.java b/...g/aodn/geonetwork4/model/ConfigTypes.java → ...g/aodn/geonetwork4/model/ConfigTypes.java
diff --git a/...dn/geonetwork4/model/GitRemoteConfig.java → ...dn/geonetwork4/model/GitRemoteConfig.java b/...dn/geonetwork4/model/GitRemoteConfig.java → ...dn/geonetwork4/model/GitRemoteConfig.java
diff --git a/.../aodn/geonetwork4/model/RemoteConfig.java → .../aodn/geonetwork4/model/RemoteConfig.java b/.../aodn/geonetwork4/model/RemoteConfig.java → .../aodn/geonetwork4/model/RemoteConfig.java
diff --git a/.../geonetwork4/model/RemoteConfigValue.java → .../geonetwork4/model/RemoteConfigValue.java b/.../geonetwork4/model/RemoteConfigValue.java → .../geonetwork4/model/RemoteConfigValue.java
diff --git a/...dn/geonetwork4/ssl/HttpsTrustManager.java → ...dn/geonetwork4/ssl/HttpsTrustManager.java b/...dn/geonetwork4/ssl/HttpsTrustManager.java → ...dn/geonetwork4/ssl/HttpsTrustManager.java
diff --git a/...a/org/fao/geonet/AODNCustomBootStrap.java → ...a/org/fao/geonet/AODNCustomBootStrap.java b/...a/org/fao/geonet/AODNCustomBootStrap.java → ...a/org/fao/geonet/AODNCustomBootStrap.java
diff --git a/...ain/resources/application-edge.properties → ...ain/resources/application-edge.properties b/...ain/resources/application-edge.properties → ...ain/resources/application-edge.properties
diff --git a/.../resources/application-staging.properties → .../resources/application-staging.properties b/.../resources/application-staging.properties → .../resources/application-staging.properties
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...n/resources/gnconfig/config-overrides.xml → ...n/resources/gnconfig/config-overrides.xml b/...n/resources/gnconfig/config-overrides.xml → ...n/resources/gnconfig/config-overrides.xml
diff --git a/...k/src/main/resources/log4j-imos-index.xml → ...e/src/main/resources/log4j-imos-index.xml b/...k/src/main/resources/log4j-imos-index.xml → ...e/src/main/resources/log4j-imos-index.xml
diff --git a/geonetwork/src/main/resources/log4j-imos.xml → ...rk-core/src/main/resources/log4j-imos.xml b/geonetwork/src/main/resources/log4j-imos.xml → ...rk-core/src/main/resources/log4j-imos.xml
diff --git a/...ources/schema_plugins/converter/README.md → ...ources/schema_plugins/converter/README.md b/...ources/schema_plugins/converter/README.md → ...ources/schema_plugins/converter/README.md
diff --git a/...ugins/converter/add-collection-config.xsl → ...ugins/converter/add-collection-config.xsl b/...ugins/converter/add-collection-config.xsl → ...ugins/converter/add-collection-config.xsl
diff --git a/...ins/converter/ebstack-linkage-updater.xsl → ...ins/converter/ebstack-linkage-updater.xsl b/...ins/converter/ebstack-linkage-updater.xsl → ...ins/converter/ebstack-linkage-updater.xsl
diff --git a/...resources/schema_plugins/converter/ga.xsl → ...resources/schema_plugins/converter/ga.xsl b/...resources/schema_plugins/converter/ga.xsl → ...resources/schema_plugins/converter/ga.xsl
diff --git a/...ema_plugins/converter/linkage-updater.xsl → ...ema_plugins/converter/linkage-updater.xsl b/...ema_plugins/converter/linkage-updater.xsl → ...ema_plugins/converter/linkage-updater.xsl
diff --git a/...rces/schema_plugins/converter/replace.xsl → ...rces/schema_plugins/converter/replace.xsl b/...rces/schema_plugins/converter/replace.xsl → ...rces/schema_plugins/converter/replace.xsl
diff --git a/...ces/schema_plugins/converter/template.png → ...ces/schema_plugins/converter/template.png b/...ces/schema_plugins/converter/template.png → ...ces/schema_plugins/converter/template.png
diff --git a/...verter/transform_19115_3_testing_urls.xsl → ...verter/transform_19115_3_testing_urls.xsl b/...verter/transform_19115_3_testing_urls.xsl → ...verter/transform_19115_3_testing_urls.xsl
diff --git a/...gins/converter/transform_sandbox_urls.xsl → ...gins/converter/transform_sandbox_urls.xsl b/...gins/converter/transform_sandbox_urls.xsl → ...gins/converter/transform_sandbox_urls.xsl
diff --git a/...gins/converter/transform_testing_urls.xsl → ...gins/converter/transform_testing_urls.xsl b/...gins/converter/transform_testing_urls.xsl → ...gins/converter/transform_testing_urls.xsl
diff --git a/.../aodn/geonetwork4/controller/ApiTest.java → .../aodn/geonetwork4/controller/ApiTest.java b/.../aodn/geonetwork4/controller/ApiTest.java → .../aodn/geonetwork4/controller/ApiTest.java
diff --git a/...k4/handler/GenericEntityListenerTest.java → ...k4/handler/GenericEntityListenerTest.java b/...k4/handler/GenericEntityListenerTest.java → ...k4/handler/GenericEntityListenerTest.java
diff --git a/...g/aodn/geonetwork4/handler/SetupTest.java → ...g/aodn/geonetwork4/handler/SetupTest.java b/...g/aodn/geonetwork4/handler/SetupTest.java → ...g/aodn/geonetwork4/handler/SetupTest.java
diff --git a/...eonetwork4/model/GitRemoteConfigTest.java → ...eonetwork4/model/GitRemoteConfigTest.java b/...eonetwork4/model/GitRemoteConfigTest.java → ...eonetwork4/model/GitRemoteConfigTest.java
diff --git a/geonetwork/src/test/resources/groups.json → ...twork-core/src/test/resources/groups.json b/geonetwork/src/test/resources/groups.json → ...twork-core/src/test/resources/groups.json
diff --git a/...ork/src/test/resources/harvesterlist.json → ...ore/src/test/resources/harvesterlist.json b/...ork/src/test/resources/harvesterlist.json → ...ore/src/test/resources/harvesterlist.json
diff --git a/...work/src/test/resources/harvesterlist.xml → ...core/src/test/resources/harvesterlist.xml b/...work/src/test/resources/harvesterlist.xml → ...core/src/test/resources/harvesterlist.xml
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
 
     <modules>
         <module>geonetwork-api</module>
-        <module>geonetwork</module>
+        <module>geonetwork-core</module>
     </modules>
 
     <properties>