chore: split monitor into application and core modules (#2363)

Refs: XRDDEV-2715

src/monitor/application/build.gradle

@@ -0,0 +1,28 @@
+plugins {
+    alias(libs.plugins.shadow)
+}
+
+dependencies {
+    implementation(platform(libs.springBoot.bom))
+
+    implementation project(':common:common-core')
+    implementation project(':monitor:core')
+    implementation project(':monitor-common')
+    implementation project(':signer-protocol')
+
+    implementation libs.bundles.metrics
+    implementation('org.springframework:spring-context')
+}
+
+shadowJar {
+    exclude('**/module-info.class')
+    archiveBaseName = "monitor"
+    archiveClassifier = ''
+    manifest {
+        attributes 'Main-Class': 'ee.ria.xroad.monitor.MonitorMain'
+    }
+    mergeServiceFiles()
+}
+
+jar.enabled = false
+assemble.dependsOn shadowJar

src/monitor/src/main/java/ee/ria/xroad/monitor/MonitorMain.java → src/monitor/application/src/main/java/ee/ria/xroad/monitor/MonitorMain.java

@@ -1,5 +1,6 @@
 /*
  * The MIT License
+ *
  * Copyright (c) 2019- Nordic Institute for Interoperability Solutions (NIIS)
  * Copyright (c) 2018 Estonian Information System Authority (RIA),
  * Nordic Institute for Interoperability Solutions (NIIS), Population Register Centre (VRK)

src/monitor/build.gradle

@@ -1,44 +1,7 @@
-plugins {
-    alias(libs.plugins.shadow)
+tasks.withType(Jar).configureEach {
+    enabled = false
 }
 
-ext {
-    mainClassName = "ee.ria.xroad.monitor.MonitorMain"
-}
-
-jar {
-    manifest {
-        attributes 'Main-Class': mainClassName
-    }
-}
-
-dependencies {
-    implementation(platform(libs.springBoot.bom))
-
-    implementation project(':common:common-domain')
-    implementation project(':common:common-verifier')
-    implementation project(':monitor-common')
-    implementation project(':signer-protocol')
-    implementation project(':serverconf')
-
-    implementation('org.springframework:spring-context')
-    implementation libs.slf4j.api
-    implementation libs.bundles.metrics
-
-    testImplementation project(':common:common-test')
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation libs.mockito.core
-}
-
-shadowJar {
-    exclude('**/module-info.class')
-    archiveBaseName = "monitor"
-    archiveClassifier = ''
-    mergeServiceFiles()
-}
-
-jar.finalizedBy shadowJar
-
-test {
-    useJUnitPlatform()
+archUnit {
+    skip = true
 }

src/monitor/core/build.gradle

@@ -0,0 +1,27 @@
+plugins {
+    id 'java-library'
+}
+
+dependencies {
+    implementation(platform(libs.springBoot.bom))
+
+    implementation project(':common:common-domain')
+    implementation project(':common:common-verifier')
+    implementation project(':monitor-common')
+    implementation project(':signer-protocol')
+    implementation project(':serverconf')
+
+    implementation libs.slf4j.api
+    implementation libs.bundles.metrics
+
+    testImplementation project(':common:common-test')
+    testImplementation libs.mockito.core
+}
+
+jar {
+    archiveBaseName = 'monitor-core'
+}
+
+test {
+    useJUnitPlatform()
+}

src/packages/src/xroad/redhat/SPECS/xroad-monitor.spec

@@ -33,7 +33,7 @@ mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}/usr/share/xroad/bin
 mkdir -p %{buildroot}/etc/xroad/backup.d
 
-cp -p %{srcdir}/../../../monitor/build/libs/monitor-1.0.jar %{buildroot}%{jlib}
+cp -p %{srcdir}/../../../monitor/application/build/libs/monitor-1.0.jar %{buildroot}%{jlib}
 cp -a %{srcdir}/common/monitor/etc/* %{buildroot}%{_sysconfdir}
 cp -p %{srcdir}/common/monitor/systemd/%{name}.service %{buildroot}%{_unitdir}
 cp -p %{srcdir}/common/monitor/usr/share/xroad/bin/xroad-monitor %{buildroot}/usr/share/xroad/bin

src/packages/src/xroad/ubuntu/generic/xroad-monitor.install

@@ -2,4 +2,4 @@
 ../../../../src/xroad/common/monitor/usr/*  usr/
 ../../../../src/xroad/default-configuration/addons/monitor.ini etc/xroad/conf.d/addons
 ../../../../src/xroad/default-configuration/addons/monitor-logback.xml etc/xroad/conf.d/addons
-../../../../../monitor/build/libs/monitor-1.0.jar usr/share/xroad/jlib/
+../../../../../monitor/application/build/libs/monitor-1.0.jar usr/share/xroad/jlib/

src/settings.gradle

@@ -40,7 +40,8 @@ include "configuration-client:application"
 include "configuration-client:core"
 include "asicverifier"
 include "asic-util"
-include "monitor"
+include "monitor:application"
+include "monitor:core"
 include "monitor-common"
 include "op-monitor-daemon:application"
 include "op-monitor-daemon:core"