Skip to content

Commit

Permalink
[KOGITO-1565] - Align maven version on Kogito images (apache#115)
Browse files Browse the repository at this point in the history
Signed-off-by: spolti <[email protected]>
  • Loading branch information
spolti authored Mar 25, 2020
1 parent 7a13116 commit ad5b03b
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion kogito-quarkus-s2i-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion kogito-springboot-s2i-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
4 changes: 2 additions & 2 deletions modules/kogito-maven/tests/bats/maven-settings.bats
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion tests/features/kogito-quarkus-ubi8-s2i.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/features/kogito-springboot-ubi8-s2i.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ad5b03b

Please sign in to comment.