Skip to content

Commit f31305e

Browse files
AB-xdevAB-xdev
committed
Update to Vaadin 25
1 parent f67ca9a commit f31305e

File tree

8 files changed

+51
-88
lines changed

8 files changed

+51
-88
lines changed

‎.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

‎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/template-placeholder)
22
[![Latest version](https://img.shields.io/maven-central/v/software.xdev/template-placeholder?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/template-placeholder)
33
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/template-placeholder/check-build.yml?branch=develop)](https://github.com/xdev-software/template-placeholder/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
# template-placeholder
77
A Vaadin Template Repo

‎template-placeholder-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 # 3h
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"

‎template-placeholder-demo/pom.xml‎

Lines changed: 13 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -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,37 +62,25 @@
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>
83+
9684
<dependency>
9785
<groupId>software.xdev</groupId>
9886
<artifactId>template-placeholder</artifactId>
@@ -103,18 +91,6 @@
10391
<dependency>
10492
<groupId>com.vaadin</groupId>
10593
<artifactId>vaadin-spring-boot-starter</artifactId>
106-
<exclusions>
107-
<!-- No Hilla is used -->
108-
<exclusion>
109-
<groupId>com.vaadin</groupId>
110-
<artifactId>hilla</artifactId>
111-
</exclusion>
112-
</exclusions>
113-
</dependency>
114-
<!-- Temporarily excluded by Vaadin due to "security vulnerability" -->
115-
<dependency>
116-
<groupId>org.yaml</groupId>
117-
<artifactId>snakeyaml</artifactId>
11894
</dependency>
11995
<dependency>
12096
<groupId>org.springframework.boot</groupId>
@@ -137,40 +113,6 @@
137113
</pluginManagement>
138114

139115
<plugins>
140-
<plugin>
141-
<groupId>org.codehaus.mojo</groupId>
142-
<artifactId>exec-maven-plugin</artifactId>
143-
<version>3.6.3</version>
144-
<executions>
145-
<execution>
146-
<id>patch-package-json-overrides</id>
147-
<phase>compile</phase>
148-
<goals>
149-
<goal>java</goal>
150-
</goals>
151-
<configuration>
152-
<mainClass>software.xdev.vaadin.vpjo.Launcher</mainClass>
153-
<arguments>
154-
<argument>${project.basedir}</argument>
155-
<argument>${project.build.directory}</argument>
156-
</arguments>
157-
<includeProjectDependencies>false</includeProjectDependencies>
158-
<includePluginDependencies>true</includePluginDependencies>
159-
<executableDependency>
160-
<groupId>software.xdev</groupId>
161-
<artifactId>vaadin-package-json-optimizer</artifactId>
162-
</executableDependency>
163-
</configuration>
164-
</execution>
165-
</executions>
166-
<dependencies>
167-
<dependency>
168-
<groupId>software.xdev</groupId>
169-
<artifactId>vaadin-package-json-optimizer</artifactId>
170-
<version>1.0.0</version>
171-
</dependency>
172-
</dependencies>
173-
</plugin>
174116
<plugin>
175117
<groupId>com.vaadin</groupId>
176118
<artifactId>vaadin-maven-plugin</artifactId>
@@ -183,11 +125,11 @@
183125
</execution>
184126
</executions>
185127
<configuration>
128+
<!-- Allows for greater control -->
129+
<pnpmEnable>true</pnpmEnable>
186130
<!-- Can only be true if hilla is used -->
187131
<!-- Takes a few seconds to scan everything for hilla -->
188132
<frontendHotdeploy>false</frontendHotdeploy>
189-
<!-- Prevent scanning for react (not used) -->
190-
<reactEnable>false</reactEnable>
191133
<!-- Only scan required -->
192134
<frontendScanner>
193135
<includes>
@@ -227,13 +169,6 @@
227169
<activation>
228170
<activeByDefault>true</activeByDefault>
229171
</activation>
230-
<dependencies>
231-
<dependency>
232-
<groupId>software.xdev</groupId>
233-
<artifactId>vaadin-package-json-optimizer</artifactId>
234-
<version>1.0.0</version>
235-
</dependency>
236-
</dependencies>
237172
</profile>
238173
<profile>
239174
<id>production</id>

‎template-placeholder-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)

‎template-placeholder/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</licenses>
4343

4444
<properties>
45-
<javaVersion>17</javaVersion>
45+
<javaVersion>21</javaVersion>
4646
<maven.compiler.release>${javaVersion}</maven.compiler.release>
4747

4848
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

0 commit comments

Comments
 (0)