From 55db6eed80fcbacfa1c222da190e6e12f3a70560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Gon=C3=A7alves?= Date: Fri, 25 Oct 2024 09:28:21 +0100 Subject: [PATCH 1/3] removed unecessary implementations / forces --- build.gradle | 15 +++------------ src/main/docker/jib/entrypoint.sh | 8 +++++++- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index f3adfa4a..265cd160 100644 --- 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/src/main/docker/jib/entrypoint.sh b/src/main/docker/jib/entrypoint.sh index b976d08f..03a3cea9 100644 --- a/src/main/docker/jib/entrypoint.sh +++ b/src/main/docker/jib/entrypoint.sh @@ -36,4 +36,10 @@ file_env 'SPRING_LIQUIBASE_USER' file_env 'SPRING_LIQUIBASE_PASSWORD' file_env 'JHIPSTER_REGISTRY_PASSWORD' -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 +#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 -XX:+ShowCodeDetailsInExceptionMessages -verbose:class -cp /app/resources/:/app/classes/:/app/libs/jakarta*:/app/libs/* "org.assimbly.gateway.GatewayApp" "$@" --application.gateway.base-directory=/data/ --server.port=8088 +#exec java ${JAVA_OPTS} -cp /app/resources/:/app/classes/:/app/libs/* "org.assimbly.gateway.GatewayApp" "$@" --application.gateway.base-directory=/data/ --server.port=8088 +#ls -la "/app/" +#ls -la "/" +#tail -f /dev/null +#exec java ${JAVA_OPTS} -cp /app/gateway-5.0.1-SNAPSHOT-plain.jar "org.assimbly.gateway.GatewayApp" --application.gateway.base-directory=/data/ --server.port=8088 +exec java ${JAVA_OPTS} -cp "$(cat /app/jib-classpath-file)" "$@" --application.gateway.base-directory=/data/ --server.port=8088 From f61ea6c00b5cbff4826dbf156659d08e6cdf518e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Gon=C3=A7alves?= Date: Fri, 25 Oct 2024 09:30:08 +0100 Subject: [PATCH 2/3] added packaged command line (commented) for feature tests --- src/main/docker/jib/entrypoint.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/docker/jib/entrypoint.sh b/src/main/docker/jib/entrypoint.sh index 03a3cea9..f422b57a 100644 --- a/src/main/docker/jib/entrypoint.sh +++ b/src/main/docker/jib/entrypoint.sh @@ -36,10 +36,8 @@ file_env 'SPRING_LIQUIBASE_USER' file_env 'SPRING_LIQUIBASE_PASSWORD' file_env 'JHIPSTER_REGISTRY_PASSWORD' -#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 -XX:+ShowCodeDetailsInExceptionMessages -verbose:class -cp /app/resources/:/app/classes/:/app/libs/jakarta*:/app/libs/* "org.assimbly.gateway.GatewayApp" "$@" --application.gateway.base-directory=/data/ --server.port=8088 -#exec java ${JAVA_OPTS} -cp /app/resources/:/app/classes/:/app/libs/* "org.assimbly.gateway.GatewayApp" "$@" --application.gateway.base-directory=/data/ --server.port=8088 -#ls -la "/app/" -#ls -la "/" -#tail -f /dev/null -#exec java ${JAVA_OPTS} -cp /app/gateway-5.0.1-SNAPSHOT-plain.jar "org.assimbly.gateway.GatewayApp" --application.gateway.base-directory=/data/ --server.port=8088 -exec java ${JAVA_OPTS} -cp "$(cat /app/jib-classpath-file)" "$@" --application.gateway.base-directory=/data/ --server.port=8088 +# 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 From c2a227ea25cb220a7ee69e31a9eb6aaa4e03d315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Gon=C3=A7alves?= Date: Fri, 25 Oct 2024 09:31:05 +0100 Subject: [PATCH 3/3] upgrade jib_plugin_version to 3.4.4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 281542b5..ce3c439e 100644 --- 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