diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0458783f04..37e144c4af 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -59,6 +59,16 @@ jobs: echo 'HC_BUILD_TOOLCHAIN_VERSION=${{ matrix.java }}' >> "$GITHUB_ENV" ;; esac + # The httpclient5-jakarta-rest-client module is compiled for Java 11, so it must be + # excluded from the reactor whenever the selected toolchain is older than 11. + case '${{ matrix.java }}' in + 8) + echo 'HC_PROFILE_ARGS=-Dhc.jakarta-rest-client.skip=true' >> "$GITHUB_ENV" + ;; + *) + echo 'HC_PROFILE_ARGS=' >> "$GITHUB_ENV" + ;; + esac - name: Set up toolchain JDK ${{ matrix.java }} id: setup-java-toolchain uses: actions/setup-java@v5 @@ -90,4 +100,4 @@ jobs: EOF - name: Build with Maven - run: ./mvnw -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false -Djunit.jupiter.execution.parallel.enabled=false -Dhc.build.toolchain.version="${HC_BUILD_TOOLCHAIN_VERSION}" -Pdocker + run: ./mvnw -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false -Djunit.jupiter.execution.parallel.enabled=false -Dhc.build.toolchain.version="${HC_BUILD_TOOLCHAIN_VERSION}" ${HC_PROFILE_ARGS} -Pdocker diff --git a/httpclient5-jakarta-rest-client/pom.xml b/httpclient5-jakarta-rest-client/pom.xml index 582207e720..f36508ca1d 100644 --- a/httpclient5-jakarta-rest-client/pom.xml +++ b/httpclient5-jakarta-rest-client/pom.xml @@ -98,24 +98,4 @@ - - - skip-on-java8 - - - hc.build.toolchain.version - 1.8 - - - - true - true - true - true - true - true - - - - diff --git a/pom.xml b/pom.xml index d7eac84401..9bc6df3b05 100644 --- a/pom.xml +++ b/pom.xml @@ -298,7 +298,6 @@ httpclient5-fluent httpclient5-websocket httpclient5-cache - httpclient5-jakarta-rest-client httpclient5-testing @@ -462,6 +461,22 @@ + + + jakarta-rest-client + + + !hc.jakarta-rest-client.skip + + + + httpclient5-jakarta-rest-client + + slow-tests