Skip to content

Commit b908567

Browse files
mcollovatimcollovati
authored
chore!: set Java 21 as baseline (#22357)
1 parent b2aa08e commit b908567

File tree

30 files changed

+44
-44
lines changed

30 files changed

+44
-44
lines changed

‎.github/workflows/validation.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ jobs:
4747
- uses: actions/setup-node@v4
4848
with:
4949
node-version: '22.14.0'
50-
- name: Set up JDK 17
50+
- name: Set up JDK 21
5151
uses: actions/setup-java@v4
5252
with:
53-
java-version: '17'
53+
java-version: '21'
5454
distribution: 'temurin'
5555
- name: Set up Maven
5656
uses: stCarolas/setup-maven@v5
@@ -92,10 +92,10 @@ jobs:
9292
- uses: actions/checkout@v4
9393
with:
9494
ref: ${{env.HEAD_SHA}}
95-
- name: Set up JDK 17
95+
- name: Set up JDK 21
9696
uses: actions/setup-java@v4
9797
with:
98-
java-version: '17'
98+
java-version: '21'
9999
distribution: 'temurin'
100100
- name: Set up Maven
101101
uses: stCarolas/setup-maven@v5
@@ -167,10 +167,10 @@ jobs:
167167
- uses: oven-sh/setup-bun@v2
168168
with:
169169
bun-version: 'latest'
170-
- name: Set up JDK 17
170+
- name: Set up JDK 21
171171
uses: actions/setup-java@v4
172172
with:
173-
java-version: '17'
173+
java-version: '21'
174174
distribution: 'temurin'
175175
- name: Set up Maven
176176
uses: stCarolas/setup-maven@v5

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ Since [Vaadin platform 23.0](https://github.com/vaadin/platform), Flow major and
1616
|--------|-------------------------------------------------------------------------|---------------------------------------------------------|
1717
| 2.12 | 14.13 (LATEST commercial with Java 8+ support and Servlet 3) | 2.12 |
1818
| 23.6 | 23.6 (LATEST commercial with Java 11+ support and Servlet 3) | 23.6 |
19-
| 24.8 | 24.8 (maintained minor release, Java 17+, Jakarta EE 10, Spring-boot 3) | 24.8 |
20-
| 24.9 | 24.9 (LATEST release, Java 17+, Jakarta EE 10, Spring-boot 3) | 24.9 |
21-
| main | 25.0 (Vaadin 25.0 preparations, Java 17+, Jakarta EE 11, Spring-boot 4) | 25.0 |
19+
| 24.8 | 24.8 (maintained minor release, Java 17+, Jakarta EE 10, Spring-boot 3) | 24.8 |
20+
| 24.9 | 24.9 (LATEST release, Java 17+, Jakarta EE 10, Spring-boot 3) | 24.9 |
21+
| main | 25.0 (Vaadin 25.0 preparations, Java 21+, Jakarta EE 11, Spring-boot 4) | 25.0 |

‎eclipse/VaadinJavaConventions.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
4949
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
5050
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
51-
<setting id="org.eclipse.jdt.core.compiler.source" value="17"/>
51+
<setting id="org.eclipse.jdt.core.compiler.source" value="21"/>
5252
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
5353
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
5454
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
@@ -167,7 +167,7 @@
167167
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
168168
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
169169
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
170-
<setting id="org.eclipse.jdt.core.compiler.compliance" value="17"/>
170+
<setting id="org.eclipse.jdt.core.compiler.compliance" value="21"/>
171171
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
172172
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
173173
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
@@ -242,7 +242,7 @@
242242
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
243243
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
244244
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
245-
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="17"/>
245+
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="21"/>
246246
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
247247
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
248248
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>

‎flow-client/bnd.bnd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Bundle-SymbolicName: ${project.groupId}.flow.client
22
Bundle-Name: Flow Client Engine
33
Bundle-Version: ${osgi.bundle.version}
4-
Bundle-RequiredExecutionEnvironment: JavaSE-17
4+
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
66
Import-Package: !*
77
Export-Package: !*

‎flow-data/bnd.bnd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Bundle-SymbolicName: ${project.groupId}.flow.data
22
Bundle-Name: Vaadin Flow Data
33
Bundle-Version: ${osgi.bundle.version}
4-
Bundle-RequiredExecutionEnvironment: JavaSE-17
4+
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
66
Import-Package: jakarta.validation*;resolution:=optional;version='${jakarta.validation.version}',\
77
com.vaadin.flow*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\

‎flow-dnd/bnd.bnd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Bundle-SymbolicName: ${project.groupId}.flow.dnd
22
Bundle-Name: Vaadin Flow DnD Support
33
Bundle-Version: ${osgi.bundle.version}
4-
Bundle-RequiredExecutionEnvironment: JavaSE-17
4+
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
66
Export-Package: !com.vaadin.flow.component.dnd.internal*,\
77
com.vaadin.flow.component.dnd*;-noimport:=true

‎flow-html-components/bnd.bnd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Bundle-SymbolicName: ${project.groupId}.flow.html.components
22
Bundle-Name: Vaadin Flow Html Components
33
Bundle-Version: ${osgi.bundle.version}
4-
Bundle-RequiredExecutionEnvironment: JavaSE-17
4+
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
66
Import-Package: com.vaadin.flow*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
77
*

‎flow-lit-template/bnd.bnd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Bundle-SymbolicName: ${project.groupId}.flow.lit-template
22
Bundle-Name: Vaadin Flow Lit Templates Support
33
Bundle-Version: ${osgi.bundle.version}
4-
Bundle-RequiredExecutionEnvironment: JavaSE-17
4+
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
66
Export-Package: com.vaadin.flow.component.littemplate;-noimport:=true
77

‎flow-plugins/flow-gradle-plugin/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This is the official Vaadin Gradle Plugin for Vaadin 25 and newer.
44
The implementation is based on `flow-plugin-base` which is also used by the Vaadin Maven plugin.
55

66
Prerequisites:
7-
* Java 17 or higher
7+
* Java 21 or higher
88
* node.js and npm. Vaadin will now automatically install node.js and npm, but you can also install those locally:
99
* Windows/Mac: [node.js Download site](https://nodejs.org/en/download/)
1010
* Linux: Use package manager e.g. `sudo apt install npm`

‎flow-plugins/flow-gradle-plugin/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ defaultTasks('jar', 'test')
2525
group pom.parent.groupId
2626
version = project.hasProperty('vaadin.version') ? project.getProperty('vaadin.version') : pom.parent.version
2727
archivesBaseName = pom.artifactId
28-
sourceCompatibility = 17
29-
targetCompatibility = 17
28+
sourceCompatibility = 21
29+
targetCompatibility = 21
3030

3131
/***********************************************************************************************************************
3232
*
@@ -199,7 +199,7 @@ functionalTest {
199199

200200
kotlin {
201201
compilerOptions {
202-
jvmTarget = JvmTarget.JVM_17
202+
jvmTarget = JvmTarget.JVM_21
203203
}
204204
explicitApi()
205205
}

0 commit comments

Comments
 (0)