From 3dcc933e46459df9e9e4e1a52bc8e4ce44973720 Mon Sep 17 00:00:00 2001 From: Romain Grecourt Date: Fri, 17 Mar 2023 18:59:26 +0100 Subject: [PATCH] rebase on main Signed-off-by: tvallin --- .../test/java/io/helidon/builder/test/CustomNamedTest.java | 2 +- etc/scripts/github-build.bat | 2 +- etc/scripts/github-compile.bat | 2 +- etc/scripts/includes/pipeline-env.sh | 2 +- etc/scripts/test-archetypes.bat | 2 +- etc/scripts/test-packaging-jar.bat | 2 +- etc/scripts/test-packaging-jlink.bat | 2 +- etc/scripts/test-packaging-native.bat | 2 +- .../io/helidon/inject/processor/ActiveProcessorUtils.java | 2 +- .../test/java/io/helidon/inject/processor/TestUtils.java | 2 +- .../java/io/helidon/inject/tests/inject/TestUtils.java | 2 +- .../main/java/io/helidon/inject/tools/CodeGenFiler.java | 2 +- .../src/main/java/io/helidon/inject/tools/CommonUtils.java | 2 +- .../src/main/java/io/helidon/inject/tools/ModuleUtils.java | 2 +- .../oci/sdk/runtime/OciAuthenticationDetailsProvider.java | 2 +- .../io/helidon/microprofile/telemetry/WithSpanTest.java | 3 +++ .../telemetry/WithSpanWithExplicitAppTest.java | 3 +++ .../microprofile/telemetry/RestSpanHierarchyTest.java | 3 +++ .../security/providers/oidc/common/OidcEncryption.java | 6 ++++-- .../io/helidon/messaging/connectors/jms/AckMpTest.java | 2 +- .../io/helidon/messaging/connectors/kafka/KafkaSeTest.java | 2 +- .../helidon/tests/integration/oidc/CookieBasedLoginIT.java | 2 +- .../java/io/helidon/tests/integration/oidc/IdTokenIT.java | 4 +++- .../io/helidon/tests/integration/oidc/RefreshTokenIT.java | 7 +++---- .../tests/integration/oidc/TenantIdentificationIT.java | 2 +- .../helidon/webserver/staticcontent/CachedHandlerTest.java | 2 +- .../helidon/webserver/tests/http2/EmptyFrameCntTest.java | 5 ++++- .../webserver/tests/websocket/WsConversationClient.java | 2 +- .../webserver/tests/websocket/WsConversationTest.java | 2 +- 29 files changed, 45 insertions(+), 30 deletions(-) diff --git a/builder/tests/builder/src/test/java/io/helidon/builder/test/CustomNamedTest.java b/builder/tests/builder/src/test/java/io/helidon/builder/test/CustomNamedTest.java index d174ed71ee2..611681b0585 100644 --- a/builder/tests/builder/src/test/java/io/helidon/builder/test/CustomNamedTest.java +++ b/builder/tests/builder/src/test/java/io/helidon/builder/test/CustomNamedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/etc/scripts/github-build.bat b/etc/scripts/github-build.bat index caadc8cd045..f199a889b7b 100644 --- a/etc/scripts/github-build.bat +++ b/etc/scripts/github-build.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright (c) 2023 Oracle and/or its affiliates. +@REM Copyright (c) 2024 Oracle and/or its affiliates. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/etc/scripts/github-compile.bat b/etc/scripts/github-compile.bat index cc664bb72a4..73ec2c4a5ec 100644 --- a/etc/scripts/github-compile.bat +++ b/etc/scripts/github-compile.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright (c) 2023 Oracle and/or its affiliates. +@REM Copyright (c) 2024 Oracle and/or its affiliates. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/etc/scripts/includes/pipeline-env.sh b/etc/scripts/includes/pipeline-env.sh index e19b26e6656..f54e8bb27e3 100644 --- a/etc/scripts/includes/pipeline-env.sh +++ b/etc/scripts/includes/pipeline-env.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2018, 2023 Oracle and/or its affiliates. +# Copyright (c) 2018, 2024 Oracle and/or its affiliates. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/etc/scripts/test-archetypes.bat b/etc/scripts/test-archetypes.bat index b1a030d7ad5..236314b4003 100644 --- a/etc/scripts/test-archetypes.bat +++ b/etc/scripts/test-archetypes.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright (c) 2023 Oracle and/or its affiliates. +@REM Copyright (c) 2024 Oracle and/or its affiliates. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/etc/scripts/test-packaging-jar.bat b/etc/scripts/test-packaging-jar.bat index 00d27c2ccab..1469dd3cc8f 100644 --- a/etc/scripts/test-packaging-jar.bat +++ b/etc/scripts/test-packaging-jar.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright (c) 2023 Oracle and/or its affiliates. +@REM Copyright (c) 2024 Oracle and/or its affiliates. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/etc/scripts/test-packaging-jlink.bat b/etc/scripts/test-packaging-jlink.bat index 4f9493c9c17..4fce8848889 100644 --- a/etc/scripts/test-packaging-jlink.bat +++ b/etc/scripts/test-packaging-jlink.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright (c) 2023 Oracle and/or its affiliates. +@REM Copyright (c) 2024 Oracle and/or its affiliates. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/etc/scripts/test-packaging-native.bat b/etc/scripts/test-packaging-native.bat index f9659f30eb7..d73b149d937 100644 --- a/etc/scripts/test-packaging-native.bat +++ b/etc/scripts/test-packaging-native.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright (c) 2023 Oracle and/or its affiliates. +@REM Copyright (c) 2024 Oracle and/or its affiliates. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/inject/processor/src/main/java/io/helidon/inject/processor/ActiveProcessorUtils.java b/inject/processor/src/main/java/io/helidon/inject/processor/ActiveProcessorUtils.java index afc2e6f6679..126ea37e1f1 100644 --- a/inject/processor/src/main/java/io/helidon/inject/processor/ActiveProcessorUtils.java +++ b/inject/processor/src/main/java/io/helidon/inject/processor/ActiveProcessorUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/inject/processor/src/test/java/io/helidon/inject/processor/TestUtils.java b/inject/processor/src/test/java/io/helidon/inject/processor/TestUtils.java index d6b287ed5bf..83f6cd28077 100644 --- a/inject/processor/src/test/java/io/helidon/inject/processor/TestUtils.java +++ b/inject/processor/src/test/java/io/helidon/inject/processor/TestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/inject/tests/resources-inject/src/test/java/io/helidon/inject/tests/inject/TestUtils.java b/inject/tests/resources-inject/src/test/java/io/helidon/inject/tests/inject/TestUtils.java index 8212c129ecf..b25ec6ad7c8 100644 --- a/inject/tests/resources-inject/src/test/java/io/helidon/inject/tests/inject/TestUtils.java +++ b/inject/tests/resources-inject/src/test/java/io/helidon/inject/tests/inject/TestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/inject/tools/src/main/java/io/helidon/inject/tools/CodeGenFiler.java b/inject/tools/src/main/java/io/helidon/inject/tools/CodeGenFiler.java index c7d7b26e72c..cad37a9db00 100644 --- a/inject/tools/src/main/java/io/helidon/inject/tools/CodeGenFiler.java +++ b/inject/tools/src/main/java/io/helidon/inject/tools/CodeGenFiler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/inject/tools/src/main/java/io/helidon/inject/tools/CommonUtils.java b/inject/tools/src/main/java/io/helidon/inject/tools/CommonUtils.java index 3286d198013..b3078cff070 100644 --- a/inject/tools/src/main/java/io/helidon/inject/tools/CommonUtils.java +++ b/inject/tools/src/main/java/io/helidon/inject/tools/CommonUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/inject/tools/src/main/java/io/helidon/inject/tools/ModuleUtils.java b/inject/tools/src/main/java/io/helidon/inject/tools/ModuleUtils.java index 93c94acbbe9..164def37b50 100644 --- a/inject/tools/src/main/java/io/helidon/inject/tools/ModuleUtils.java +++ b/inject/tools/src/main/java/io/helidon/inject/tools/ModuleUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/integrations/oci/sdk/runtime/src/main/java/io/helidon/integrations/oci/sdk/runtime/OciAuthenticationDetailsProvider.java b/integrations/oci/sdk/runtime/src/main/java/io/helidon/integrations/oci/sdk/runtime/OciAuthenticationDetailsProvider.java index 7bf77fb738b..7c37587ea2d 100644 --- a/integrations/oci/sdk/runtime/src/main/java/io/helidon/integrations/oci/sdk/runtime/OciAuthenticationDetailsProvider.java +++ b/integrations/oci/sdk/runtime/src/main/java/io/helidon/integrations/oci/sdk/runtime/OciAuthenticationDetailsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/WithSpanTest.java b/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/WithSpanTest.java index 07d4aa2f9ed..42221952425 100644 --- a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/WithSpanTest.java +++ b/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/WithSpanTest.java @@ -22,12 +22,15 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.trace.data.SpanData; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +@DisabledOnOs(OS.WINDOWS) class WithSpanTest extends WithSpanTestBase { @Test diff --git a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/WithSpanWithExplicitAppTest.java b/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/WithSpanWithExplicitAppTest.java index 1c978a0115c..c5196a1089e 100644 --- a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/WithSpanWithExplicitAppTest.java +++ b/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/WithSpanWithExplicitAppTest.java @@ -19,11 +19,14 @@ import io.helidon.microprofile.testing.junit5.AddBean; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @AddBean(App.class) @AddBean(AppTracedResource.class) +@DisabledOnOs(OS.WINDOWS) class WithSpanWithExplicitAppTest extends WithSpanTestBase { @ParameterizedTest() diff --git a/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java b/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java index 1966edbf482..e4e23775cd2 100644 --- a/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java +++ b/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java @@ -40,6 +40,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.api.trace.SpanKind.SERVER; @@ -71,6 +73,7 @@ void setup() { } @Test + @DisabledOnOs(OS.WINDOWS) void spanHierarchy() { assertThat(webTarget.path("mixed").request().get().getStatus(), is(Response.Status.OK.getStatusCode())); diff --git a/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcEncryption.java b/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcEncryption.java index 1be9e27578c..90c7c357e1b 100644 --- a/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcEncryption.java +++ b/security/providers/oidc-common/src/main/java/io/helidon/security/providers/oidc/common/OidcEncryption.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2023 Oracle and/or its affiliates. + * Copyright (c) 2021, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -82,7 +82,9 @@ private static char[] generateMasterPassword() { String password = UUID.randomUUID().toString(); try { Files.writeString(path, password, StandardCharsets.UTF_8, StandardOpenOption.CREATE_NEW); - Files.setPosixFilePermissions(path, Set.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE)); + if (path.getFileSystem().supportedFileAttributeViews().contains("posix")) { + Files.setPosixFilePermissions(path, Set.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE)); + } } catch (IOException e) { throw new SecurityException("Failed to create OIDC secret " + path.toAbsolutePath(), e); } diff --git a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java index e35520afab7..6ea3b16e3c7 100644 --- a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java +++ b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2023 Oracle and/or its affiliates. + * Copyright (c) 2020, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tests/integration/kafka/src/test/java/io/helidon/messaging/connectors/kafka/KafkaSeTest.java b/tests/integration/kafka/src/test/java/io/helidon/messaging/connectors/kafka/KafkaSeTest.java index 2960a08cc67..404f40b34b7 100644 --- a/tests/integration/kafka/src/test/java/io/helidon/messaging/connectors/kafka/KafkaSeTest.java +++ b/tests/integration/kafka/src/test/java/io/helidon/messaging/connectors/kafka/KafkaSeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2023 Oracle and/or its affiliates. + * Copyright (c) 2020, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java index c079b7933be..772bd1cbaba 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/IdTokenIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/IdTokenIT.java index b8efaae7004..3ece8797c76 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/IdTokenIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/IdTokenIT.java @@ -27,7 +27,6 @@ import io.helidon.security.jwt.Jwt; import io.helidon.security.jwt.SignedJwt; import io.helidon.security.jwt.jwk.Jwk; -import io.helidon.security.providers.oidc.common.OidcConfig; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; @@ -44,6 +43,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import static io.helidon.security.providers.oidc.common.OidcConfig.DEFAULT_ID_COOKIE_NAME; import static io.helidon.tests.integration.oidc.TestResource.EXPECTED_TEST_MESSAGE; @@ -55,6 +56,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; +@DisabledOnOs(OS.WINDOWS) class IdTokenIT extends CommonLoginBase { private static final ClientConfig CONFIG_CLIENT_2 = new ClientConfig() diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/RefreshTokenIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/RefreshTokenIT.java index d6170329b3f..e90e10c25e6 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/RefreshTokenIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/RefreshTokenIT.java @@ -33,21 +33,20 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; -import static io.helidon.tests.integration.oidc.TestResource.EXPECTED_POST_LOGOUT_TEST_MESSAGE; import static io.helidon.tests.integration.oidc.TestResource.EXPECTED_TEST_MESSAGE; import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; @AddConfig(key = "security.providers.1.oidc.token-signature-validation", value = "false") +@DisabledOnOs(OS.WINDOWS) class RefreshTokenIT extends CommonLoginBase { @Test diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java index aec70e3bd66..78b85c8bd8d 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/webserver/static-content/src/test/java/io/helidon/webserver/staticcontent/CachedHandlerTest.java b/webserver/static-content/src/test/java/io/helidon/webserver/staticcontent/CachedHandlerTest.java index 1cff05cf696..e440a4589d0 100644 --- a/webserver/static-content/src/test/java/io/helidon/webserver/staticcontent/CachedHandlerTest.java +++ b/webserver/static-content/src/test/java/io/helidon/webserver/staticcontent/CachedHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/webserver/tests/http2/src/test/java/io/helidon/webserver/tests/http2/EmptyFrameCntTest.java b/webserver/tests/http2/src/test/java/io/helidon/webserver/tests/http2/EmptyFrameCntTest.java index 1cdf07ab139..d4a76ce9941 100644 --- a/webserver/tests/http2/src/test/java/io/helidon/webserver/tests/http2/EmptyFrameCntTest.java +++ b/webserver/tests/http2/src/test/java/io/helidon/webserver/tests/http2/EmptyFrameCntTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,6 +59,8 @@ import io.helidon.webserver.testing.junit5.SetUpServer; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import static io.helidon.http.Method.GET; import static io.netty.handler.codec.http2.Http2CodecUtil.FRAME_HEADER_LENGTH; @@ -67,6 +69,7 @@ import static org.hamcrest.Matchers.is; @ServerTest +@DisabledOnOs(OS.WINDOWS) class EmptyFrameCntTest { private static final Duration TIMEOUT = Duration.ofSeconds(10); diff --git a/webserver/tests/websocket/src/main/java/io/helidon/webserver/tests/websocket/WsConversationClient.java b/webserver/tests/websocket/src/main/java/io/helidon/webserver/tests/websocket/WsConversationClient.java index 4869978f961..3521c61ed0e 100644 --- a/webserver/tests/websocket/src/main/java/io/helidon/webserver/tests/websocket/WsConversationClient.java +++ b/webserver/tests/websocket/src/main/java/io/helidon/webserver/tests/websocket/WsConversationClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/webserver/tests/websocket/src/test/java/io/helidon/webserver/tests/websocket/WsConversationTest.java b/webserver/tests/websocket/src/test/java/io/helidon/webserver/tests/websocket/WsConversationTest.java index 12ead3b8529..9db39699ed2 100644 --- a/webserver/tests/websocket/src/test/java/io/helidon/webserver/tests/websocket/WsConversationTest.java +++ b/webserver/tests/websocket/src/test/java/io/helidon/webserver/tests/websocket/WsConversationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.