Skip to content

Commit 32b6548

Browse files
AB-xdevAB-xdev
committed
Vaadin 25 Update
1 parent 17153c2 commit 32b6548

11 files changed

Lines changed: 57 additions & 106 deletions

File tree

‎.github/workflows/check-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
timeout-minutes: 30
2929
strategy:
3030
matrix:
31-
java: [17, 21, 25]
31+
java: [21, 25]
3232
distribution: [temurin]
3333
steps:
3434
- uses: actions/checkout@v6
@@ -126,7 +126,7 @@ jobs:
126126
timeout-minutes: 15
127127
strategy:
128128
matrix:
129-
java: [17]
129+
java: [21]
130130
distribution: [temurin]
131131
steps:
132132
- uses: actions/checkout@v6

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up JDK
2424
uses: actions/setup-java@v5
2525
with:
26-
java-version: '17'
26+
java-version: '21'
2727
distribution: 'temurin'
2828

2929
# Try to reuse existing cache from check-build
@@ -130,7 +130,7 @@ jobs:
130130
uses: actions/setup-java@v5
131131
with: # running setup-java overwrites the settings.xml
132132
distribution: 'temurin'
133-
java-version: '17'
133+
java-version: '21'
134134
server-id: github-central
135135
server-password: PACKAGES_CENTRAL_TOKEN
136136
gpg-passphrase: MAVEN_GPG_PASSPHRASE
@@ -147,7 +147,7 @@ jobs:
147147
uses: actions/setup-java@v5
148148
with: # running setup-java again overwrites the settings.xml
149149
distribution: 'temurin'
150-
java-version: '17'
150+
java-version: '21'
151151
server-id: sonatype-central-portal
152152
server-username: MAVEN_CENTRAL_USERNAME
153153
server-password: MAVEN_CENTRAL_TOKEN
@@ -177,7 +177,7 @@ jobs:
177177
- name: Setup - Java
178178
uses: actions/setup-java@v5
179179
with:
180-
java-version: '17'
180+
java-version: '21'
181181
distribution: 'temurin'
182182

183183
# Try to reuse existing cache from check-build

‎.github/workflows/test-deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/setup-java@v5
1818
with: # running setup-java overwrites the settings.xml
1919
distribution: 'temurin'
20-
java-version: '17'
20+
java-version: '21'
2121
server-id: github-central
2222
server-password: PACKAGES_CENTRAL_TOKEN
2323
gpg-passphrase: MAVEN_GPG_PASSPHRASE
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/setup-java@v5
3535
with: # running setup-java again overwrites the settings.xml
3636
distribution: 'temurin'
37-
java-version: '17'
37+
java-version: '21'
3838
server-id: sonatype-central-portal
3939
server-username: MAVEN_CENTRAL_USERNAME
4040
server-password: MAVEN_CENTRAL_TOKEN

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 2.0.0
2+
* Updated to Vaadin 25
3+
14
# 1.0.1
25
* Updated dependencies
36

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0?logo=vaadin)](https://vaadin.com/directory/component/chartjs-wrapper-for-vaadin)
22
[![Latest version](https://img.shields.io/maven-central/v/software.xdev/vaadin-chartjs-wrapper?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/vaadin-chartjs-wrapper)
33
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-chartjs-wrapper/check-build.yml?branch=develop)](https://github.com/xdev-software/vaadin-chartjs-wrapper/actions/workflows/check-build.yml?query=branch%3Adevelop)
4-
![Vaadin 24+](https://img.shields.io/badge/Vaadin%20Platform/Flow-24+-00b4f0)
4+
![Vaadin 25+](https://img.shields.io/badge/Vaadin%20Platform/Flow-25+-00b4f0)
55

66
# <img src="https://www.chartjs.org/media/logo.svg" height="38" /> Chart.js Wrapper for Vaadin
77

‎pom.xml‎

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

77
<groupId>software.xdev</groupId>
88
<artifactId>vaadin-chartjs-wrapper-root</artifactId>
9-
<version>1.0.2-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<organization>

‎vaadin-chartjs-wrapper-demo/pnpm-workspace.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Delay install of newly released packages to prevent supply chain attacks
2+
minimumReleaseAge: 180
3+
overrides:
4+
# Remove unused packages
5+
# glob CLI unused
6+
"jackspeak": "npm:empty-npm-package@1.0.0"
7+
"foreground-child": "npm:empty-npm-package@1.0.0"
8+
"package-json-from-dist": "npm:empty-npm-package@1.0.0"
9+
# rollup-plugin-visualizer CLI unused
10+
"yargs": "npm:empty-npm-package@1.0.0"
11+
"open": "npm:empty-npm-package@1.0.0"
12+
# transform-ast test only
13+
"nanobench": "npm:empty-npm-package@1.0.0"
14+
# Workbox unused
15+
"workbox-google-analytics": "npm:empty-npm-package@1.0.0"
16+
"@surma/rollup-plugin-off-main-thread": "npm:empty-npm-package@1.0.0"
17+
"@babel/preset-env": "npm:empty-npm-package@1.0.0"
18+
"@babel/runtime": "npm:empty-npm-package@1.0.0"
19+
"@rollup/plugin-replace@2.4.2": "npm:empty-npm-package@1.0.0"
20+
"@rollup/plugin-babel": "npm:empty-npm-package@1.0.0"
21+
"@rollup/plugin-node-resolve": "npm:empty-npm-package@1.0.0"
22+
"@rollup/plugin-terser": "npm:empty-npm-package@1.0.0"
23+
"tempy": "npm:empty-npm-package@1.0.0"
24+
# Disable telemetry
25+
"@vaadin/vaadin-usage-statistics": "npm:empty-npm-package@1.0.0"

‎vaadin-chartjs-wrapper-demo/pom.xml‎

Lines changed: 14 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>software.xdev</groupId>
99
<artifactId>vaadin-chartjs-wrapper-root</artifactId>
10-
<version>1.0.2-SNAPSHOT</version>
10+
<version>2.0.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>vaadin-chartjs-wrapper-demo</artifactId>
14-
<version>1.0.2-SNAPSHOT</version>
14+
<version>2.0.0-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<organization>
@@ -20,7 +20,7 @@
2020
</organization>
2121

2222
<properties>
23-
<javaVersion>17</javaVersion>
23+
<javaVersion>21</javaVersion>
2424
<maven.compiler.release>${javaVersion}</maven.compiler.release>
2525

2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -62,34 +62,21 @@
6262
<groupId>com.vaadin</groupId>
6363
<artifactId>vaadin-core</artifactId>
6464
<exclusions>
65-
<!-- No Hilla is used -->
66-
<exclusion>
67-
<groupId>com.vaadin</groupId>
68-
<artifactId>hilla-dev</artifactId>
69-
</exclusion>
70-
<exclusion>
71-
<groupId>com.vaadin</groupId>
72-
<artifactId>copilot</artifactId>
73-
</exclusion>
74-
<!-- Lumo is used instead -->
75-
<exclusion>
76-
<groupId>com.vaadin</groupId>
77-
<artifactId>vaadin-material-theme</artifactId>
78-
</exclusion>
79-
<!-- React is not enabled and thus not required -->
80-
<exclusion>
81-
<groupId>com.vaadin</groupId>
82-
<artifactId>flow-react</artifactId>
83-
</exclusion>
8465
<!-- There is like 10 people on the planet that need this by default -->
8566
<exclusion>
8667
<groupId>com.vaadin</groupId>
8768
<artifactId>collaboration-engine</artifactId>
8869
</exclusion>
89-
<!-- No Wildfly used here -->
70+
</exclusions>
71+
</dependency>
72+
<dependency>
73+
<groupId>com.vaadin</groupId>
74+
<artifactId>vaadin-dev</artifactId>
75+
<optional>true</optional>
76+
<exclusions>
9077
<exclusion>
91-
<groupId>com.vaadin.servletdetector</groupId>
92-
<artifactId>throw-if-servlet3</artifactId>
78+
<groupId>com.vaadin</groupId>
79+
<artifactId>copilot</artifactId>
9380
</exclusion>
9481
</exclusions>
9582
</dependency>
@@ -109,18 +96,6 @@
10996
<dependency>
11097
<groupId>com.vaadin</groupId>
11198
<artifactId>vaadin-spring-boot-starter</artifactId>
112-
<exclusions>
113-
<!-- No Hilla is used -->
114-
<exclusion>
115-
<groupId>com.vaadin</groupId>
116-
<artifactId>hilla</artifactId>
117-
</exclusion>
118-
</exclusions>
119-
</dependency>
120-
<!-- Temporarily excluded by Vaadin due to "security vulnerability" -->
121-
<dependency>
122-
<groupId>org.yaml</groupId>
123-
<artifactId>snakeyaml</artifactId>
12499
</dependency>
125100
<dependency>
126101
<groupId>org.springframework.boot</groupId>
@@ -143,40 +118,6 @@
143118
</pluginManagement>
144119

145120
<plugins>
146-
<plugin>
147-
<groupId>org.codehaus.mojo</groupId>
148-
<artifactId>exec-maven-plugin</artifactId>
149-
<version>3.6.3</version>
150-
<executions>
151-
<execution>
152-
<id>patch-package-json-overrides</id>
153-
<phase>compile</phase>
154-
<goals>
155-
<goal>java</goal>
156-
</goals>
157-
<configuration>
158-
<mainClass>software.xdev.vaadin.vpjo.Launcher</mainClass>
159-
<arguments>
160-
<argument>${project.basedir}</argument>
161-
<argument>${project.build.directory}</argument>
162-
</arguments>
163-
<includeProjectDependencies>false</includeProjectDependencies>
164-
<includePluginDependencies>true</includePluginDependencies>
165-
<executableDependency>
166-
<groupId>software.xdev</groupId>
167-
<artifactId>vaadin-package-json-optimizer</artifactId>
168-
</executableDependency>
169-
</configuration>
170-
</execution>
171-
</executions>
172-
<dependencies>
173-
<dependency>
174-
<groupId>software.xdev</groupId>
175-
<artifactId>vaadin-package-json-optimizer</artifactId>
176-
<version>1.0.0</version>
177-
</dependency>
178-
</dependencies>
179-
</plugin>
180121
<plugin>
181122
<groupId>com.vaadin</groupId>
182123
<artifactId>vaadin-maven-plugin</artifactId>
@@ -189,11 +130,11 @@
189130
</execution>
190131
</executions>
191132
<configuration>
133+
<!-- PNPM allows -->
134+
<pnpmEnable>true</pnpmEnable>
192135
<!-- Can only be true if hilla is used -->
193136
<!-- Takes a few seconds to scan everything for hilla -->
194137
<frontendHotdeploy>false</frontendHotdeploy>
195-
<!-- Prevent scanning for react (not used) -->
196-
<reactEnable>false</reactEnable>
197138
<!-- Only scan required -->
198139
<frontendScanner>
199140
<includes>
@@ -233,29 +174,9 @@
233174
<activation>
234175
<activeByDefault>true</activeByDefault>
235176
</activation>
236-
<dependencies>
237-
<dependency>
238-
<groupId>software.xdev</groupId>
239-
<artifactId>vaadin-package-json-optimizer</artifactId>
240-
<version>1.0.0</version>
241-
</dependency>
242-
</dependencies>
243177
</profile>
244178
<profile>
245179
<id>production</id>
246-
<dependencies>
247-
<!-- Exclude development dependencies from production -->
248-
<dependency>
249-
<groupId>com.vaadin</groupId>
250-
<artifactId>vaadin-core</artifactId>
251-
<exclusions>
252-
<exclusion>
253-
<groupId>com.vaadin</groupId>
254-
<artifactId>vaadin-dev</artifactId>
255-
</exclusion>
256-
</exclusions>
257-
</dependency>
258-
</dependencies>
259180
<build>
260181
<plugins>
261182
<plugin>

‎vaadin-chartjs-wrapper-demo/src/main/java/software/xdev/vaadin/Application.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
66

7+
import com.vaadin.flow.component.dependency.StyleSheet;
78
import com.vaadin.flow.component.page.AppShellConfigurator;
89
import com.vaadin.flow.component.page.Push;
910
import com.vaadin.flow.spring.annotation.EnableVaadin;
11+
import com.vaadin.flow.theme.lumo.Lumo;
1012

1113

1214
@SuppressWarnings("checkstyle:HideUtilityClassConstructor")
1315
@SpringBootApplication
1416
@EnableVaadin
1517
@Push
18+
@StyleSheet(Lumo.STYLESHEET)
1619
public class Application extends SpringBootServletInitializer implements AppShellConfigurator
1720
{
1821
public static void main(final String[] args)

‎vaadin-chartjs-wrapper-demo/src/main/java/software/xdev/vaadin/chartjs/demo/DateAdapterDemo.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818

1919
@NpmPackage(value = "date-fns", version = "4.1.0")
20-
@JsModule("date-fns/index.js")
2120
@JsModule("./lib/chartjs-adapter-date-fns.js")
2221
@Route(DateAdapterDemo.NAV)
2322
public class DateAdapterDemo extends VerticalLayout

0 commit comments

Comments
 (0)