From 94a4dce9895e9d6086bae6c1e712e64efb7badea Mon Sep 17 00:00:00 2001 From: Dmitry Aleksandrov Date: Mon, 18 Sep 2023 22:04:04 +0300 Subject: [PATCH 1/3] Fix parent for TestNG project Signed-off-by: Dmitry Aleksandrov --- microprofile/tests/testng/pom.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/microprofile/tests/testng/pom.xml b/microprofile/tests/testng/pom.xml index a7b45e55015..fbc5e3c2da1 100644 --- a/microprofile/tests/testng/pom.xml +++ b/microprofile/tests/testng/pom.xml @@ -18,12 +18,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - tests-project - io.helidon.microprofile.tests + io.helidon.microprofile + helidon-microprofile-project 3.2.3-SNAPSHOT + ../../pom.xml 4.0.0 - + + io.helidon.microprofile.tests helidon-microprofile-tests-testng Helidon Microprofile Tests TestNG From 78e0e10227d12660bfe2a144808b2384e7319583 Mon Sep 17 00:00:00 2001 From: Dmitry Aleksandrov Date: Tue, 19 Sep 2023 11:09:01 +0300 Subject: [PATCH 2/3] Fix JavaDoc Signed-off-by: Dmitry Aleksandrov --- .../io/helidon/microprofile/tests/testng/Configuration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/Configuration.java b/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/Configuration.java index c2442bb749e..d4add4187e3 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/Configuration.java +++ b/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/Configuration.java @@ -33,7 +33,7 @@ * If set to {@code true}, the existing (or default) MicroProfile configuration would be used. * By default uses a configuration constructed using all {@link AddConfig} * annotations and {@link #configSources()}. - * When set to false and a {@link org.junit.jupiter.api.BeforeAll} method registers a custom configuration + * When set to false and a {@link org.testng.annotations.BeforeClass} method registers a custom configuration * with {@link org.eclipse.microprofile.config.spi.ConfigProviderResolver}, the result is undefined, though * tests have shown that the registered config may be used (as BeforeAll ordering is undefined by * JUnit, it may be called after our extension) From 45849a4f1416fe0c237a3914a899e95074f01514 Mon Sep 17 00:00:00 2001 From: Dmitry Aleksandrov Date: Tue, 19 Sep 2023 11:13:11 +0300 Subject: [PATCH 3/3] Fix Checkstyle Signed-off-by: Dmitry Aleksandrov --- .../io/helidon/microprofile/tests/testng/Configuration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/Configuration.java b/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/Configuration.java index d4add4187e3..5508d821471 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/Configuration.java +++ b/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/Configuration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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.