Skip to content

Upgrade Conscrypt #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rschmitt wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

Upgrade Conscrypt #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AlpnTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.api.condition.OS;
import org.junit.jupiter.api.parallel.Isolated;

class AlpnTests {
Expand All @@ -54,7 +55,7 @@ public OracleJSSEAlpnTest() throws Exception {
@Nested
@Isolated
@DisplayName("ALPN Conscrypt (Java 9 or newer)")
@DisabledOnOs(architectures = "aarch64")
@DisabledOnOs(value = OS.WINDOWS, architectures = "aarch64")
@EnabledForJreRange(min = JRE.JAVA_9)
class ConscryptJSSEAlpnTest extends AlpnTest {

Expand All @@ -67,7 +68,7 @@ public ConscryptJSSEAlpnTest() throws Exception {
@Nested
@Isolated
@DisplayName("ALPN Conscrypt (Conscrypt specific TLS strategies)")
@DisabledOnOs(architectures = "aarch64")
@DisabledOnOs(value = OS.WINDOWS, architectures = "aarch64")
class ConscryptJSSEAndStrategiesAlpnTest extends AlpnTest {

public ConscryptJSSEAndStrategiesAlpnTest() throws Exception {
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<!-- 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>
<conscrypt.version>2.5.2</conscrypt.version>
<conscrypt.version>2.6.1</conscrypt.version>
<junit.version>5.14.4</junit.version>
<junit.migrationsupport.version>5.0.0</junit.migrationsupport.version>
<mockito.version>4.11.0</mockito.version>
Expand Down Expand Up @@ -448,4 +448,4 @@
</plugins>
</reporting>

</project>
</project>
Loading