Skip to content

Update from template (auto-merged) #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xdev-gh-bot merged 10 commits into from
Sep 15, 2025
Merged

Update from template (auto-merged) #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bbfe9de
Update vaadin.version to v24.8.8
xdev-renovate Sep 9, 2025
a83282e
Merge pull request #400 from xdev-software/renovate/vaadin.version
AB-xdev Sep 11, 2025
03779bd
Add vpjo
AB-xdev Sep 11, 2025
b828600
Update net.sourceforge.pmd to v7.17.0
xdev-renovate Sep 12, 2025
d3df7ee
Merge pull request #198 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Sep 12, 2025
154c6c7
Update to PMD 7.17 and add new rules
AB-xdev Sep 12, 2025
d149489
Merge branch 'master' into update-from-template-xdev-software/java-se…
xdev-gh-bot Sep 12, 2025
ee1210b
Merge branch 'master' into update-from-template-xdev-software/java-te…
xdev-gh-bot Sep 12, 2025
36b5ec9
Merge branch 'master' into update-from-template-xdev-software/standar…
xdev-gh-bot Sep 12, 2025
f95432b
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .config/pmd/java/ruleset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<rule ref="category/java/codestyle.xml/NoPackage"/>
<rule ref="category/java/codestyle.xml/PrematureDeclaration"/>
<rule ref="category/java/codestyle.xml/UnnecessarySemicolon"/>
<rule ref="category/java/codestyle.xml/VariableCanBeInlined"/>

<rule ref="category/java/design.xml">
<!-- Sometimes abstract classes have just fields -->
Expand Down Expand Up @@ -138,6 +139,7 @@
<rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>
<rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
<rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
<rule ref="category/java/errorprone.xml/CollectionTypeMismatch"/>
<rule ref="category/java/errorprone.xml/ComparisonWithNaN"/>
<rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
<rule ref="category/java/errorprone.xml/DontImportSun"/>
Expand All @@ -155,7 +157,7 @@
<rule ref="category/java/errorprone.xml/SingletonClassReturningNewInstance"/>
<rule ref="category/java/errorprone.xml/UnconditionalIfStatement"/>
<rule ref="category/java/errorprone.xml/UnnecessaryCaseChange"/>
<rule ref="category/java/errorprone.xml/UselessOperationOnImmutable"/>
<rule ref="category/java/errorprone.xml/UselessPureMethodCall"/>


<rule ref="category/java/multithreading.xml">
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.16.0</version>
<version>7.17.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.16.0</version>
<version>7.17.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
49 changes: 48 additions & 1 deletion vaadin-chartjs-wrapper-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<mainClass>software.xdev.vaadin.Application</mainClass>

<!-- Dependency-Versions -->
<vaadin.version>24.8.7</vaadin.version>
<vaadin.version>24.8.8</vaadin.version>

<org.springframework.boot.version>3.5.5</org.springframework.boot.version>
</properties>
Expand Down Expand Up @@ -143,6 +143,40 @@
</pluginManagement>

<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.5.1</version>
<executions>
<execution>
<id>patch-package-json-overrides</id>
<phase>compile</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>software.xdev.vaadin.vpjo.Launcher</mainClass>
<arguments>
<argument>${project.basedir}</argument>
<argument>${project.build.directory}</argument>
</arguments>
<includeProjectDependencies>false</includeProjectDependencies>
<includePluginDependencies>true</includePluginDependencies>
<executableDependency>
<groupId>software.xdev</groupId>
<artifactId>vaadin-package-json-optimizer</artifactId>
</executableDependency>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>software.xdev</groupId>
<artifactId>vaadin-package-json-optimizer</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-maven-plugin</artifactId>
Expand Down Expand Up @@ -194,6 +228,19 @@
</build>

<profiles>
<profile>
<id>dev</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>software.xdev</groupId>
<artifactId>vaadin-package-json-optimizer</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>production</id>
<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions vaadin-chartjs-wrapper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- Dependency-Versions -->
<vaadin.version>24.8.7</vaadin.version>
<vaadin.version>24.8.8</vaadin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -299,12 +299,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.16.0</version>
<version>7.17.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.16.0</version>
<version>7.17.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down