Skip to content

Commit d7f97b7

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents 422a9b0 + beaa334 commit d7f97b7

File tree

5 files changed

+11
-20
lines changed

5 files changed

+11
-20
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@ jobs:
1919
with:
2020
java-version: '11'
2121
distribution: 'temurin'
22-
23-
- name: Cache local Maven repository
24-
uses: actions/cache@v3
25-
with:
26-
path: ~/.m2/repository
27-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
28-
restore-keys: |
29-
${{ runner.os }}-maven-
22+
cache: 'maven'
3023

3124
- name: Build with Maven
3225
run: mvn -B clean package -Pproduction

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ webpack.generated.js
7777
webpack.config.js
7878
tsconfig.json
7979
types.d.ts
80+
vite.config.ts
81+
vite.generated.ts
8082
/*/frontend/generated/
8183
/*/frontend/index.html
8284

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
65
<modelVersion>4.0.0</modelVersion>
76

87
<groupId>com.xdev-software</groupId>
98
<artifactId>vaadin-maps-leaflet-flow-root</artifactId>
10-
<packaging>pom</packaging>
119
<version>2.0.1-SNAPSHOT</version>
10+
<packaging>pom</packaging>
1211

1312
<organization>
1413
<name>XDEV Software</name>

vaadin-maps-leaflet-flow-demo/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
87
<groupId>com.xdev-software</groupId>
98
<artifactId>vaadin-maps-leaflet-flow-demo</artifactId>
109
<version>2.0.1-SNAPSHOT</version>
@@ -34,7 +33,7 @@
3433
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3534

3635
<!-- Dependency-Versions -->
37-
<vaadin.version>23.1.6</vaadin.version>
36+
<vaadin.version>23.2.1</vaadin.version>
3837
</properties>
3938

4039

@@ -74,7 +73,7 @@
7473
<plugin>
7574
<groupId>org.eclipse.jetty</groupId>
7675
<artifactId>jetty-maven-plugin</artifactId>
77-
<version>10.0.11</version>
76+
<version>10.0.12</version>
7877
<configuration>
7978
<scan>1</scan>
8079
</configuration>

vaadin-maps-leaflet-flow/pom.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
65
<modelVersion>4.0.0</modelVersion>
76

87
<groupId>com.xdev-software</groupId>
98
<artifactId>vaadin-maps-leaflet-flow</artifactId>
10-
11-
<packaging>jar</packaging>
129
<version>2.0.1-SNAPSHOT</version>
10+
<packaging>jar</packaging>
1311

1412
<name>LeafletMap for Vaadin</name>
1513
<description>LeafletMap for Vaadin</description>
@@ -53,7 +51,7 @@
5351
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5452

5553
<!-- Dependency-Versions -->
56-
<vaadin.version>23.1.6</vaadin.version>
54+
<vaadin.version>23.2.1</vaadin.version>
5755
</properties>
5856

5957
<dependencyManagement>
@@ -171,7 +169,7 @@
171169
<plugin>
172170
<groupId>org.apache.maven.plugins</groupId>
173171
<artifactId>maven-javadoc-plugin</artifactId>
174-
<version>3.4.0</version>
172+
<version>3.4.1</version>
175173
<executions>
176174
<execution>
177175
<id>attach-javadocs</id>
@@ -203,7 +201,7 @@
203201
<plugin>
204202
<groupId>org.apache.maven.plugins</groupId>
205203
<artifactId>maven-jar-plugin</artifactId>
206-
<version>3.2.2</version>
204+
<version>3.3.0</version>
207205
<configuration>
208206
<archive>
209207
<index>true</index>
@@ -296,7 +294,7 @@
296294
<plugin>
297295
<groupId>org.apache.maven.plugins</groupId>
298296
<artifactId>maven-jar-plugin</artifactId>
299-
<version>3.2.2</version>
297+
<version>3.3.0</version>
300298
<configuration>
301299
<!-- VAADIN files that shouldn't be included in add-ons -->
302300
<excludes>

0 commit comments

Comments
 (0)