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 2024/04/29 14:02:29 UTC
(httpcomponents-core) branch 5.2.x updated (c68ce905d -> 0e90a7082)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch 5.2.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
from c68ce905d Mention HttpStatus and StatusCode in JavaDoc in more places (#454)
new 3c1705305 Disable Conscrypt integration tests on MacOS
new 0e90a7082 Removed Java 8 (MacOS) from Maven build matrix
The 2 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:
.github/workflows/maven.yml | 17 ++++-------------
.../core5/testing/nio/JSSEProviderIntegrationTest.java | 11 -----------
.../core5/testing/nio/JSSEProviderIntegrationTests.java | 4 ++++
3 files changed, 8 insertions(+), 24 deletions(-)
(httpcomponents-core) 01/02: Disable Conscrypt integration tests on MacOS
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch 5.2.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 3c1705305d3affb0a6892906925b889b5f62cd76
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Mon Apr 29 15:30:58 2024 +0200
Disable Conscrypt integration tests on MacOS
---
.../hc/core5/testing/nio/JSSEProviderIntegrationTest.java | 11 -----------
.../hc/core5/testing/nio/JSSEProviderIntegrationTests.java | 4 ++++
2 files changed, 4 insertions(+), 11 deletions(-)
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 61a690330..2b43fc0f2 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
@@ -61,17 +61,6 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.RegisterExtension;
-
-// @Parameterized.Parameters(name = "{0} {1}")
-// public static Collection<Object[]> protocols() {
-// return Arrays.asList(new Object[][]{
-// {"Oracle", null},
-// {"Conscrypt", "TLSv1.2"},
-// {"Conscrypt", "TLSv1.3"},
-// });
-// }
-
-
public abstract class JSSEProviderIntegrationTest {
private final String securityProviderName;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTests.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTests.java
index 36ecda68a..618363468 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTests.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTests.java
@@ -29,6 +29,8 @@ package org.apache.hc.core5.testing.nio;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
public class JSSEProviderIntegrationTests {
@@ -44,6 +46,7 @@ public class JSSEProviderIntegrationTests {
@Nested
@DisplayName("Conscrypt (TLSv1.2)")
+ @DisabledOnOs(OS.MAC)
public class ConscryptTlsV1_2 extends JSSEProviderIntegrationTest {
public ConscryptTlsV1_2() {
@@ -54,6 +57,7 @@ public class JSSEProviderIntegrationTests {
@Nested
@DisplayName("Conscrypt (TLSv1.3)")
+ @DisabledOnOs(OS.MAC)
public class ConscryptTlsV1_3 extends JSSEProviderIntegrationTest {
public ConscryptTlsV1_3() {
(httpcomponents-core) 02/02: Removed Java 8 (MacOS) from Maven build matrix
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch 5.2.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 0e90a70826febdfca612eea70f7823be83772d24
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Mon Apr 29 15:37:26 2024 +0200
Removed Java 8 (MacOS) from Maven build matrix
---
.github/workflows/maven.yml | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8a977c7aa..77e9c6138 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,24 +24,15 @@ jobs:
build:
runs-on: ${{ matrix.os }}
- continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
# 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]
-# 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
+ java: [ 11, 17, 21 ]
+ include:
+ - java: 8
+ os: ubuntu-latest
fail-fast: false
steps: