Skip to content

Commit 1e57676

Browse files
AB-xdevAB-xdev
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents eec3780 + 447f71d commit 1e57676

File tree

7 files changed

+96
-11
lines changed

7 files changed

+96
-11
lines changed

‎.config/pmd/java/ruleset.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ruleset name="Default"
33
xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
5+
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.github.io/ruleset_2_0_0.xsd">
66

77
<description>
88
This ruleset checks the code for discouraged programming constructs.

‎.github/workflows/broken-links.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Find already existing issue
2727
id: find-issue
2828
run: |
29-
echo "number=$(gh issue list -l 'bug' -l 'automated' -L 1 -S 'in:title \"Link Checker Report\"' -s 'open' --json 'number' --jq '.[].number')" >> $GITHUB_OUTPUT
29+
echo "number=$(gh issue list -l 'bug' -l 'automated' -L 1 -S 'in:title "Link Checker Report"' -s 'open' --json 'number' --jq '.[].number')" >> $GITHUB_OUTPUT
3030
env:
3131
GH_TOKEN: ${{ github.token }}
3232

@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Create Issue From File
4040
if: steps.lychee.outputs.exit_code != 0
41-
uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
41+
uses: peter-evans/create-issue-from-file@fca9117c27cdc29c6c4db3b86c48e4115a786710 # v6
4242
with:
4343
issue-number: ${{ steps.find-issue.outputs.number }}
4444
title: Link Checker Report

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

Lines changed: 1 addition & 1 deletion
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]
31+
java: [17, 21, 25]
3232
distribution: [temurin]
3333
steps:
3434
- uses: actions/checkout@v5

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
1919
### Software Requirements
2020
You should have the following things installed:
2121
* Git
22-
* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
22+
* Java 25 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
2323
* Maven (Note that the [Maven Wrapper](https://maven.apache.org/wrapper/) is shipped with the repo)
2424

2525
### Recommended setup

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
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>11.0.1</version>
48+
<version>11.1.0</version>
4949
</dependency>
5050
</dependencies>
5151
<configuration>

‎template-placeholder-demo/pom.xml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>software.xdev</groupId>
9+
<artifactId>template-placeholder-root</artifactId>
10+
<version>1.0.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>template-placeholder-demo</artifactId>
14+
<version>1.0.0-SNAPSHOT</version>
15+
<packaging>jar</packaging>
16+
17+
<organization>
18+
<name>XDEV Software</name>
19+
<url>https://xdev.software</url>
20+
</organization>
21+
22+
<properties>
23+
<javaVersion>17</javaVersion>
24+
<maven.compiler.release>${javaVersion}</maven.compiler.release>
25+
26+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
27+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
28+
29+
<mainClass>software.xdev.Application</mainClass>
30+
</properties>
31+
32+
<dependencies>
33+
<dependency>
34+
<groupId>software.xdev</groupId>
35+
<artifactId>template-placeholder</artifactId>
36+
<version>${project.version}</version>
37+
</dependency>
38+
</dependencies>
39+
40+
<build>
41+
<finalName>${project.artifactId}</finalName>
42+
43+
<plugins>
44+
<plugin>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<artifactId>maven-compiler-plugin</artifactId>
47+
<version>3.14.1</version>
48+
<configuration>
49+
<release>${maven.compiler.release}</release>
50+
<compilerArgs>
51+
<arg>-proc:none</arg>
52+
</compilerArgs>
53+
</configuration>
54+
</plugin>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-assembly-plugin</artifactId>
58+
<version>3.7.1</version>
59+
<configuration>
60+
<archive>
61+
<manifest>
62+
<mainClass>${mainClass}</mainClass>
63+
</manifest>
64+
<manifestEntries>
65+
<Multi-Release>true</Multi-Release>
66+
</manifestEntries>
67+
</archive>
68+
<descriptorRefs>
69+
<descriptorRef>jar-with-dependencies</descriptorRef>
70+
</descriptorRefs>
71+
<appendAssemblyId>false</appendAssemblyId>
72+
</configuration>
73+
<executions>
74+
<execution>
75+
<id>make-assembly</id> <!-- this is used for inheritance merges -->
76+
<phase>package</phase> <!-- bind to the packaging phase -->
77+
<goals>
78+
<goal>single</goal>
79+
</goals>
80+
</execution>
81+
</executions>
82+
</plugin>
83+
</plugins>
84+
</build>
85+
</project>

‎vaadin-package-json-optimizer/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<plugin>
159159
<groupId>org.apache.maven.plugins</groupId>
160160
<artifactId>maven-compiler-plugin</artifactId>
161-
<version>3.14.0</version>
161+
<version>3.14.1</version>
162162
<configuration>
163163
<release>${maven.compiler.release}</release>
164164
<compilerArgs>
@@ -169,7 +169,7 @@
169169
<plugin>
170170
<groupId>org.apache.maven.plugins</groupId>
171171
<artifactId>maven-javadoc-plugin</artifactId>
172-
<version>3.11.3</version>
172+
<version>3.12.0</version>
173173
<executions>
174174
<execution>
175175
<id>attach-javadocs</id>
@@ -208,7 +208,7 @@
208208
<plugin>
209209
<groupId>org.codehaus.mojo</groupId>
210210
<artifactId>flatten-maven-plugin</artifactId>
211-
<version>1.7.2</version>
211+
<version>1.7.3</version>
212212
<configuration>
213213
<flattenMode>ossrh</flattenMode>
214214
</configuration>
@@ -254,7 +254,7 @@
254254
<plugin>
255255
<groupId>org.sonatype.central</groupId>
256256
<artifactId>central-publishing-maven-plugin</artifactId>
257-
<version>0.8.0</version>
257+
<version>0.9.0</version>
258258
<extensions>true</extensions>
259259
<configuration>
260260
<publishingServerId>sonatype-central-portal</publishingServerId>
@@ -276,7 +276,7 @@
276276
<dependency>
277277
<groupId>com.puppycrawl.tools</groupId>
278278
<artifactId>checkstyle</artifactId>
279-
<version>11.0.1</version>
279+
<version>11.1.0</version>
280280
</dependency>
281281
</dependencies>
282282
<configuration>

0 commit comments

Comments
 (0)