You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2026/10/02 07:37:46 UTC
(httpcomponents-client) branch master updated: Upgraded HC parent to version 15 / POM cleanup
This is an automated email from the ASF dual-hosted git repository.
ok2c pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
The following commit(s) were added to refs/heads/master by this push:
new 90a7e7742 Upgraded HC parent to version 15 / POM cleanup
90a7e7742 is described below
commit 90a7e77427f19fa20263b9fe4e05d2b117951239
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sun Sep 27 15:51:13 2026 +0200
Upgraded HC parent to version 15 / POM cleanup
---
.github/workflows/maven.yml | 2 +-
httpclient5-jakarta-rest-client/pom.xml | 12 ++---
httpclient5-observation/pom.xml | 1 -
httpclient5-testing/pom.xml | 13 ++++-
httpclient5-websocket/pom.xml | 2 -
pom.xml | 94 +++++++++++----------------------
src/site/site.xml | 30 +++++------
7 files changed, 61 insertions(+), 93 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 2ceb17f4c..e87ad7907 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -100,4 +100,4 @@ jobs:
</toolchains>
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}" ${HC_PROFILE_ARGS} -Pdocker
+ run: ./mvnw -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false -Djunit.jupiter.execution.parallel.enabled=false -DjavaVersion="${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 6833aba5f..9d1493d87 100644
--- a/httpclient5-jakarta-rest-client/pom.xml
+++ b/httpclient5-jakarta-rest-client/pom.xml
@@ -37,8 +37,9 @@
<properties>
<Automatic-Module-Name>org.apache.hc.client5.http.rest</Automatic-Module-Name>
- <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>17</maven.compiler.target>
+ <javaVersion>17</javaVersion>
+ <maven.compiler.source>${javaVersion}</maven.compiler.source>
+ <maven.compiler.target>${javaVersion}</maven.compiler.target>
</properties>
<dependencies>
@@ -95,13 +96,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/httpclient5-observation/pom.xml b/httpclient5-observation/pom.xml
index e6b30ef9e..bbca018bd 100644
--- a/httpclient5-observation/pom.xml
+++ b/httpclient5-observation/pom.xml
@@ -110,7 +110,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
index ae410d35c..e0cfd61b8 100644
--- a/httpclient5-testing/pom.xml
+++ b/httpclient5-testing/pom.xml
@@ -120,6 +120,18 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludedGroups>slow,time-out,stale-conn</excludedGroups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>docker</id>
@@ -129,7 +141,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${hc.surefire.version}</version>
<executions>
<execution>
<goals>
diff --git a/httpclient5-websocket/pom.xml b/httpclient5-websocket/pom.xml
index f0ba5a30e..95279d8d2 100644
--- a/httpclient5-websocket/pom.xml
+++ b/httpclient5-websocket/pom.xml
@@ -81,7 +81,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -91,7 +90,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${hc.surefire.version}</version>
<configuration>
<useModulePath>false</useModulePath>
</configuration>
diff --git a/pom.xml b/pom.xml
index 0dcba5b09..0a5897670 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-parent</artifactId>
- <version>14</version>
+ <version>15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.httpcomponents.client5</groupId>
@@ -60,10 +60,17 @@
</distributionManagement>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <!-- Maven itself runs on Java 17+, but compilation and tests can still use an older toolchain JDK. -->
- <hc.build.toolchain.version>${maven.compiler.source}</hc.build.toolchain.version>
+ <javaVersion>8</javaVersion>
+ <minimalJavaBuildVersion>17</minimalJavaBuildVersion>
+ <maven.compiler.source>${javaVersion}</maven.compiler.source>
+ <maven.compiler.target>${javaVersion}</maven.compiler.target>
+ <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
+ <api.comparison.version>5.6</api.comparison.version>
+
+ <!-- Disable animal sniffer. It has been superseded by compiler release version
+ To be completely removed -->
+ <animal.sniffer.skip>true</animal.sniffer.skip>
+
<httpcore.version>5.5-beta3</httpcore.version>
<log4j.version>2.26.1</log4j.version>
<brotli4j.version>1.23.0</brotli4j.version>
@@ -77,8 +84,6 @@
<rxjava3.version>3.1.12</rxjava3.version>
<testcontainers.version>1.21.4</testcontainers.version>
<junixsocket.version>2.10.1</junixsocket.version>
- <api.comparison.version>5.6</api.comparison.version>
- <hc.animal-sniffer.signature.ignores>javax.net.ssl.SSLEngine,javax.net.ssl.SSLParameters,java.nio.ByteBuffer,java.nio.CharBuffer,jdk.net.ExtendedSocketOptions,jdk.net.Sockets</hc.animal-sniffer.signature.ignores>
<commons.compress.version>1.28.0</commons.compress.version>
<zstd.jni.version>1.5.7-11</zstd.jni.version>
<micrometer.version>1.17.0</micrometer.version>
@@ -304,6 +309,19 @@
<build>
<defaultGoal>clean verify</defaultGoal>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ <!-- unset compiler release version set by the apache parent
+ Presently core and client fail compile with java 8 release target
+ due to the use of jdk.net classes
+ -->
+ <release combine.self="override"/>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -366,31 +384,9 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.6.3</version>
- <executions>
- <execution>
- <id>enforce-java-runtime</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[17,)</version>
- <message>Apache HttpComponents Client requires Java 17 or newer to run Maven. Use toolchains to compile and test with older JDKs.</message>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
- <version>0.26.1</version>
<configuration>
<oldVersion>
<dependency>
@@ -430,7 +426,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.18</version>
<executions>
<execution>
<phase>verify</phase>
@@ -453,7 +448,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${hc.surefire.version}</version>
+ <!-- Several features such as group exclusion and parallel test execution
+ in the integration test suite do not appear to work reliably with
+ versions of maven-surefire-plugin higher than 3.5.0
+ -->
+ <version>3.5.0</version>
<configuration>
<excludedGroups>slow,time-out,stale-conn</excludedGroups>
</configuration>
@@ -486,7 +485,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${hc.surefire.version}</version>
<configuration combine.self="override">
<groups>slow</groups>
</configuration>
@@ -503,7 +501,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${hc.surefire.version}</version>
<configuration combine.self="override">
<excludedGroups>slow</excludedGroups>
</configuration>
@@ -512,37 +509,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>use-toolchains</id>
- <activation>
- <file>
- <exists>${user.home}/.m2/toolchains.xml</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>3.2.0</version>
- <configuration combine.self="override">
- <toolchains>
- <jdk>
- <version>${hc.build.toolchain.version}</version>
- </jdk>
- </toolchains>
- </configuration>
- <executions combine.self="override">
- <execution>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
diff --git a/src/site/site.xml b/src/site/site.xml
index 65ce9f5fb..e2b63c78e 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -18,24 +18,22 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Apache HttpComponents Client">
+<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
+ name="Apache HttpComponents Client">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.9</version>
+ <version>2.1.0</version>
</skin>
- <bannerLeft>
- <name>Apache</name>
- <src>https://www.apache.org/images/asf_logo.gif</src>
- <href>https://www.apache.org/</href>
+ <bannerLeft href="https://www.apache.org/">
+ <image alt="Apache" src="https://www.apache.org/images/asf_logo.gif" />
</bannerLeft>
- <bannerRight>
- <name>HttpComponents</name>
- <src>https://hc.apache.org/images/logos/httpcomponents.png</src>
- <href>https://hc.apache.org/</href>
+ <bannerRight href="https://hc.apache.org/">
+ <image alt="HttpComponents" src="https://hc.apache.org/images/logos/httpcomponents.png" />
</bannerRight>
<body>
@@ -61,11 +59,13 @@ under the License.
<!-- inherited -->
<poweredBy>
<!-- Add ApacheCon logo -->
- <logo name="ApacheCon" href="https://www.apache.org/events/current-event.html"
- img="https://www.apache.org/events/current-event-125x125.png"/>
+ <logo href="https://www.apache.org/events/current-event.html">
+ <image src="https://www.apache.org/events/current-event-125x125.png" alt="ApacheCon"/>
+ </logo>
<!-- Keep the default logo as well -->
- <logo name="Maven" href="https://maven.apache.org/"
- img="https://maven.apache.org/images/logos/maven-feather.png"/>
+ <logo href="https://maven.apache.org/">
+ <image src="https://maven.apache.org/images/logos/maven-feather.png" alt="Maven"/>
+ </logo>
</poweredBy>
<!-- inherited -->
@@ -79,4 +79,4 @@ under the License.
<skipGenerationDate>true</skipGenerationDate>
</fluidoSkin>
</custom>
-</project>
+</site>