diff --git a/jitci-build.sh b/jitci-build.sh index b70f432c..904c8e2f 100755 --- a/jitci-build.sh +++ b/jitci-build.sh @@ -1,4 +1,3 @@ #!/usr/bin/env bash -export M3_VERSION=$(curl -Ls -o /dev/null -w %{url_effective} https://github.com/apache/maven/releases/latest | sed 's,https://github.com/apache/maven/releases/tag/maven-,,g') -export JAVA_HOME=$HOME/jdk-17.0.9+9 -$HOME/apache-maven-${M3_VERSION}/bin/mvn -B install -DskipTests -Dsigning.disabled=true --no-transfer-progress +export JAVA_HOME=~/.sdkman/candidates/java/current +./mvnw -B install -DskipTests -Dsigning.disabled=true --no-transfer-progress diff --git a/jitci-init.sh b/jitci-init.sh index 9c6aca26..2fff3fd9 100755 --- a/jitci-init.sh +++ b/jitci-init.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -curl -vkL https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jdk_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz -o $HOME/ibm-semeru-open-jdk_x64_linux_17.0.8.1_1_openj9-0.40.0.tar.gz -tar xzvf $HOME/ibm-semeru-open-jdk_x64_linux_17.0.8.1_1_openj9-0.40.0.tar.gz -C $HOME -export JAVA_HOME=$HOME/jdk-17.0.9+9 +. ~/.sdkman/bin/sdkman-init.sh +sdk install java 17.0.11-oracle +sdk use java 17.0.11-oracle +export JAVA_HOME=~/.sdkman/candidates/java/current export M3_VERSION=$(curl -Ls -o /dev/null -w %{url_effective} https://github.com/apache/maven/releases/latest | sed 's,https://github.com/apache/maven/releases/tag/maven-,,g') -curl -vkL https://archive.apache.org/dist/maven/maven-3/${M3_VERSION}/binaries/apache-maven-${M3_VERSION}-bin.zip -o $HOME/apache-maven-${M3_VERSION}-bin.zip -unzip -o $HOME/apache-maven-${M3_VERSION}-bin.zip -d $HOME -$HOME/apache-maven-${M3_VERSION}/bin/mvn -B de.qaware.maven:go-offline-maven-plugin:resolve-dependencies --no-transfer-progress +mvn wrapper:wrapper -Dmaven=${M3_VERSION} --no-transfer-progress +./mvnw -B de.qaware.maven:go-offline-maven-plugin:resolve-dependencies --no-transfer-progress diff --git a/jitci-publish.sh b/jitci-publish.sh index eb85f23b..20c2b96b 100755 --- a/jitci-publish.sh +++ b/jitci-publish.sh @@ -1,4 +1,3 @@ #!/usr/bin/env bash -export M3_VERSION=$(curl -Ls -o /dev/null -w %{url_effective} https://github.com/apache/maven/releases/latest | sed 's,https://github.com/apache/maven/releases/tag/maven-,,g') -export JAVA_HOME=$HOME/jdk-17.0.9+9 -$HOME/apache-maven-${M3_VERSION}/bin/mvn -B deploy -DskipTests -Dfindbugs.skip=true -Dpmd.skip=true -Dcheckstyle.skip=true -Dsigning.disabled=true -DaltDeploymentRepository=jitci::default::file:///home/jitpack/deploy --no-transfer-progress +export JAVA_HOME=~/.sdkman/candidates/java/current +./mvnw -B deploy -DskipTests -Dfindbugs.skip=true -Dpmd.skip=true -Dcheckstyle.skip=true -Dsigning.disabled=true -DaltDeploymentRepository=jitci::default::file:///home/jitpack/deploy --no-transfer-progress diff --git a/jitpack.yml b/jitpack.yml index d8e093fd..e70c97e0 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,8 +1,4 @@ install: - - curl -vkL https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jdk_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz -o $HOME/ibm-semeru-open-jdk_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz - - tar xzvf $HOME/ibm-semeru-open-jdk_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz -C $HOME - - export JAVA_HOME=$HOME/jdk-17.0.9+9 - export M3_VERSION=$(curl -Ls -o /dev/null -w %{url_effective} https://github.com/apache/maven/releases/latest | sed 's,https://github.com/apache/maven/releases/tag/maven-,,g') - - curl -vkL https://archive.apache.org/dist/maven/maven-3/${M3_VERSION}/binaries/apache-maven-${M3_VERSION}-bin.zip -o $HOME/apache-maven-${M3_VERSION}-bin.zip - - unzip -o $HOME/apache-maven-${M3_VERSION}-bin.zip -d $HOME - - $HOME/apache-maven-${M3_VERSION}/bin/mvn -B install -DskipTests -Dsigning.disabled=true --no-transfer-progress \ No newline at end of file + - mvn wrapper:wrapper -Dmaven=${M3_VERSION} --no-transfer-progress + - ./mvnw -B install -DskipTests -Dsigning.disabled=true --no-transfer-progress \ No newline at end of file