Skip to content

Commit 3e4c8d9

Browse files
committed
Fix modular setup
1 parent 99ea082 commit 3e4c8d9

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

junit-jupiter-api/src/main/java/module-info.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@
2929
exports org.junit.jupiter.api.extension.support;
3030
exports org.junit.jupiter.api.function;
3131
exports org.junit.jupiter.api.io;
32+
exports org.junit.jupiter.api.locale;
3233
exports org.junit.jupiter.api.parallel;
3334
exports org.junit.jupiter.api.timeout to org.junit.jupiter.engine;
34-
exports org.junit.jupiter.api.locale to org.junit.platform.engine;
35-
exports org.junit.jupiter.api.timezone to org.junit.platform.engine;
35+
exports org.junit.jupiter.api.timezone;
3636

3737
opens org.junit.jupiter.api.condition to org.junit.platform.commons;
38-
opens org.junit.jupiter.api.locale to org.junit.platform.commons;
39-
opens org.junit.jupiter.api.timezone to org.junit.platform.commons;
4038
}

junit-jupiter-api/src/main/java/org/junit/jupiter/api/locale/DefaultLocaleExtension.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010

1111
package org.junit.jupiter.api.locale;
1212

13+
import static org.apiguardian.api.API.Status.EXPERIMENTAL;
14+
1315
import java.util.Locale;
1416
import java.util.Optional;
1517

18+
import org.apiguardian.api.API;
1619
import org.junit.jupiter.api.extension.AfterEachCallback;
1720
import org.junit.jupiter.api.extension.BeforeAllCallback;
1821
import org.junit.jupiter.api.extension.BeforeEachCallback;
@@ -23,16 +26,17 @@
2326
import org.junit.platform.commons.support.AnnotationSupport;
2427
import org.junit.platform.commons.support.ReflectionSupport;
2528

26-
/**
27-
* @since 6.1
28-
*/
29-
class DefaultLocaleExtension implements BeforeAllCallback, BeforeEachCallback, AfterEachCallback {
29+
@API(status = EXPERIMENTAL, since = "6.1")
30+
public final class DefaultLocaleExtension implements BeforeAllCallback, BeforeEachCallback, AfterEachCallback {
3031

3132
private static final Namespace NAMESPACE = Namespace.create(DefaultLocaleExtension.class);
3233

3334
private static final String CUSTOM_KEY = "CustomLocale";
3435
private static final String DEFAULT_KEY = "DefaultLocale";
3536

37+
public DefaultLocaleExtension() {
38+
}
39+
3640
@Override
3741
public void beforeAll(ExtensionContext context) throws Exception {
3842
createLocaleFromAnnotation(context) //

junit-jupiter-api/src/main/java/org/junit/jupiter/api/timezone/DefaultTimeZoneExtension.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010

1111
package org.junit.jupiter.api.timezone;
1212

13+
import static org.apiguardian.api.API.Status.EXPERIMENTAL;
14+
1315
import java.util.Optional;
1416
import java.util.TimeZone;
1517

18+
import org.apiguardian.api.API;
1619
import org.junit.jupiter.api.extension.AfterEachCallback;
1720
import org.junit.jupiter.api.extension.BeforeAllCallback;
1821
import org.junit.jupiter.api.extension.BeforeEachCallback;
@@ -23,13 +26,17 @@
2326
import org.junit.platform.commons.support.AnnotationSupport;
2427
import org.junit.platform.commons.support.ReflectionSupport;
2528

26-
class DefaultTimeZoneExtension implements BeforeAllCallback, BeforeEachCallback, AfterEachCallback {
29+
@API(status = EXPERIMENTAL, since = "6.1")
30+
public final class DefaultTimeZoneExtension implements BeforeAllCallback, BeforeEachCallback, AfterEachCallback {
2731

2832
private static final Namespace NAMESPACE = Namespace.create(DefaultTimeZoneExtension.class);
2933

3034
private static final String CUSTOM_KEY = "CustomTimeZone";
3135
private static final String DEFAULT_KEY = "DefaultTimeZone";
3236

37+
public DefaultTimeZoneExtension() {
38+
}
39+
3340
@Override
3441
public void beforeAll(ExtensionContext context) throws Exception {
3542
createTimeZoneFromAnnotation(context) //

platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ exports org.junit.jupiter.api.extension
55
exports org.junit.jupiter.api.extension.support
66
exports org.junit.jupiter.api.function
77
exports org.junit.jupiter.api.io
8+
exports org.junit.jupiter.api.locale
89
exports org.junit.jupiter.api.parallel
10+
exports org.junit.jupiter.api.timezone
911
requires java.base mandated
1012
requires kotlin.stdlib static
1113
requires org.apiguardian.api static transitive

0 commit comments

Comments
 (0)