Skip to content

Commit 37524a0

Browse files
paodbmlopezFC
paodb
authored and
mlopezFC
committed
feat: update to Vaadin 24
1 parent 4b98cbd commit 37524a0

File tree

6 files changed

+143
-121
lines changed

6 files changed

+143
-121
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ node_modules/
1919
webpack.generated.js
2020
vcf-date-range-picker-demo/frontend/generated
2121
vcf-date-range-picker-demo/frontend/index.html
22+
vcf-date-range-picker-demo/src/main/dev-bundle
2223
tsconfig.json
2324
types.d.ts
2425
vite.config.ts
26+

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.vaadin.componentfactory</groupId>
88
<artifactId>date-range-picker-parent</artifactId>
9-
<version>4.0.2-SNAPSHOT</version>
9+
<version>5.0.0</version>
1010
<packaging>pom</packaging>
1111
<name>Date Range Picker Parent</name>
1212

‎vcf-date-range-picker-demo/pom.xml

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
<packaging>war</packaging>
1010
<name>Date Range Picker Demo</name>
1111

12-
<version>4.0.2-SNAPSHOT</version>
12+
<version>5.0.0</version>
1313
<inceptionYear>2021</inceptionYear>
1414
<organization>
1515
<name>Vaadin Ltd</name>
1616
<url>http://vaadin.com/</url>
1717
</organization>
1818

1919
<properties>
20-
<vaadin.version>23.1.10</vaadin.version>
21-
<maven.compiler.source>11</maven.compiler.source>
22-
<maven.compiler.target>11</maven.compiler.target>
20+
<vaadin.version>24.2.0</vaadin.version>
21+
<maven.compiler.source>17</maven.compiler.source>
22+
<maven.compiler.target>17</maven.compiler.target>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<failOnMissingWebXml>false</failOnMissingWebXml>
2525
</properties>
@@ -37,20 +37,6 @@
3737
</dependencyManagement>
3838

3939
<dependencies>
40-
<!-- Flow -->
41-
<dependency>
42-
<groupId>com.vaadin</groupId>
43-
<artifactId>flow-client</artifactId>
44-
</dependency>
45-
<dependency>
46-
<groupId>com.vaadin</groupId>
47-
<artifactId>flow-data</artifactId>
48-
</dependency>
49-
<dependency>
50-
<groupId>com.vaadin</groupId>
51-
<artifactId>flow-html-components</artifactId>
52-
</dependency>
53-
5440
<!-- Component -->
5541
<dependency>
5642
<groupId>com.vaadin.componentfactory</groupId>
@@ -69,7 +55,6 @@
6955
<dependency>
7056
<groupId>org.slf4j</groupId>
7157
<artifactId>slf4j-simple</artifactId>
72-
<version>1.7.25</version>
7358
</dependency>
7459
</dependencies>
7560

@@ -90,7 +75,7 @@
9075
<plugin>
9176
<groupId>org.apache.maven.plugins</groupId>
9277
<artifactId>maven-war-plugin</artifactId>
93-
<version>3.3.1</version>
78+
<version>3.3.2</version>
9479
</plugin>
9580
</plugins>
9681
</pluginManagement>
@@ -104,16 +89,15 @@
10489
<plugin>
10590
<groupId>org.eclipse.jetty</groupId>
10691
<artifactId>jetty-maven-plugin</artifactId>
107-
<version>9.4.43.v20210629</version>
108-
<configuration>
109-
<scanIntervalSeconds>1</scanIntervalSeconds>
92+
<version>11.0.14</version>
93+
<configuration>
94+
<scan>2</scan>
95+
<!-- Use war output directory to get the webpack files -->
96+
<webAppConfig>
97+
<allowDuplicateFragmentNames>true</allowDuplicateFragmentNames>
98+
</webAppConfig>
11099
</configuration>
111100
</plugin>
112-
<!--
113-
Take care of synchronizing java dependencies and imports in
114-
package.json and main.js files.
115-
It also creates webpack.config.js if not exists yet.
116-
-->
117101
<plugin>
118102
<groupId>com.vaadin</groupId>
119103
<artifactId>vaadin-maven-plugin</artifactId>

‎vcf-date-range-picker-demo/src/main/java/com/vaadin/componentfactory/demo/EnhancedDateRangePickerView.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import com.vaadin.flow.component.button.Button;
2727
import com.vaadin.flow.component.dependency.CssImport;
2828
import com.vaadin.flow.component.html.Div;
29-
import com.vaadin.flow.component.html.Label;
3029
import com.vaadin.flow.component.html.NativeButton;
30+
import com.vaadin.flow.component.html.Span;
3131
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
3232
import com.vaadin.flow.component.textfield.TextField;
3333
import com.vaadin.flow.demo.DemoView;
@@ -55,14 +55,14 @@ public void initView() {
5555
createLocaleChangeDatePicker();
5656

5757
addCard("Additional code used in the demo",
58-
new Label("These methods are used in the demo."));
58+
new Span("These methods are used in the demo."));
5959
}
6060

