From effc850300d1ab3e8c5163534238d745e14d652d Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 2 Sep 2020 22:28:30 +0200 Subject: [PATCH 1/3] HDDS-4197. Failed to load existing service definition files: ...SubcommandWithParent --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eca71e9e1333..5409e61ac7bf 100644 --- a/pom.xml +++ b/pom.xml @@ -1335,7 +1335,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.kohsuke.metainf-services metainf-services - 1.1 + 1.8 true From 25d99244741678c08fa595669c11f4d7ae3d21e9 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 2 Sep 2020 22:43:40 +0200 Subject: [PATCH 2/3] HDDS-4198. Compile Ozone with multiple Java versions --- .github/workflows/post-commit.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml index 20d2a2a5d1f5..5e85b0ec2001 100644 --- a/.github/workflows/post-commit.yml +++ b/.github/workflows/post-commit.yml @@ -22,6 +22,10 @@ jobs: build: name: compile runs-on: ubuntu-18.04 + strategy: + matrix: + java: [ 8, 11 ] + fail-fast: false steps: - name: Checkout project uses: actions/checkout@v2 @@ -34,10 +38,17 @@ jobs: key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-pnpm- - - name: Execute tests - uses: ./.github/buildenv + - name: Cache for maven dependencies + uses: actions/cache@v2 with: - args: ./hadoop-ozone/dev-support/checks/build.sh + path: ~/.m2/repository + key: maven-repo-${{ hashFiles('**/pom.xml') }} + - name: Setup java + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: Run a full build + run: hadoop-ozone/dev-support/checks/build.sh bats: runs-on: ubuntu-18.04 steps: From d959cf4fa5fc0ac2b7bf77c5810fb3cd9624bf3a Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 2 Sep 2020 22:49:10 +0200 Subject: [PATCH 3/3] Display version information in Maven --- hadoop-ozone/dev-support/checks/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/dev-support/checks/build.sh b/hadoop-ozone/dev-support/checks/build.sh index 2cdc4fe4d5cc..01a4f5cb1c8d 100755 --- a/hadoop-ozone/dev-support/checks/build.sh +++ b/hadoop-ozone/dev-support/checks/build.sh @@ -17,5 +17,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd "$DIR/../../.." || exit 1 export MAVEN_OPTS="-Xmx4096m" -mvn -B -Dmaven.javadoc.skip=true -DskipTests clean install "$@" +mvn -V -B -Dmaven.javadoc.skip=true -DskipTests clean install "$@" exit $?