Skip to content

Commit 5424041

Browse files
paodbmlopezFC
authored andcommitted
feat: upgrade so component works with vaadin 20+
1 parent 63c3e61 commit 5424041

File tree

5 files changed

+16
-75
lines changed

5 files changed

+16
-75
lines changed

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>1.10.0-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111
<name>Date Range Picker Parent</name>
1212

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

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

12-
<version>1.10.0-SNAPSHOT</version>
12+
<version>2.0.0-SNAPSHOT</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>21.0.3</vaadin.version>
21+
<flow.version>8.0.3</flow.version>
2022
<maven.compiler.source>1.8</maven.compiler.source>
2123
<maven.compiler.target>1.8</maven.compiler.target>
2224
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2325
<failOnMissingWebXml>false</failOnMissingWebXml>
24-
<vaadin.version>14.7.5</vaadin.version>
25-
<flow.version>2.7.4</flow.version>
2626
</properties>
2727

2828
<dependencyManagement>

vcf-date-range-picker/pom.xml

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@
1010

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

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

2020
<properties>
21-
<osgi.version>6.0.0</osgi.version>
22-
<vaadin.version>14.5.5</vaadin.version>
23-
<flow.version>2.5.4</flow.version>
21+
<vaadin.version>21.0.3</vaadin.version>
22+
<flow.version>8.0.3</flow.version>
2423
<maven.compiler.source>1.8</maven.compiler.source>
2524
<maven.compiler.target>1.8</maven.compiler.target>
2625
</properties>
@@ -43,26 +42,6 @@
4342
<artifactId>vaadin-core</artifactId>
4443
</dependency>
4544

46-
<dependency>
47-
<groupId>com.vaadin</groupId>
48-
<artifactId>flow-osgi</artifactId>
49-
<scope>provided</scope>
50-
</dependency>
51-
52-
<dependency>
53-
<groupId>org.osgi</groupId>
54-
<artifactId>osgi.cmpn</artifactId>
55-
<version>${osgi.version}</version>
56-
<scope>provided</scope>
57-
</dependency>
58-
59-
<dependency>
60-
<groupId>org.osgi</groupId>
61-
<artifactId>org.osgi.core</artifactId>
62-
<version>${osgi.version}</version>
63-
<scope>provided</scope>
64-
</dependency>
65-
6645
<dependency>
6746
<groupId>com.vaadin</groupId>
6847
<artifactId>flow-test-generic</artifactId>
@@ -86,6 +65,12 @@
8665
<version>1.0</version>
8766
<scope>test</scope>
8867
</dependency>
68+
<dependency>
69+
<groupId>javax.servlet</groupId>
70+
<artifactId>javax.servlet-api</artifactId>
71+
<version>3.0.1</version>
72+
<scope>provided</scope>
73+
</dependency>
8974
</dependencies>
9075

9176
<build>

vcf-date-range-picker/src/main/java/com/vaadin/componentfactory/EnhancedDateRangePicker.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
* {@link DatePickerI18n} object.
5656
*
5757
*/
58-
@JavaScript("frontend://date-fns-limited.min.js")
59-
@JavaScript("frontend://enhancedDateRangePickerConnector.js")
58+
@JavaScript("./date-fns-limited.min.js")
59+
@JavaScript("./enhancedDateRangePickerConnector.js")
6060
@Tag("vcf-date-range-picker")
6161
@NpmPackage(value = "@vaadin-component-factory/vcf-date-range-picker", version = "^4.8.10")
6262
@JsModule("@vaadin-component-factory/vcf-date-range-picker/vcf-date-range-picker.js")
@@ -131,7 +131,7 @@ public EnhancedDateRangePicker() {
131131
* @see #setValue(Object)
132132
*/
133133
public EnhancedDateRangePicker(DateRange initialDate) {
134-
super(initialDate, new DateRange(null,null), String.class, PARSER, FORMATTER);
134+
super(initialDate, new DateRange(null,null), String.class, PARSER, FORMATTER, true);
135135
this.setPattern("yyyy-MM-dd");
136136
this.setParsers("yyyy-MM-dd");
137137

vcf-date-range-picker/src/main/java/com/vaadin/componentfactory/osgi/EnhancedDateRangePickerResource.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)