From 81ae058b3a235375929ef796c82c83e622660d60 Mon Sep 17 00:00:00 2001 From: Fiore Mario Vitale Date: Tue, 28 Jan 2025 16:01:18 +0100 Subject: [PATCH] DBZ-8604 Update Maven wrapper --- .github/workflows/conductor-workflow.yml | 27 +++++++------------ .../.mvn/wrapper/maven-wrapper.properties | 4 +-- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.github/workflows/conductor-workflow.yml b/.github/workflows/conductor-workflow.yml index 6591777..bd60b98 100644 --- a/.github/workflows/conductor-workflow.yml +++ b/.github/workflows/conductor-workflow.yml @@ -29,24 +29,17 @@ jobs: with: distribution: 'temurin' java-version: '21' - # GitHub actions seem to struggle returning actions/cache cache-hit - # Directly use the cache action here to control whether to fetch dependencies + - name: Set Output + id: step1 + run: echo $GITHUB_WORKSPACE - id: maven-cache-check uses: actions/cache@v4 with: path: ~/.m2/repository - key: maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }} - # Caches should be restored based on a logical order to minimize the build and test - # execution time. Here the logic is as follows: - # 1. Restore this PR's cache if the PR has previously been built - # 2. Restore the latest main cache if the core pom has not changed - # 3. Restore the latest main cache available - # This should minimize the download time required for updating dependencies - restore-keys: | - maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }} - maven-debezium-test-push-build-${{ hashFiles('core/**/pom.xml') }} - maven-debezium-test-push-build- + key: maven-debezium-platform-test-build-${{ hashFiles('./debezium-platform-conductor/core/**/pom.xml') }} + restore-keys: maven-debezium-platform-test-build-${{ hashFiles('./debezium-platform-conductor/core/**/pom.xml') }} - name: Maven build core dependencies + if: steps.maven-cache-check.outputs.cache-hit != 'true' run: > ./core/mvnw clean install -f core/pom.xml -DskipTests @@ -82,8 +75,8 @@ jobs: uses: actions/cache@v4 with: path: ~/.m2/repository - key: maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }} - restore-keys: maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }} + key: maven-debezium-platform-test-build-${{ hashFiles('**/pom.xml') }} + restore-keys: maven-debezium-platform-test-build-${{ hashFiles('**/pom.xml') }} - name: "Checkstyle, Formatting, and Import Order Checks" run: > @@ -114,8 +107,8 @@ jobs: uses: actions/cache@v4 with: path: ~/.m2/repository - key: maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }} - restore-keys: maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }} + key: maven-debezium-platform-test-build-${{ hashFiles('**/pom.xml') }} + restore-keys: maven-debezium-platform-test-build-${{ hashFiles('**/pom.xml') }} - name: Run tests run: ./mvnw clean verify \ No newline at end of file diff --git a/debezium-platform-conductor/.mvn/wrapper/maven-wrapper.properties b/debezium-platform-conductor/.mvn/wrapper/maven-wrapper.properties index 346d645..61ed1e3 100644 --- a/debezium-platform-conductor/.mvn/wrapper/maven-wrapper.properties +++ b/debezium-platform-conductor/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar