Skip to content

Commit d1cd7fb

Browse files
committed
Merge branch 'develop' of https://github.com/xdev-software/vaadin-chartjs-wrapper into develop
2 parents 802019c + d086e88 commit d1cd7fb

3 files changed

Lines changed: 56 additions & 6 deletions

File tree

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>com.puppycrawl.tools</groupId>
4747
<artifactId>checkstyle</artifactId>
48-
<version>10.25.1</version>
48+
<version>10.26.0</version>
4949
</dependency>
5050
</dependencies>
5151
<configuration>
@@ -70,7 +70,7 @@
7070
<plugin>
7171
<groupId>org.apache.maven.plugins</groupId>
7272
<artifactId>maven-pmd-plugin</artifactId>
73-
<version>3.26.0</version>
73+
<version>3.27.0</version>
7474
<configuration>
7575
<includeTests>true</includeTests>
7676
<printFailingErrors>true</printFailingErrors>

vaadin-chartjs-wrapper-demo/pom.xml

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<mainClass>software.xdev.vaadin.Application</mainClass>
3030

3131
<!-- Dependency-Versions -->
32-
<vaadin.version>24.7.6</vaadin.version>
32+
<vaadin.version>24.8.0</vaadin.version>
3333

3434
<org.springframework.boot.version>3.5.3</org.springframework.boot.version>
3535
</properties>
@@ -62,10 +62,35 @@
6262
<groupId>com.vaadin</groupId>
6363
<artifactId>vaadin-core</artifactId>
6464
<exclusions>
65+
<!-- No Hilla is used -->
6566
<exclusion>
6667
<groupId>com.vaadin</groupId>
6768
<artifactId>hilla-dev</artifactId>
6869
</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>
84+
<!-- There is like 10 people on the planet that need this by default -->
85+
<exclusion>
86+
<groupId>com.vaadin</groupId>
87+
<artifactId>collaboration-engine</artifactId>
88+
</exclusion>
89+
<!-- No Wildfly used here -->
90+
<exclusion>
91+
<groupId>com.vaadin.servletdetector</groupId>
92+
<artifactId>throw-if-servlet3</artifactId>
93+
</exclusion>
6994
</exclusions>
7095
</dependency>
7196
<dependency>
@@ -85,6 +110,7 @@
85110
<groupId>com.vaadin</groupId>
86111
<artifactId>vaadin-spring-boot-starter</artifactId>
87112
<exclusions>
113+
<!-- No Hilla is used -->
88114
<exclusion>
89115
<groupId>com.vaadin</groupId>
90116
<artifactId>hilla</artifactId>
@@ -128,6 +154,30 @@
128154
</goals>
129155
</execution>
130156
</executions>
157+
<configuration>
158+
<!-- Can only be true if hilla is used -->
159+
<!-- Takes a few seconds to scan everything for hilla -->
160+
<frontendHotdeploy>false</frontendHotdeploy>
161+
<!-- Prevent scanning for react (not used) -->
162+
<reactEnable>false</reactEnable>
163+
<!-- Only scan required -->
164+
<frontendScanner>
165+
<includes>
166+
<include>
167+
<groupId>software.xdev</groupId>
168+
<artifactId>*vaadin*</artifactId>
169+
</include>
170+
<include>
171+
<groupId>com.vaadin</groupId>
172+
</include>
173+
</includes>
174+
<excludes>
175+
<exclude>
176+
<groupId>com.vaadin.external*</groupId>
177+
</exclude>
178+
</excludes>
179+
</frontendScanner>
180+
</configuration>
131181
</plugin>
132182
<plugin>
133183
<groupId>org.apache.maven.plugins</groupId>

vaadin-chartjs-wrapper/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5050

5151
<!-- Dependency-Versions -->
52-
<vaadin.version>24.7.6</vaadin.version>
52+
<vaadin.version>24.8.0</vaadin.version>
5353
</properties>
5454

5555
<dependencyManagement>
@@ -270,7 +270,7 @@
270270
<dependency>
271271
<groupId>com.puppycrawl.tools</groupId>
272272
<artifactId>checkstyle</artifactId>
273-
<version>10.25.1</version>
273+
<version>10.26.0</version>
274274
</dependency>
275275
</dependencies>
276276
<configuration>
@@ -295,7 +295,7 @@
295295
<plugin>
296296
<groupId>org.apache.maven.plugins</groupId>
297297
<artifactId>maven-pmd-plugin</artifactId>
298-
<version>3.26.0</version>
298+
<version>3.27.0</version>
299299
<configuration>
300300
<includeTests>true</includeTests>
301301
<printFailingErrors>true</printFailingErrors>

0 commit comments

Comments
 (0)