From 1fce5ff588b966dededc9c6dea79a3179c19e676 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sat, 13 Jul 2024 18:52:50 +0200 Subject: [PATCH 1/3] RATIS-2125. javadoc jars should not include non-doc items --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index 86d6c7c616..1284e2f873 100644 --- a/pom.xml +++ b/pom.xml @@ -977,9 +977,6 @@ jar - - ${project.build.directory} - From 0c8c7a5c852a73bc3f826d990460ea2b363486e1 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sat, 13 Jul 2024 20:00:02 +0200 Subject: [PATCH 2/3] verify javadoc reproducibility --- .github/workflows/post-commit.yml | 4 ++-- dev-support/checks/build.sh | 2 +- dev-support/checks/repro.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml index 5fee9462ae..f6ef4b5f78 100644 --- a/.github/workflows/post-commit.yml +++ b/.github/workflows/post-commit.yml @@ -91,9 +91,9 @@ jobs: distribution: 'temurin' java-version: ${{ matrix.java }} - name: Run a full build - run: ./dev-support/checks/build.sh -Djavac.version=${{ matrix.java }} + run: ./dev-support/checks/build.sh -Prelease -Djavac.version=${{ matrix.java }} - name: Test reproducibility - run: ./dev-support/checks/repro.sh -Djavac.version=${{ matrix.java }} + run: ./dev-support/checks/repro.sh -Prelease -Djavac.version=${{ matrix.java }} rat: name: rat runs-on: ubuntu-20.04 diff --git a/dev-support/checks/build.sh b/dev-support/checks/build.sh index 6add1ae605..22579a5960 100755 --- a/dev-support/checks/build.sh +++ b/dev-support/checks/build.sh @@ -20,7 +20,7 @@ source "${DIR}/../find_maven.sh" : ${WITH_COVERAGE:="false"} -MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests --no-transfer-progress' +MAVEN_OPTIONS='-V -B -DskipTests --no-transfer-progress' if [[ "${WITH_COVERAGE}" != "true" ]]; then MAVEN_OPTIONS="${MAVEN_OPTIONS} -Djacoco.skip" diff --git a/dev-support/checks/repro.sh b/dev-support/checks/repro.sh index c87443ef21..a313df8a45 100755 --- a/dev-support/checks/repro.sh +++ b/dev-support/checks/repro.sh @@ -20,7 +20,7 @@ source "${DIR}/../find_maven.sh" : ${WITH_COVERAGE:="false"} -MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests --no-transfer-progress' +MAVEN_OPTIONS='-V -B -DskipTests -Dbuildinfo.ignoreJavadoc=false --no-transfer-progress' if [[ "${WITH_COVERAGE}" != "true" ]]; then MAVEN_OPTIONS="${MAVEN_OPTIONS} -Djacoco.skip" From 97f25a5b04653555677ab36970f8977b2739785a Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sat, 13 Jul 2024 20:10:47 +0200 Subject: [PATCH 3/3] Revert "verify javadoc reproducibility" This reverts commit 0c8c7a5c852a73bc3f826d990460ea2b363486e1. --- .github/workflows/post-commit.yml | 4 ++-- dev-support/checks/build.sh | 2 +- dev-support/checks/repro.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml index f6ef4b5f78..5fee9462ae 100644 --- a/.github/workflows/post-commit.yml +++ b/.github/workflows/post-commit.yml @@ -91,9 +91,9 @@ jobs: distribution: 'temurin' java-version: ${{ matrix.java }} - name: Run a full build - run: ./dev-support/checks/build.sh -Prelease -Djavac.version=${{ matrix.java }} + run: ./dev-support/checks/build.sh -Djavac.version=${{ matrix.java }} - name: Test reproducibility - run: ./dev-support/checks/repro.sh -Prelease -Djavac.version=${{ matrix.java }} + run: ./dev-support/checks/repro.sh -Djavac.version=${{ matrix.java }} rat: name: rat runs-on: ubuntu-20.04 diff --git a/dev-support/checks/build.sh b/dev-support/checks/build.sh index 22579a5960..6add1ae605 100755 --- a/dev-support/checks/build.sh +++ b/dev-support/checks/build.sh @@ -20,7 +20,7 @@ source "${DIR}/../find_maven.sh" : ${WITH_COVERAGE:="false"} -MAVEN_OPTIONS='-V -B -DskipTests --no-transfer-progress' +MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests --no-transfer-progress' if [[ "${WITH_COVERAGE}" != "true" ]]; then MAVEN_OPTIONS="${MAVEN_OPTIONS} -Djacoco.skip" diff --git a/dev-support/checks/repro.sh b/dev-support/checks/repro.sh index a313df8a45..c87443ef21 100755 --- a/dev-support/checks/repro.sh +++ b/dev-support/checks/repro.sh @@ -20,7 +20,7 @@ source "${DIR}/../find_maven.sh" : ${WITH_COVERAGE:="false"} -MAVEN_OPTIONS='-V -B -DskipTests -Dbuildinfo.ignoreJavadoc=false --no-transfer-progress' +MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests --no-transfer-progress' if [[ "${WITH_COVERAGE}" != "true" ]]; then MAVEN_OPTIONS="${MAVEN_OPTIONS} -Djacoco.skip"