From ad5b03b437693b3f9198c225732fff9de316b6a5 Mon Sep 17 00:00:00 2001 From: Spolti Date: Wed, 25 Mar 2020 16:03:41 -0300 Subject: [PATCH] [KOGITO-1565] - Align maven version on Kogito images (#115) Signed-off-by: spolti --- kogito-quarkus-s2i-overrides.yaml | 2 +- kogito-springboot-s2i-overrides.yaml | 2 +- .../{3.6.0 => 3.6.x}/added/configure-maven.sh | 0 modules/kogito-maven/{3.6.0 => 3.6.x}/configure | 0 .../kogito-maven/{3.6.0 => 3.6.x}/maven/settings.xml | 0 modules/kogito-maven/{3.6.0 => 3.6.x}/module.yaml | 10 +++++----- modules/kogito-maven/tests/bats/maven-settings.bats | 4 ++-- tests/features/kogito-quarkus-ubi8-s2i.feature | 2 +- tests/features/kogito-springboot-ubi8-s2i.feature | 1 + 9 files changed, 11 insertions(+), 10 deletions(-) rename modules/kogito-maven/{3.6.0 => 3.6.x}/added/configure-maven.sh (100%) rename modules/kogito-maven/{3.6.0 => 3.6.x}/configure (100%) rename modules/kogito-maven/{3.6.0 => 3.6.x}/maven/settings.xml (100%) rename modules/kogito-maven/{3.6.0 => 3.6.x}/module.yaml (83%) diff --git a/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-s2i-overrides.yaml index ef8f723ccd1..c15279ed3e8 100644 --- a/kogito-quarkus-s2i-overrides.yaml +++ b/kogito-quarkus-s2i-overrides.yaml @@ -36,7 +36,7 @@ modules: - name: org.kie.kogito.openjdk version: "1.8.0" - name: org.kie.kogito.maven - version: "3.6.0" + version: "3.6.2" - name: org.kie.kogito.s2i.core - name: org.kie.kogito.quarkus.s2i diff --git a/kogito-springboot-s2i-overrides.yaml b/kogito-springboot-s2i-overrides.yaml index 6acc286a648..9d03a763d17 100644 --- a/kogito-springboot-s2i-overrides.yaml +++ b/kogito-springboot-s2i-overrides.yaml @@ -28,7 +28,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.maven - version: "3.6.0" + version: "3.6.2" - name: org.kie.kogito.openjdk version: "1.8.0" - name: org.kie.kogito.s2i.core diff --git a/modules/kogito-maven/3.6.0/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh similarity index 100% rename from modules/kogito-maven/3.6.0/added/configure-maven.sh rename to modules/kogito-maven/3.6.x/added/configure-maven.sh diff --git a/modules/kogito-maven/3.6.0/configure b/modules/kogito-maven/3.6.x/configure similarity index 100% rename from modules/kogito-maven/3.6.0/configure rename to modules/kogito-maven/3.6.x/configure diff --git a/modules/kogito-maven/3.6.0/maven/settings.xml b/modules/kogito-maven/3.6.x/maven/settings.xml similarity index 100% rename from modules/kogito-maven/3.6.0/maven/settings.xml rename to modules/kogito-maven/3.6.x/maven/settings.xml diff --git a/modules/kogito-maven/3.6.0/module.yaml b/modules/kogito-maven/3.6.x/module.yaml similarity index 83% rename from modules/kogito-maven/3.6.0/module.yaml rename to modules/kogito-maven/3.6.x/module.yaml index a73bb8f685b..52f2b7c1a74 100644 --- a/modules/kogito-maven/3.6.0/module.yaml +++ b/modules/kogito-maven/3.6.x/module.yaml @@ -1,10 +1,10 @@ schema_version: 1 name: org.kie.kogito.maven -version: "3.6.0" +version: "3.6.2" envs: - name: "MAVEN_VERSION" - value: "3.6.0" + value: "3.6.2" - name: " MAVEN_HOME" value: "/usr/share/maven" - name: "HTTP_PROXY" @@ -29,9 +29,9 @@ envs: # unfortunately by now the version needs to be hardcoded. artifacts: - - name: apache-maven-3.6.0-bin.tar.gz - url: https://archive.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz - md5: 268081b8394502b6bf8a75ca9c5a2c4f + - name: apache-maven-3.6.2-bin.tar.gz + url: https://archive.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar.gz + md5: f1d40d252a4e09429297567a66324db7 execute: - script: configure \ No newline at end of file diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats index f4be1ed29a5..42294bbba85 100644 --- a/modules/kogito-maven/tests/bats/maven-settings.bats +++ b/modules/kogito-maven/tests/bats/maven-settings.bats @@ -1,13 +1,13 @@ #!/usr/bin/env bats # imports -source $BATS_TEST_DIRNAME/../../3.6.0/added/configure-maven.sh +source $BATS_TEST_DIRNAME/../../3.6.x/added/configure-maven.sh setup() { export HOME=$BATS_TMPDIR/maven mkdir -p ${HOME}/.m2/ - cp $BATS_TEST_DIRNAME/../../3.6.0/maven/settings.xml ${HOME}/.m2/ + cp $BATS_TEST_DIRNAME/../../3.6.x/maven/settings.xml ${HOME}/.m2/ } teardown() { diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature index ef0b73bb029..e7355d0e4cd 100644 --- a/tests/features/kogito-quarkus-ubi8-s2i.feature +++ b/tests/features/kogito-quarkus-ubi8-s2i.feature @@ -113,7 +113,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests Scenario: verify if the maven and graal vm settings are correct When container is started with command bash Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven - And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.0 + And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2 And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0 And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1 diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature index da540420939..86857fd6dad 100644 --- a/tests/features/kogito-springboot-ubi8-s2i.feature +++ b/tests/features/kogito-springboot-ubi8-s2i.feature @@ -63,5 +63,6 @@ Feature: kogito-springboot-ubi8-s2i image tests Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0 And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 1.8.0 + And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2 And run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven