Skip to content

Commit bb7510b

Browse files
authored
chore!: set Java 21 as baseline (#8101)
* chore!: set Java 21 as baseline * set Java version through maven.compiler.release * specify maven-compiler-plugin version in pom.xml * move maven-compiler-plugin to pluginManagement * fix tests by supporting narrow no-break space in formatted dates * format code * add @NotThreadSafe to MessageListTest * format code
1 parent feec01d commit bb7510b

File tree

6 files changed

+23
-11
lines changed

6 files changed

+23
-11
lines changed

pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@
7171
<properties>
7272
<flow.version>25.0-SNAPSHOT</flow.version>
7373
<testbench.version>10.0.0-alpha4</testbench.version>
74-
<maven.compiler.source>17</maven.compiler.source>
75-
<maven.compiler.target>17</maven.compiler.target>
74+
<maven.compiler.release>21</maven.compiler.release>
7675
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7776
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
7877
<jetty.version>12.0.23</jetty.version>
@@ -291,6 +290,11 @@
291290
<build>
292291
<pluginManagement>
293292
<plugins>
293+
<plugin>
294+
<groupId>org.apache.maven.plugins</groupId>
295+
<artifactId>maven-compiler-plugin</artifactId>
296+
<version>3.14.1</version>
297+
</plugin>
294298
<plugin>
295299
<groupId>org.apache.maven.plugins</groupId>
296300
<artifactId>maven-source-plugin</artifactId>

vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/test/java/com/vaadin/flow/component/grid/it/AddingColumnsIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ public void gridRendered_addColumnWithLocalDateTimeRenderer_cellsRendered() {
7575
// JDK16 adds extra comma after year in en_US
7676
Assert.assertTrue(
7777
TestHelper.stripComments(grid.getCell(0, 0).getInnerHTML())
78-
.matches("January 1, 1980,? 1:20[ \\u00A0]AM"));
78+
.matches("January 1, 1980,? 1:20[ \\u00A0\\u202F]AM"));
7979
Assert.assertTrue(
8080
TestHelper.stripComments(grid.getCell(1, 0).getInnerHTML())
81-
.matches("January 1, 1980,? 1:30[ \\u00A0]AM"));
81+
.matches("January 1, 1980,? 1:30[ \\u00A0\\u202F]AM"));
8282
}
8383

8484
@Test

vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/test/java/com/vaadin/flow/component/grid/it/GridViewUsingRenderersIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public void init() {
4747
public void basicRenderers_rowsAreRenderedAsExpected() {
4848
Assert.assertEquals("Item 1", grid.getCell(0, 0).getText());
4949
Assert.assertEquals("$ 73.10", grid.getCell(0, 1).getText());
50-
Assert.assertTrue(
51-
grid.getCell(0, 2).getText().matches("1/10/18,? 11:43:59 AM"));
50+
Assert.assertTrue(grid.getCell(0, 2).getText()
51+
.matches("1/10/18,? 11:43:59[ \\u00A0\\u202F]AM"));
5252
Assert.assertEquals("Jan 11, 2018", grid.getCell(0, 3).getText());
5353
assertRendereredContent("<span>$$$</span>",
5454
TestHelper.stripComments(grid.getCell(0, 4).getInnerHTML()));
@@ -57,8 +57,8 @@ public void basicRenderers_rowsAreRenderedAsExpected() {
5757

5858
Assert.assertEquals("Item 2", grid.getCell(1, 0).getText());
5959
Assert.assertEquals("$ 24.05", grid.getCell(1, 1).getText());
60-
Assert.assertTrue(
61-
grid.getCell(1, 2).getText().matches("1/10/18,? 11:07:31 AM"));
60+
Assert.assertTrue(grid.getCell(1, 2).getText()
61+
.matches("1/10/18,? 11:07:31[ \\u00A0\\u202F]AM"));
6262
Assert.assertEquals("Jan 24, 2018", grid.getCell(1, 3).getText());
6363
assertRendereredContent("<span>$</span>",
6464
TestHelper.stripComments(grid.getCell(1, 4).getInnerHTML()));

vaadin-messages-flow-parent/vaadin-messages-flow/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@
3535
<groupId>jakarta.servlet</groupId>
3636
<artifactId>jakarta.servlet-api</artifactId>
3737
</dependency>
38+
<dependency>
39+
<groupId>net.jcip</groupId>
40+
<artifactId>jcip-annotations</artifactId>
41+
<version>1.0</version>
42+
<scope>test</scope>
43+
</dependency>
3844
<dependency>
3945
<groupId>org.mockito</groupId>
4046
<artifactId>mockito-core</artifactId>

vaadin-messages-flow-parent/vaadin-messages-flow/src/test/java/com/vaadin/flow/component/messages/tests/MessageListTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@
3131
import com.vaadin.flow.server.streams.DownloadHandler;
3232
import com.vaadin.flow.server.streams.DownloadResponse;
3333

34+
import net.jcip.annotations.NotThreadSafe;
3435
import tools.jackson.databind.JsonNode;
3536

37+
@NotThreadSafe
3638
public class MessageListTest {
3739

3840
private MessageList messageList;

vaadin-virtual-list-flow-parent/vaadin-virtual-list-flow-integration-tests/src/test/java/com/vaadin/flow/component/virtuallist/tests/VirtualListIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,11 @@ public void localDateTimeRenderer() {
350350

351351
// JDK16 adds extra comma after year in en_US
352352
Assert.assertTrue(items.get(0).getText()
353-
.matches("January 1, 2001,? 1:01[ \\u00A0]AM"));
353+
.matches("January 1, 2001,? 1:01[ \\u00A0\\u202F]AM"));
354354
Assert.assertTrue(items.get(1).getText()
355-
.matches("February 2, 2002,? 2:02[ \\u00A0]AM"));
355+
.matches("February 2, 2002,? 2:02[ \\u00A0\\u202F]AM"));
356356
Assert.assertTrue(items.get(2).getText()
357-
.matches("March 3, 2003,? 3:03[ \\u00A0]AM"));
357+
.matches("March 3, 2003,? 3:03[ \\u00A0\\u202F]AM"));
358358
}
359359

360360
@Test

0 commit comments

Comments
 (0)