Merge pull request #860 from assimbly/292-inbound-emailerror-on-readi…

…ng-inbox Cleaning build.gradle file
assimbly · Oct 25, 2024 · d9ca8c5 · d9ca8c5
2 parents c5fb34f + c2a227e
commit d9ca8c5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -92,12 +92,6 @@ configurations.all {
     exclude group: "org.apache.logging.log4j", module: 'log4j-slf4j-impl'
     exclude group: 'commons-logging', module: 'commons-logging'
     exclude group: 'xerces', module: 'xercesImpl'
-    //exclude group: 'org.eclipse.angus', module: 'angus-activation'
-    resolutionStrategy {
-        force 'org.eclipse.angus:angus-mail:2.0.3'
-        force 'jakarta.mail:jakarta.mail-api:2.1.3'
-        force 'jakarta.activation:jakarta.activation-api:2.1.3'
-    }
 }
 
 if (project.hasProperty("headless")) {
@@ -154,7 +148,8 @@ jib {
         image = 'assimbly/gateway-full'
     }
     container {
-        ports = ['1000', '1616','1617', '2000-2003/udp', '8088', '8443', '61616','61617','9000','9001']
+        mainClass = 'org.assimbly.gateway.GatewayApp'
+        ports = ['1000','1616','1617','2000-2003/udp','8088','8443','9000','9001','27017','61616','61617']
         format = 'OCI'
     }
     containerizingMode = 'exploded'
@@ -165,7 +160,7 @@ jib {
                 from = file('src/main/jib')
             }
             path {
-                // copies the contents of 'src/main/another/dir' into '/extras' on the container
+                // copies the contents of 'src/main/data' into '/data' on the container
                 from = file('src/main/data')
                 into = '/data'
             }
@@ -351,10 +346,6 @@ dependencies {
 
     compileOnly "jakarta.servlet:jakarta.servlet-api:6.1.0"
 
-    implementation "org.eclipse.angus:angus-mail:2.0.3"
-    implementation "jakarta.mail:jakarta.mail-api:2.1.3"
-    implementation "jakarta.activation:jakarta.activation-api:2.1.3"
-
     implementation "io.dropwizard.metrics:metrics-core"
     implementation "io.dropwizard.metrics:metrics-json"
 

diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ log4j2_mock_version=0.0.2
 liquibase_version=4.29.2
 liquibaseTaskPrefix=liquibase
 # gradle plugin=
-jib_plugin_version=3.4.3
+jib_plugin_version=3.4.4
 git_properties_plugin_version=2.4.2
 gradle_node_plugin_version=7.0.2
 liquibase_plugin_version=2.2.2

diff --git a/src/main/docker/jib/entrypoint.sh b/src/main/docker/jib/entrypoint.sh
@@ -36,4 +36,8 @@ file_env 'SPRING_LIQUIBASE_USER'
 file_env 'SPRING_LIQUIBASE_PASSWORD'
 file_env 'JHIPSTER_REGISTRY_PASSWORD'
 
+# exploded
 exec java ${JAVA_OPTS} -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -cp /app/resources/:/app/classes/:/app/libs/* "org.assimbly.gateway.GatewayApp"  "$@" --application.gateway.base-directory=/data/ --server.port=8088
+
+# packaged
+#exec java ${JAVA_OPTS} -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -cp @/app/jib-classpath-file @/app/jib-main-class-file "$@" --application.gateway.base-directory=/data/ --server.port=8088