diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc index fd942223b1aa..3e8a9d838dc4 100644 --- a/documentation/src/docs/asciidoc/link-attributes.adoc +++ b/documentation/src/docs/asciidoc/link-attributes.adoc @@ -251,7 +251,7 @@ endif::[] :Log4j: https://logging.apache.org/log4j/2.x/[Log4j] :Log4j_JDK_Logging_Adapter: https://logging.apache.org/log4j/2.x/log4j-jul/index.html[Log4j JDK Logging Adapter] :Logback: https://logback.qos.ch/[Logback] -:LogManager: https://docs.oracle.com/javase/8/docs/api/java/util/logging/LogManager.html[LogManager] +:LogManager: https://docs.oracle.com/en/java/javase/17/docs/api/java.logging/java/util/logging/LogManager.html[LogManager] :Maven_Central: https://central.sonatype.com/[Maven Central] :MockitoExtension: https://github.com/mockito/mockito/blob/release/2.x/subprojects/junit-jupiter/src/main/java/org/mockito/junit/jupiter/MockitoExtension.java[MockitoExtension] :ServiceLoader: {jdk-javadoc-base-url}/java.base/java/util/ServiceLoader.html[ServiceLoader] diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-6.0.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-6.0.1.adoc index 8f7248a50dc0..297d7d934842 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-6.0.1.adoc +++ b/documentation/src/docs/asciidoc/release-notes/release-notes-6.0.1.adoc @@ -16,7 +16,7 @@ repository on GitHub. [[release-notes-6.0.1-junit-platform-bug-fixes]] ==== Bug Fixes -* ❓ +* Remove remnants of Java 8 compatibility from User Guide. [[release-notes-6.0.1-junit-platform-deprecations-and-breaking-changes]] ==== Deprecations and Breaking Changes diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc index 5d5e9ce0c826..6a602cd13d23 100644 --- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc +++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc @@ -1124,7 +1124,7 @@ option. Please consult the manual of your build tool for the appropriate commands. To analyze the recorded events, use the -https://docs.oracle.com/en/java/javase/14/docs/specs/man/jfr.html[jfr] +https://docs.oracle.com/en/java/javase/17/docs/specs/man/jfr.html[jfr] command line tool shipped with recent JDKs or open the recording file with https://jdk.java.net/jmc/[JDK Mission Control]. diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc index 11a6e6554c26..f3f416d7ff2c 100644 --- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc +++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc @@ -1749,9 +1749,9 @@ test class. include::{testDir}/example/ParameterizedClassDemo.java[tags=constructor_injection] ---- -If your programming language level you are using supports _records_ -- for example, Java -16 or higher -- you may use them to implement parameterized classes that avoid the -boilerplate code of declaring a test class constructor. +If your programming language you are using supports _records_ you may use them +to implement parameterized classes that avoid the boilerplate code of declaring +a test class constructor. [source,java,indent=0] ---- @@ -2237,11 +2237,11 @@ by default. This behavior can be changed by setting the | `@CsvSource(value = { " apple , banana" }, ignoreLeadingAndTrailingWhitespace = false)` | `" apple "`, `" banana"` |=== -If the programming language you are using supports _text blocks_ -- for example, Java SE -15 or higher -- you can alternatively use the `textBlock` attribute of `@CsvSource`. Each -record within a text block represents a CSV record and results in one invocation of the -parameterized class or test. The first record may optionally be used to supply CSV headers -by setting the `useHeadersInDisplayName` attribute to `true` as in the example below. +If the programming language you are using supports _text blocks_ you can alternatively use +the `textBlock` attribute of `@CsvSource`. Each record within a text block represents a +CSV record and results in one invocation of the parameterized class or test. The first record +may optionally be used to supply CSV headers by setting the `useHeadersInDisplayName` attribute +to `true` as in the example below. Using a text block, the previous example can be implemented as follows. @@ -2304,7 +2304,7 @@ void testWithCsvSource(String fruit, int rank) { [NOTE] ==== -Java's https://docs.oracle.com/en/java/javase/15/text-blocks/index.html[text block] +Java's https://docs.oracle.com/en/java/javase/17/text-blocks/index.html[text block] feature automatically removes _incidental whitespace_ when the code is compiled. However other JVM languages such as Groovy and Kotlin do not. Thus, if you are using a programming language other than Java and your text block contains comments or new lines diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java index ebd505e9b634..100695a71343 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java @@ -134,7 +134,7 @@ * via this attribute or the {@link #value} attribute. * *

Text block syntax is supported by various languages on the JVM - * including Java SE 15 or higher. If text blocks are not supported, you + * including Java SE. If text blocks are not supported, you * should declare your CSV content via the {@link #value} attribute. * *

Each record in the text block corresponds to a record in a CSV file and will @@ -154,7 +154,7 @@ * input or on the following line, vertically aligned with the rest of the * input (as can be seen in the example below). * - *

Java's text block + *

Java's text block * feature automatically removes incidental whitespace when the code * is compiled. However, other JVM languages such as Groovy and Kotlin do not. * Thus, if you are using a programming language other than Java and your text diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java index 1fd222935030..738b0dbe6590 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java @@ -46,7 +46,7 @@ public final class StringUtils { * @see #1800 */ static Pattern compileIsoControlPattern() { - // https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html#posix + // https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/regex/Pattern.html#posix try { // All of the characters that Unicode refers to as 'control characters' return Pattern.compile("\\p{Cntrl}", UNICODE_CHARACTER_CLASS);