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 2022/10/01 16:09:27 UTC
[httpcomponents-core] branch master updated (218b0662d -> ce49c457a)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
omit 218b0662d Temporarily removed windows-latest from the Github CI OS matrix due to intermittent network failures (java.io.IOException: An established connection was aborted by the software in your host machine). It is unclear whether this is a bug in the library or in the Windows JRE.
omit d62fad59f Be more lenient on slower build machines like CI agents
omit 2453f1d2c Replace Travis-CI badge with GitHub Actions badge
omit d6af40db3 Replace TravisCI with GitHub Actions build
omit b20e35333 Update release notes w dependency bumps
new 69dd3378f Update release notes w dependency bumps
new 1d4797101 Replace TravisCI with GitHub Actions build
new e46f5310f Replace Travis-CI badge with GitHub Actions badge
new ca6411065 Be more lenient on slower build machines like CI agents
new ce49c457a Temporarily removed windows-latest from the Github CI OS matrix due to intermittent network failures (java.io.IOException: An established connection was aborted by the software in your host machine). It is unclear whether this is a bug in the library or in the Windows JRE.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (218b0662d)
\
N -- N -- N refs/heads/master (ce49c457a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[httpcomponents-core] 03/05: Replace Travis-CI badge with GitHub Actions badge
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit e46f5310ff2df7a954b60ed7434b293fca964a9b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Sep 28 14:49:27 2022 -0400
Replace Travis-CI badge with GitHub Actions badge
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2736f2619..39809a5a3 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Apache HttpComponents Core
Welcome to the HttpCore component of the Apache HttpComponents project.
-[](https://travis-ci.com/apache/httpcomponents-core)
+[](https://github.com/apache/httpcomponents-core/actions)
[](https://maven-badges.herokuapp.com/maven-central/org.apache.httpcomponents.core5/httpcore5)
[](https://opensource.org/licenses/Apache-2.0)
[httpcomponents-core] 02/05: Replace TravisCI with GitHub Actions build
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 1d4797101d40839040cfdfa3acd933fc7d0c8027
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Sep 28 08:34:08 2022 -0400
Replace TravisCI with GitHub Actions build
---
.github/dependabot.yml | 35 ++++++++++++++
.github/workflows/codeql-analysis.yml | 90 +++++++++++++++++++++++++++++++++++
.github/workflows/depsreview.yaml | 31 ++++++++++++
.github/workflows/maven.yml | 60 +++++++++++++++++++++++
.travis.yml | 48 -------------------
pom.xml | 1 +
6 files changed, 217 insertions(+), 48 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..6db5e610a
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+
+version: 2
+updates:
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ day: "friday"
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ day: "friday"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..64e47283e
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,90 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+# ******** NOTE ********
+
+name: "CodeQL"
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [ master ]
+ schedule:
+ - cron: '16 7 * * 5'
+
+permissions:
+ contents: read
+
+jobs:
+ analyze:
+ permissions:
+ actions: read # for github/codeql-action/init to get workflow details
+ contents: read # for actions/checkout to fetch code
+ security-events: write # for github/codeql-action/analyze to upload SARIF results
+ name: Analyze
+ runs-on: ubuntu-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: [ 'java' ]
+ # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+ # Learn more...
+ # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v2
+ with:
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+ # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+ # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ #- name: Autobuild
+ # uses: github/codeql-action/autobuild@v1
+
+ # âšī¸ Command-line programs to run using the OS shell.
+ # đ https://git.io/JvXDl
+
+ # âī¸ If the Autobuild fails above, remove it and uncomment the following three lines
+ # and modify them (or add more) to build your code if your project
+ # uses a compiled language
+
+ - run: mvn clean package -DskipTests -Drat.skip=true -Dcheckstyle.skip
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/depsreview.yaml b/.github/workflows/depsreview.yaml
new file mode 100644
index 000000000..0aae06b3a
--- /dev/null
+++ b/.github/workflows/depsreview.yaml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+ contents: read
+
+jobs:
+ dependency-review:
+ runs-on: ubuntu-latest
+ steps:
+ - name: 'Checkout Repository'
+ uses: actions/checkout@v3
+ - name: 'Dependency Review'
+ uses: actions/dependency-review-action@v2
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 000000000..9e64927ab
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,60 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Java CI
+
+on: [push, pull_request]
+
+permissions:
+ contents: read
+
+jobs:
+ build:
+
+ runs-on: ${{ matrix.os }}
+ continue-on-error: ${{ matrix.experimental }}
+ strategy:
+ matrix:
+ os: [ubuntu-latest, windows-latest, macos-latest]
+ # All LTS versions plus the current version
+ java: [ 8, 11, 17 ]
+ experimental: [false]
+# include:
+# - java: 20-ea
+# os: ubuntu-latest
+# experimental: true
+# - java: 20-ea
+# os: windows-latest
+# experimental: true
+# - java: 20-ea
+# os: macos-latest
+# experimental: true
+ fail-fast: false
+
+ steps:
+ - uses: actions/checkout@v3.0.2
+ - uses: actions/cache@v3.0.8
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v3
+ with:
+ distribution: 'temurin'
+ java-version: ${{ matrix.java }}
+ - name: Build with Maven
+ run: mvn -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false -P-use-toolchains
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8a73aeee7..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-language: java
-sudo: false
-
-services:
- - docker
-
-jdk:
- - openjdk8
- - openjdk11
- - oraclejdk17
- - openjdk-ea
-
-addons:
- apt:
- packages:
- - maven
-
-install: skip
-script: mvn verify -B -P docker
-
-jobs:
- fast_finish: true
- include:
- - name: arm64
- arch: arm64
- jdk: openjdk11
- script: mvn verify -B
- allow_failures:
- - jdk: openjdk-ea
-
-cache:
- directories:
- - $HOME/.m2
diff --git a/pom.xml b/pom.xml
index 09cb1ce41..2ba9e5fcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,7 @@
</dependencyManagement>
<build>
+ <defaultGoal>clean verify</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
[httpcomponents-core] 05/05: Temporarily removed windows-latest from the Github CI OS matrix due to intermittent network failures (java.io.IOException: An established connection was aborted by the software in your host machine). It is unclear whether this is a bug in the library or in the Windows JRE.
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit ce49c457a6f07392073361a03c6f235e40749d75
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sat Oct 1 17:27:47 2022 +0200
Temporarily removed windows-latest from the Github CI OS matrix due to intermittent network failures (java.io.IOException: An established connection was aborted by the software in your host machine). It is unclear whether this is a bug in the library or in the Windows JRE.
---
.github/workflows/maven.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9e64927ab..2ce1dc2d3 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,7 +27,8 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
- os: [ubuntu-latest, windows-latest, macos-latest]
+ # windows-latest is not used due to intermittent network failures
+ os: [ubuntu-latest, macos-latest]
# All LTS versions plus the current version
java: [ 8, 11, 17 ]
experimental: [false]
[httpcomponents-core] 04/05: Be more lenient on slower build machines like CI agents
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit ca641106548d2d8d8d1b3a90162063862fa9af06
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Sep 28 10:40:51 2022 -0400
Be more lenient on slower build machines like CI agents
---
.../org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java | 2 +-
.../apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java | 2 +-
.../hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java | 2 +-
.../org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java | 2 +-
.../org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java | 2 +-
.../src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java | 2 +-
.../test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java | 2 +-
.../java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java | 2 +-
.../hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java | 2 +-
.../java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java | 2 +-
.../org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java | 2 +-
.../java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java | 2 +-
.../test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java | 2 +-
.../org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java | 2 +-
.../org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java | 2 +-
.../apache/hc/core5/http/nio/support/classic/TestSharedInputBuffer.java | 2 +-
.../hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
index 4ce5898a3..220aee72d 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
@@ -85,7 +85,7 @@ public class ClassicAuthenticationTest {
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
index b2c423720..c74677d57 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
@@ -81,7 +81,7 @@ public class ClassicServerAndRequesterTest {
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
index ebd6dfa3c..35ef2c132 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
@Extensions({@ExtendWith({ExternalResourceSupport.class})})
public class ClassicServerBootstrapFilterTest {
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
index 4b48aa6d4..80966a149 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
@@ -68,7 +68,7 @@ import org.junit.rules.ExternalResource;
@Extensions({@ExtendWith({ExternalResourceSupport.class})})
public class ClassicTLSIntegrationTest {
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private HttpServer server;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
index f11385415..4b56116a8 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
@@ -77,7 +77,7 @@ public class AsyncServerBootstrapFilterTest {
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private HttpAsyncServer server;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
index 32afe51b4..138f1a395 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
@@ -79,7 +79,7 @@ import org.slf4j.LoggerFactory;
public class H2AlpnTest {
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
@Parameterized.Parameters(name = "strict h2 ALPN: {0}, h2 allowed: {1}")
public static Iterable<Object[]> parameters() {
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
index b41db879e..173798c51 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
@@ -154,7 +154,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
super(scheme);
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private static final Timeout LONG_TIMEOUT = Timeout.ofSeconds(60);
private H2TestClient client;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
index 79fea6c81..37fc4e608 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
@@ -71,7 +71,7 @@ import org.slf4j.LoggerFactory;
@Extensions({@ExtendWith({ExternalResourceSupport.class})})
public class H2ProtocolNegotiationTest {
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
index c50e911bb..0040076df 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
@@ -90,7 +90,7 @@ public class H2ServerAndMultiplexingRequesterTest {
{ URIScheme.HTTPS }
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final URIScheme scheme;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
index e12711052..81c3657ee 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
@@ -87,7 +87,7 @@ public class H2ServerAndRequesterTest {
{ URIScheme.HTTPS }
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final URIScheme scheme;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java
index 438b6d3f4..690b21acc 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java
@@ -78,7 +78,7 @@ public class H2ServerBootstrapFiltersTest {
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private HttpAsyncServer server;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
index 296778dd8..5178e6b47 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
@@ -90,7 +90,7 @@ public class Http1AuthenticationTest {
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
index 4f4cdc59e..fd6633fc5 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
@@ -165,7 +165,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
super(scheme);
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private static final Timeout LONG_TIMEOUT = Timeout.ofSeconds(60);
private Http1TestClient client;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
index 66f4eff0f..8ceb54d20 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
@@ -96,7 +96,7 @@ public class Http1ServerAndRequesterTest {
{ URIScheme.HTTPS }
});
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final URIScheme scheme;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
index 95f7bc97f..57f984139 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
@@ -93,7 +93,7 @@ public class JSSEProviderIntegrationTest {
this.protocolVersion = protocolVersion;
}
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private static final int REQ_NUM = 25;
private Provider securityProvider;
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedInputBuffer.java b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedInputBuffer.java
index 0a712b09e..ac1d101cb 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedInputBuffer.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedInputBuffer.java
@@ -45,7 +45,7 @@ import org.mockito.Mockito;
public class TestSharedInputBuffer {
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
@Test
public void testBasis() throws Exception {
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java
index ebb74fc37..35e8d55db 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java
@@ -48,7 +48,7 @@ import org.mockito.Mockito;
public class TestSharedOutputBuffer {
- private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
static class DataStreamChannelMock implements DataStreamChannel {
[httpcomponents-core] 01/05: Update release notes w dependency bumps
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 69dd3378f78d19af88ebfbd1de038ecd86fade42
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Sep 28 13:42:40 2022 -0400
Update release notes w dependency bumps
---
RELEASE_NOTES.txt | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 76727383e..a0d664a6c 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -3,9 +3,12 @@ Release 5.2 BETA3
* Deprecate org.apache.hc.core5.util.LangUtils.equals(Object[], Object[]) in favor or java.util.Arrays.equals(Object[], Object[]).
* Deprecate org.apache.hc.core5.util.LangUtils.equals(Object, Object) in favor or java.util.Objects.equals(Object, Object).
-* Bump JUnit from 5.8.2 to 5.9.0.
-* Bump Mockito from 4.4.0 to 4.7.0.
+* Bump JUnit from 5.8.2 to 5.9.1 #363.
+* Bump mockito-core from 4.4.0 to 4.8.0 #366.
* Bump JApiCmp from 0.15.4 to 0.15.7.
+* Bump reactive-streams from 1.0.3 to 1.0.4 #364.
+* Bump rxjava from 3.1.3 to 3.1.5 #362.
+* Bump commons-cli from 1.4 to 1.5.0 #365.
Release 5.2 BETA2