From ac16b96da4b45f7e2d532f1497f30b0eeb3a9a06 Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 25 Apr 2023 13:44:35 +0200 Subject: [PATCH 1/4] feat: Add native transport configuration to Maven Add system properties to Maven options to set the native dependency transport for Aether connector. This will improve the speed of dependency resolution by using the native transport layer over HTTP. Also, the request timeout and connection timeout are increased to 300,000 milliseconds in order to allow for slower networks. --- .github/workflows/tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d37b9326f0d..b573750187b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,6 +17,10 @@ on: env: JAVA_DISTRIBUTION: temurin + MAVEN_OPTS: >- + -Dmaven.resolver.transport=native + -Daether.connector.connectTimeout=300000 + -Daether.connector.requestTimeout=300000 jobs: build: From 626a9bdbf9f5d57f151972a5b16bea4a68a2bcb8 Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 25 Apr 2023 14:38:17 +0200 Subject: [PATCH 2/4] refactor: Simplified Maven options in tests.yml Removed unnecessary Maven options in the test workflow configuration file. This will simplify the test runs and remove excess configuration code. --- .github/workflows/tests.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b573750187b..e2a8348d60d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,7 +40,7 @@ jobs: env: - MAVEN_OPTS: -Djava.src.version=${{ matrix.java }} -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false + MAVEN_OPTS: -Djava.src.version=${{ matrix.java }} name: Tests with Java ${{ matrix.java }} on ${{ matrix.os }} steps: @@ -79,8 +79,6 @@ jobs: run: cat testResults.spoon coverage: runs-on: ubuntu-latest - env: - MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false name: Test with coverage steps: - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 @@ -113,8 +111,6 @@ jobs: extra: runs-on: ubuntu-latest - env: - MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false name: Extra checks steps: - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 @@ -147,8 +143,6 @@ jobs: run: ./chore/check-javadoc-regressions.py COMPARE_WITH_MASTER reproducible-builds: runs-on: ubuntu-latest - env: - MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false name: reproducible-builds steps: - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 @@ -162,8 +156,6 @@ jobs: run: chore/check-reproducible-builds.sh maven-central-requirements: runs-on: ubuntu-latest - env: - MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false steps: - uses: actions/checkout@v3 - name: Set up JDK 11 From 0e31cb1845c89ebe3baae7583dccec43d3825cdb Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 25 Apr 2023 14:57:05 +0200 Subject: [PATCH 3/4] test From 746037a1d475825fddc4eb099a75d23d9b585e8e Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 25 Apr 2023 15:12:54 +0200 Subject: [PATCH 4/4] Remove MAVEN_OPTS environment variable from test jobs The changes made removed the MAVEN_OPTS environment variable from the test jobs in the workflow. This variable was previously set to a specific java version which is now not needed as it is inferred from the matrix configuration. Co-authored-by: I-Al-Istannen --- .github/workflows/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e2a8348d60d..087369b07a9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -39,8 +39,6 @@ jobs: - env: - MAVEN_OPTS: -Djava.src.version=${{ matrix.java }} name: Tests with Java ${{ matrix.java }} on ${{ matrix.os }} steps: