Skip to content

Commit f356fb7

Browse files
TatuLundTatuLund
authored
Merge pull request #55 from TatuLund/5.x
Upgrade to Vaadin 25
2 parents f4a50a8 + 1042bde commit f356fb7

21 files changed

Lines changed: 266 additions & 235 deletions

‎.classpath‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
1010
<attributes>
1111
<attribute name="maven.pomderived" value="true"/>
12+
<attribute name="optional" value="true"/>
1213
</attributes>
1314
</classpathentry>
1415
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
@@ -18,7 +19,7 @@
1819
<attribute name="maven.pomderived" value="true"/>
1920
</attributes>
2021
</classpathentry>
21-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
2223
<attributes>
2324
<attribute name="maven.pomderived" value="true"/>
2425
</attributes>
@@ -28,5 +29,29 @@
2829
<attribute name="maven.pomderived" value="true"/>
2930
</attributes>
3031
</classpathentry>
32+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
33+
<attributes>
34+
<attribute name="maven.pomderived" value="true"/>
35+
<attribute name="test" value="true"/>
36+
<attribute name="optional" value="true"/>
37+
</attributes>
38+
</classpathentry>
39+
<classpathentry kind="src" path="target/generated-sources/annotations">
40+
<attributes>
41+
<attribute name="optional" value="true"/>
42+
<attribute name="maven.pomderived" value="true"/>
43+
<attribute name="ignore_optional_problems" value="true"/>
44+
<attribute name="m2e-apt" value="true"/>
45+
</attributes>
46+
</classpathentry>
47+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
48+
<attributes>
49+
<attribute name="optional" value="true"/>
50+
<attribute name="maven.pomderived" value="true"/>
51+
<attribute name="ignore_optional_problems" value="true"/>
52+
<attribute name="m2e-apt" value="true"/>
53+
<attribute name="test" value="true"/>
54+
</attributes>
55+
</classpathentry>
3156
<classpathentry kind="output" path="target/classes"/>
3257
</classpath>

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,3 +327,4 @@ $RECYCLE.BIN/
327327

328328
# Windows shortcuts
329329
*.lnk
330+
frontend/generated/

‎.project‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</natures>
2323
<filteredResources>
2424
<filter>
25-
<id>1619602181724</id>
25+
<id>1770275977216</id>
2626
<name></name>
2727
<type>30</type>
2828
<matcher>
2929
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30-
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
30+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
3131
</matcher>
3232
</filter>
3333
</filteredResources>

‎package.json‎

