Skip to content

Commit 3d41a2d

Browse files
committed
Upgrade Conscrypt
Currently, we depend on Conscrypt 2.5.2. The most recent release is version 2.6.1, which adds aarch64 native libraries for both Mac and Linux: | | 2.5.2 | 2.6.1 | |-----------------|-------|-------| | Windows x86 | ✅ | | | Windows x86_64 | ✅ | ✅ | | Windows aarch64 | | | | Mac x86_64 | ✅ | ✅ | | Mac aarch64 | | ✅ | | Linux x86_64 | ✅ | ✅ | | Linux aarch64 | | ✅ | This change upgrades to the latest version and updates `AlpnTests` to ensure Conscrypt test coverage on all supported platforms.
1 parent da423c9 commit 3d41a2d

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AlpnTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.junit.jupiter.api.condition.DisabledOnOs;
3737
import org.junit.jupiter.api.condition.EnabledForJreRange;
3838
import org.junit.jupiter.api.condition.JRE;
39+
import org.junit.jupiter.api.condition.OS;
3940
import org.junit.jupiter.api.parallel.Isolated;
4041

4142
class AlpnTests {
@@ -54,7 +55,7 @@ public OracleJSSEAlpnTest() throws Exception {
5455
@Nested
5556
@Isolated
5657
@DisplayName("ALPN Conscrypt (Java 9 or newer)")
57-
@DisabledOnOs(architectures = "aarch64")
58+
@DisabledOnOs(value = OS.WINDOWS, architectures = "aarch64")
5859
@EnabledForJreRange(min = JRE.JAVA_9)
5960
class ConscryptJSSEAlpnTest extends AlpnTest {
6061

@@ -67,7 +68,7 @@ public ConscryptJSSEAlpnTest() throws Exception {
6768
@Nested
6869
@Isolated
6970
@DisplayName("ALPN Conscrypt (Conscrypt specific TLS strategies)")
70-
@DisabledOnOs(architectures = "aarch64")
71+
@DisabledOnOs(value = OS.WINDOWS, architectures = "aarch64")
7172
class ConscryptJSSEAndStrategiesAlpnTest extends AlpnTest {
7273

7374
public ConscryptJSSEAndStrategiesAlpnTest() throws Exception {

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
7474
<!-- Maven itself runs on Java 17+, but compilation and tests can still use an older toolchain JDK. -->
7575
<hc.build.toolchain.version>${maven.compiler.source}</hc.build.toolchain.version>
76-
<conscrypt.version>2.5.2</conscrypt.version>
76+
<conscrypt.version>2.6.1</conscrypt.version>
7777
<jackson.version>3.2.0</jackson.version>
7878
<junit.version>5.14.4</junit.version>
7979
<junit.migrationsupport.version>5.0.0</junit.migrationsupport.version>
@@ -464,4 +464,4 @@
464464
</plugins>
465465
</reporting>
466466

467-
</project>
467+
</project>

0 commit comments

Comments
 (0)