Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ 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.
# The httpclient5-jakarta-rest-client module is compiled for Java 17, so it must be
# excluded from the reactor whenever the selected toolchain is older than 17.
case '${{ matrix.java }}' in
8)
8|11)
echo 'HC_PROFILE_ARGS=-Dhc.jakarta-rest-client.skip=true' >> "$GITHUB_ENV"
;;
*)
Expand Down
4 changes: 2 additions & 2 deletions httpclient5-jakarta-rest-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@

<properties>
<Automatic-Module-Name>org.apache.hc.client5.http.rest</Automatic-Module-Name>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<otel.version>1.64.0</otel.version> <!-- already used elsewhere -->
<commons-compress.version>1.26.2</commons-compress.version>
<caffeine.version>2.9.3</caffeine.version> <!-- java 8. current version 3.2.3 -->
<jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>
<jakarta.ws.rs.version>4.0.0</jakarta.ws.rs.version>
<assertj.version>3.27.7</assertj.version>
</properties>

Expand Down Expand Up @@ -463,8 +463,8 @@
<profiles>
<profile>
<!--
The httpclient5-jakarta-rest-client module is compiled for Java 11, so its class files
cannot be read by javac 8. Builds that select an older toolchain must leave this module
The httpclient5-jakarta-rest-client module is compiled for Java 17, so its class files
cannot be read by javac 8 and 11. Builds that select an older toolchain must leave this module
out of the reactor by setting -Dhc.jakarta-rest-client.skip.
-->
<id>jakarta-rest-client</id>
Expand Down
Loading