Lines changed: 103 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -3,167 +3,148 @@
33
"license": "UNLICENSED",
44
"dependencies": {
55
"@f0rce/lit-ace": "1.11.1",
6-
"@polymer/polymer": "3.5.2",
7-
"@vaadin/bundles": "24.9.5",
6+
"@vaadin/aura": "25.0.3",
87
"@vaadin/common-frontend": "0.0.19",
9-
"@vaadin/cookie-consent": "24.9.5",
10-
"@vaadin/polymer-legacy-adapter": "24.9.5",
11-
"@vaadin/react-components": "24.9.5",
8+
"@vaadin/react-components": "25.0.3",
129
"@vaadin/vaadin-development-mode-detector": "2.0.7",
13-
"@vaadin/vaadin-lumo-styles": "24.9.5",
14-
"@vaadin/vaadin-material-styles": "24.9.5",
15-
"@vaadin/vaadin-themable-mixin": "24.9.5",
10+
"@vaadin/vaadin-lumo-styles": "25.0.3",
11+
"@vaadin/vaadin-themable-mixin": "25.0.3",
1612
"@vaadin/vaadin-usage-statistics": "2.1.3",
17-
"construct-style-sheets-polyfill": "3.1.0",
18-
"date-fns": "2.29.3",
19-
"lit": "3.3.1",
20-
"react": "18.3.1",
21-
"react-dom": "18.3.1",
22-
"react-router": "7.6.3"
13+
"date-fns": "4.1.0",
14+
"lit": "3.3.2",
15+
"react": "19.2.3",
16+
"react-dom": "19.2.3",
17+
"react-router": "7.12.0"
2318
},
2419
"devDependencies": {
25-
"@babel/preset-react": "7.27.1",
20+
"@babel/preset-react": "7.28.5",
2621
"@preact/signals-react-transform": "0.6.0",
27-
"@rollup/plugin-replace": "6.0.2",
22+
"@rollup/plugin-replace": "6.0.3",
2823
"@rollup/pluginutils": "5.3.0",
29-
"@types/react": "18.3.26",
30-
"@types/react-dom": "18.3.7",
31-
"@vitejs/plugin-react": "4.7.0",
32-
"glob": "11.0.3",
33-
"magic-string": "0.30.19",
24+
"@types/node": "25.0.3",
25+
"@types/react": "19.2.7",
26+
"@types/react-dom": "19.2.3",
27+
"@vitejs/plugin-react": "5.1.2",
28+
"magic-string": "0.30.21",
3429
"rollup-plugin-brotli": "3.1.0",
35-
"rollup-plugin-visualizer": "5.14.0",
30+
"rollup-plugin-visualizer": "6.0.5",
3631
"strip-css-comments": "5.0.0",
3732
"transform-ast": "2.4.4",
38-
"typescript": "5.8.3",
39-
"vite": "6.4.1",
40-
"vite-plugin-checker": "0.10.3",
41-
"workbox-build": "7.3.0",
42-
"workbox-core": "7.3.0",
43-
"workbox-precaching": "7.3.0"
33+
"typescript": "5.9.3",
34+
"vite": "7.3.1",
35+
"vite-plugin-checker": "0.12.0",
36+
"workbox-build": "7.4.0"
4437
},
4538
"overrides": {
46-
"@vaadin/a11y-base": "24.9.5",
47-
"@vaadin/accordion": "24.9.5",
48-
"@vaadin/app-layout": "24.9.5",
49-
"@vaadin/avatar": "24.9.5",
50-
"@vaadin/avatar-group": "24.9.5",
51-
"@vaadin/button": "24.9.5",
52-
"@vaadin/card": "24.9.5",
53-
"@vaadin/checkbox": "24.9.5",
54-
"@vaadin/checkbox-group": "24.9.5",
55-
"@vaadin/combo-box": "24.9.5",
56-
"@vaadin/component-base": "24.9.5",
57-
"@vaadin/confirm-dialog": "24.9.5",
58-
"@vaadin/context-menu": "24.9.5",
59-
"@vaadin/custom-field": "24.9.5",
60-
"@vaadin/date-picker": "24.9.5",
61-
"@vaadin/date-time-picker": "24.9.5",
62-
"@vaadin/details": "24.9.5",
63-
"@vaadin/dialog": "24.9.5",
64-
"@vaadin/email-field": "24.9.5",
65-
"@vaadin/field-base": "24.9.5",
66-
"@vaadin/field-highlighter": "24.9.5",
67-
"@vaadin/form-layout": "24.9.5",
68-
"@vaadin/grid": "24.9.5",
69-
"@vaadin/horizontal-layout": "24.9.5",
70-
"@vaadin/icon": "24.9.5",
71-
"@vaadin/icons": "24.9.5",
72-
"@vaadin/input-container": "24.9.5",
73-
"@vaadin/integer-field": "24.9.5",
74-
"@vaadin/item": "24.9.5",
75-
"@vaadin/list-box": "24.9.5",
76-
"@vaadin/lit-renderer": "24.9.5",
77-
"@vaadin/login": "24.9.5",
78-
"@vaadin/markdown": "24.9.5",
79-
"@vaadin/master-detail-layout": "24.9.5",
80-
"@vaadin/menu-bar": "24.9.5",
81-
"@vaadin/message-input": "24.9.5",
82-
"@vaadin/message-list": "24.9.5",
83-
"@vaadin/multi-select-combo-box": "24.9.5",
84-
"@vaadin/notification": "24.9.5",
85-
"@vaadin/number-field": "24.9.5",
86-
"@vaadin/overlay": "24.9.5",
87-
"@vaadin/password-field": "24.9.5",
88-
"@vaadin/popover": "24.9.5",
89-
"@vaadin/progress-bar": "24.9.5",
90-
"@vaadin/radio-group": "24.9.5",
91-
"@vaadin/scroller": "24.9.5",
92-
"@vaadin/select": "24.9.5",
93-
"@vaadin/side-nav": "24.9.5",
94-
"@vaadin/split-layout": "24.9.5",
95-
"@vaadin/tabs": "24.9.5",
96-
"@vaadin/tabsheet": "24.9.5",
97-
"@vaadin/text-area": "24.9.5",
98-
"@vaadin/text-field": "24.9.5",
99-
"@vaadin/time-picker": "24.9.5",
100-
"@vaadin/tooltip": "24.9.5",
101-
"@vaadin/upload": "24.9.5",
102-
"@vaadin/router": "2.0.0",
103-
"@vaadin/vertical-layout": "24.9.5",
104-
"@vaadin/virtual-list": "24.9.5",
105-
"@vaadin/bundles": "$@vaadin/bundles",
106-
"@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
10739
"@vaadin/vaadin-development-mode-detector": "$@vaadin/vaadin-development-mode-detector",
10840
"@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics",
10941
"@vaadin/react-components": "$@vaadin/react-components",
11042
"@vaadin/common-frontend": "$@vaadin/common-frontend",
11143
"react-dom": "$react-dom",
112-
"construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
11344
"lit": "$lit",
114-
"@polymer/polymer": "$@polymer/polymer",
11545
"react": "$react",
11646
"react-router": "$react-router",
117-
"@vaadin/cookie-consent": "$@vaadin/cookie-consent",
11847
"date-fns": "$date-fns",
11948
"@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
12049
"@f0rce/lit-ace": "$@f0rce/lit-ace",
12150
"@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
122-
"@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles"
51+
"@vaadin/aura": "$@vaadin/aura",
52+
"@vaadin/a11y-base": "25.0.3",
53+
"@vaadin/accordion": "25.0.3",
54+
"@vaadin/app-layout": "25.0.3",
55+
"@vaadin/avatar": "25.0.3",
56+
"@vaadin/avatar-group": "25.0.3",
57+
"@vaadin/button": "25.0.3",
58+
"@vaadin/card": "25.0.3",
59+
"@vaadin/checkbox": "25.0.3",
60+
"@vaadin/checkbox-group": "25.0.3",
61+
"@vaadin/combo-box": "25.0.3",
62+
"@vaadin/component-base": "25.0.3",
63+
"@vaadin/confirm-dialog": "25.0.3",
64+
"@vaadin/context-menu": "25.0.3",
65+
"@vaadin/custom-field": "25.0.3",
66+
"@vaadin/date-picker": "25.0.3",
67+
"@vaadin/date-time-picker": "25.0.3",
68+
"@vaadin/details": "25.0.3",
69+
"@vaadin/dialog": "25.0.3",
70+
"@vaadin/email-field": "25.0.3",
71+
"@vaadin/field-base": "25.0.3",
72+
"@vaadin/field-highlighter": "25.0.3",
73+
"@vaadin/form-layout": "25.0.3",
74+
"@vaadin/grid": "25.0.3",
75+
"@vaadin/horizontal-layout": "25.0.3",
76+
"@vaadin/icon": "25.0.3",
77+
"@vaadin/icons": "25.0.3",
78+
"@vaadin/input-container": "25.0.3",
79+
"@vaadin/integer-field": "25.0.3",
80+
"@vaadin/item": "25.0.3",
81+
"@vaadin/list-box": "25.0.3",
82+
"@vaadin/lit-renderer": "25.0.3",
83+
"@vaadin/login": "25.0.3",
84+
"@vaadin/markdown": "25.0.3",
85+
"@vaadin/master-detail-layout": "25.0.3",
86+
"@vaadin/menu-bar": "25.0.3",
87+
"@vaadin/message-input": "25.0.3",
88+
"@vaadin/message-list": "25.0.3",
89+
"@vaadin/multi-select-combo-box": "25.0.3",
90+
"@vaadin/notification": "25.0.3",
91+
"@vaadin/number-field": "25.0.3",
92+
"@vaadin/overlay": "25.0.3",
93+
"@vaadin/password-field": "25.0.3",
94+
"@vaadin/popover": "25.0.3",
95+
"@vaadin/progress-bar": "25.0.3",
96+
"@vaadin/radio-group": "25.0.3",
97+
"@vaadin/scroller": "25.0.3",
98+
"@vaadin/select": "25.0.3",
99+
"@vaadin/side-nav": "25.0.3",
100+
"@vaadin/split-layout": "25.0.3",
101+
"@vaadin/tabs": "25.0.3",
102+
"@vaadin/tabsheet": "25.0.3",
103+
"@vaadin/text-area": "25.0.3",
104+
"@vaadin/text-field": "25.0.3",
105+
"@vaadin/time-picker": "25.0.3",
106+
"@vaadin/tooltip": "25.0.3",
107+
"@vaadin/upload": "25.0.3",
108+
"@vaadin/router": "2.0.1",
109+
"@vaadin/vertical-layout": "25.0.3",
110+
"@vaadin/virtual-list": "25.0.3"
123111
},
124112
"type": "module",
125113
"vaadin": {
126114
"dependencies": {
127115
"@f0rce/lit-ace": "1.11.1",
128-
"@polymer/polymer": "3.5.2",
129-
"@vaadin/bundles": "24.9.5",
116+
"@vaadin/aura": "25.0.3",
130117
"@vaadin/common-frontend": "0.0.19",
131-
"@vaadin/cookie-consent": "24.9.5",
132-
"@vaadin/polymer-legacy-adapter": "24.9.5",
133-
"@vaadin/react-components": "24.9.5",
118+
"@vaadin/react-components": "25.0.3",
134119
"@vaadin/vaadin-development-mode-detector": "2.0.7",
135-
"@vaadin/vaadin-lumo-styles": "24.9.5",
136-
"@vaadin/vaadin-material-styles": "24.9.5",
137-
"@vaadin/vaadin-themable-mixin": "24.9.5",
120+
"@vaadin/vaadin-lumo-styles": "25.0.3",
121+
"@vaadin/vaadin-themable-mixin": "25.0.3",
138122
"@vaadin/vaadin-usage-statistics": "2.1.3",
139-
"construct-style-sheets-polyfill": "3.1.0",
140-
"date-fns": "2.29.3",
141-
"lit": "3.3.1",
142-
"react": "18.3.1",
143-
"react-dom": "18.3.1",
144-
"react-router": "7.6.3"
123+
"date-fns": "4.1.0",
124+
"lit": "3.3.2",
125+
"react": "19.2.3",
126+
"react-dom": "19.2.3",
127+
"react-router": "7.12.0"
145128
},
146129
"devDependencies": {
147-
"@babel/preset-react": "7.27.1",
130+
"@babel/preset-react": "7.28.5",
148131
"@preact/signals-react-transform": "0.6.0",
149-
"@rollup/plugin-replace": "6.0.2",
132+
"@rollup/plugin-replace": "6.0.3",
150133
"@rollup/pluginutils": "5.3.0",
151-
"@types/react": "18.3.26",
152-
"@types/react-dom": "18.3.7",
153-
"@vitejs/plugin-react": "4.7.0",
154-
"glob": "11.0.3",
155-
"magic-string": "0.30.19",
134+
"@types/node": "25.0.3",
135+
"@types/react": "19.2.7",
136+
"@types/react-dom": "19.2.3",
137+
"@vitejs/plugin-react": "5.1.2",
138+
"magic-string": "0.30.21",
156139
"rollup-plugin-brotli": "3.1.0",
157-
"rollup-plugin-visualizer": "5.14.0",
140+
"rollup-plugin-visualizer": "6.0.5",
158141
"strip-css-comments": "5.0.0",
159142
"transform-ast": "2.4.4",
160-
"typescript": "5.8.3",
161-
"vite": "6.4.1",
162-
"vite-plugin-checker": "0.10.3",
163-
"workbox-build": "7.3.0",
164-
"workbox-core": "7.3.0",
165-
"workbox-precaching": "7.3.0"
143+
"typescript": "5.9.3",
144+
"vite": "7.3.1",
145+
"vite-plugin-checker": "0.12.0",
146+
"workbox-build": "7.4.0"
166147
},
167-
"hash": "6a9b37e366bd473ed0143a2ac575c1301debd3358a381feb1af7d3d7a6e930fe"
148+
"hash": "10bfb7246f996a0717d19f0d2b0feed822b1c04f7605379b8e5af6ef5b88fa9b"
168149
}
169150
}