6161
private void createSimpleDatePicker() {
6262
Div message = createMessageDiv("simple-picker-message");
6363

6464
// begin-source-example
65-
// source-example-heading: Simple date picker
65+
// source-example-heading: Simple date range picker
6666
EnhancedDateRangePicker datePicker = new EnhancedDateRangePicker();
6767
datePicker.setClassNameForDates("publicHolidayRed", LocalDate.now(), LocalDate.now().plusDays(10));
6868
datePicker.setClassNameForDates("publicHolidayGreen", LocalDate.now().plusDays(1), LocalDate.now().plusDays(11));
@@ -81,7 +81,7 @@ private void createSimpleDatePickerWithoutTextFields() {
8181
Div message = createMessageDiv("simple-picker-without-text-fields-message");
8282

8383
// begin-source-example
84-
// source-example-heading: Simple date picker
84+
// source-example-heading: Simple date range picker without visible text fields
8585
EnhancedDateRangePicker datePicker = new EnhancedDateRangePicker();
8686
datePicker.setTextFieldsVisible(false);
8787
Button openDRP = new Button("Open Date Range Picker");
@@ -102,7 +102,7 @@ private void createPatternDatePicker() {
102102
Div message = createMessageDiv("simple-picker-message");
103103

104104
// begin-source-example
105-
// source-example-heading: Date picker with pattern
105+
// source-example-heading: Date range picker with pattern
106106
EnhancedDateRangePicker datePicker = new EnhancedDateRangePicker(new DateRange(LocalDate.now(),LocalDate.now().plusDays(7)), "dd-MMM-yyyy");
107107
datePicker.setId("withCustomJSPreset");
108108
Button from1st = new Button("From 1st");
@@ -158,7 +158,7 @@ private void createPatternAndLocaleDatePicker() {
158158
Div message = createMessageDiv("simple-picker-message");
159159

160160
// begin-source-example
161-
// source-example-heading: Date picker with pattern and locale
161+
// source-example-heading: Date range picker with pattern and locale
162162
EnhancedDateRangePicker datePicker = new EnhancedDateRangePicker(new DateRange(LocalDate.now(),null), "dd-MMM-yyyy");
163163
// UI.getCurrent().setLocale(Locale.ITALIAN);
164164
updateMessage(message, datePicker);
@@ -216,7 +216,7 @@ private void createMinAndMaxDatePicker() {
216216
Div message = createMessageDiv("min-and-max-picker-message");
217217

218218
// begin-source-example
219-
// source-example-heading: Date picker with min and max
219+
// source-example-heading: Date range picker with min and max without side panel
220220
EnhancedDateRangePicker datePicker = new EnhancedDateRangePicker();
221221
datePicker.setLabel("Select a day within this month");
222222
datePicker.setPlaceholder("Date within this month");
@@ -239,7 +239,7 @@ private void createDisabledDatePicker() {
239239
Div message = createMessageDiv("disabled-picker-message");
240240

241241
// begin-source-example
242-
// source-example-heading: Disabled date picker
242+
// source-example-heading: Disabled date range picker
243243
EnhancedDateRangePicker datePicker = new EnhancedDateRangePicker();
244244
datePicker.setEnabled(false);
245245
// end-source-example
@@ -269,7 +269,7 @@ private void createFinnishDatePicker() {
269269
Div message = createMessageDiv("finnish-picker-message");
270270

271271
// begin-source-example
272-
// source-example-heading: Internationalized date picker
272+
// source-example-heading: Internationalized date range picker
273273
EnhancedDateRangePicker datePicker = new EnhancedDateRangePicker();
274274
datePicker.setLabel("Finnish date picker");
275275
datePicker.setPlaceholder("Syntymäpäivä");
@@ -319,7 +319,7 @@ private void createFinnishDatePicker() {
319319
private void createLocaleChangeDatePicker() {
320320
Div message = createMessageDiv("Customize-locale-picker-message");
321321
// begin-source-example
322-
// source-example-heading: Date picker with customize locales
322+
// source-example-heading: Date range picker with customize locales
323323
// By default, the datePicker uses the current UI locale
324324
EnhancedDateRangePicker datePicker = new EnhancedDateRangePicker();
325325
NativeButton locale1 = new NativeButton("Locale: US");

‎vcf-date-range-picker/pom.xml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010

1111
<name>Date Range Picker</name>
1212

13-
<version>4.0.2-SNAPSHOT</version>
13+
<version>5.0.0</version>
1414
<inceptionYear>2021</inceptionYear>
1515
<organization>
1616
<name>Vaadin Ltd</name>
1717
<url>http://vaadin.com/</url>
1818
</organization>
1919

2020
<properties>
21-
<vaadin.version>23.1.10</vaadin.version>
22-
<flow.version>23.1.8</flow.version>
23-
<maven.compiler.source>11</maven.compiler.source>
24-
<maven.compiler.target>11</maven.compiler.target>
21+
<vaadin.version>24.2.0</vaadin.version>
22+
<flow.version>24.2.0</flow.version>
23+
<maven.compiler.source>17</maven.compiler.source>
24+
<maven.compiler.target>17</maven.compiler.target>
2525
</properties>
2626

2727
<dependencyManagement>
@@ -48,11 +48,6 @@
4848
<version>${flow.version}</version>
4949
<scope>test</scope>
5050
</dependency>
51-
<dependency>
52-
<groupId>com.vaadin</groupId>
53-
<artifactId>vaadin-date-picker-flow</artifactId>
54-
<scope>compile</scope>
55-
</dependency>
5651
<dependency>
5752
<groupId>org.mockito</groupId>
5853
<artifactId>mockito-all</artifactId>
@@ -66,11 +61,11 @@
6661
<scope>test</scope>
6762
</dependency>
6863
<dependency>
69-
<groupId>javax.servlet</groupId>
70-
<artifactId>javax.servlet-api</artifactId>
71-
<version>3.0.1</version>
72-
<scope>provided</scope>
73-
</dependency>
64+
<groupId>jakarta.servlet</groupId>
65+
<artifactId>jakarta.servlet-api</artifactId>
66+
<version>6.0.0</version>
67+
<scope>provided</scope>
68+
</dependency>
7469
</dependencies>
7570

7671
<build>

0 commit comments

Comments
 (0)