‎pom.xml‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
<groupId>de.f0rce</groupId>
66
<artifactId>ace</artifactId>
7-
<version>4.0.0</version>
7+
<version>5.0.0</version>
88
<name>ace</name>
99
<description>Lit Wrap around the Ace Editor (https://ace.c9.io/) for Vaadin 14 and Vaadin 23</description>
1010

1111
<properties>
12-
<vaadin.version>24.9.5</vaadin.version>
13-
<maven.compiler.source>17</maven.compiler.source>
14-
<maven.compiler.target>17</maven.compiler.target>
12+
<vaadin.version>25.0.4</vaadin.version>
13+
<maven.compiler.source>21</maven.compiler.source>
14+
<maven.compiler.target>21</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1717
</properties>
@@ -77,6 +77,11 @@
7777
<!-- Replace artifactId with vaadin-core to use only free components -->
7878
<artifactId>vaadin-core</artifactId>
7979
</dependency>
80+
<dependency>
81+
<groupId>com.vaadin</groupId>
82+
<artifactId>vaadin-dev</artifactId>
83+
<optional>true</optional>
84+
</dependency>
8085
<dependency>
8186
<groupId>org.slf4j</groupId>
8287
<artifactId>slf4j-simple</artifactId>
@@ -91,18 +96,10 @@
9196
<dependency>
9297
<groupId>io.github.bonigarcia</groupId>
9398
<artifactId>webdrivermanager</artifactId>
94-
<version>5.9.3</version>
99+
<version>6.3.3</version>
95100
<scope>test</scope>
96101
</dependency>
97-
98-
<dependency>
99-
<groupId>com.google.code.gson</groupId>
100-
<artifactId>gson</artifactId>
101-
<version>2.9.1</version>
102-
</dependency>
103102
</dependencies>
104-
105-
106103

107104
<build>
108105
<defaultGoal>jetty:run</defaultGoal>

0 commit comments

Comments
 (0)