Skip to content

Commit 66d3327

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents db6281a + 4c327e5 commit 66d3327

File tree

12 files changed

+32
-40
lines changed

12 files changed

+32
-40
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto

.github/dependabot.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,3 @@ updates:
2020
# Run it at a specific time so that we don't get emails all day long
2121
time: "00:00"
2222
open-pull-requests-limit: 10
23-
ignore:
24-
- dependency-name: "org.yaml:snakeyaml"
25-
# Version 2+ requires Spring Boot 3
26-
versions: ">=2.0.0"
27-
- dependency-name: "org.springframework.boot:*"
28-
# Version 3+ requires Vaadin 24
29-
versions: ">=3.0.0"
30-
- dependency-name: "com.vaadin:*"
31-
versions: ">=24.0.0"

.github/workflows/checkBuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
strategy:
2323
matrix:
24-
java: [11, 17]
24+
java: [17]
2525
distribution: [temurin]
2626

2727
steps:

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ permissions:
1313
pull-requests: write
1414

1515
jobs:
16-
check_code: # Validates the code (see develop.yml)
16+
check_code: # Validates the code
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v3
2020

2121
- name: Set up JDK
2222
uses: actions/setup-java@v3
2323
with:
24-
java-version: '11'
24+
java-version: '17'
2525
distribution: 'temurin'
2626
cache: 'maven'
2727

@@ -122,7 +122,7 @@ jobs:
122122
- name: Set up JDK Apache Maven Central
123123
uses: actions/setup-java@v3
124124
with: # running setup-java again overwrites the settings.xml
125-
java-version: '11'
125+
java-version: '17'
126126
distribution: 'temurin'
127127
server-id: ossrh
128128
server-username: MAVEN_CENTRAL_USERNAME
@@ -154,7 +154,7 @@ jobs:
154154
- name: Setup - Java
155155
uses: actions/setup-java@v3
156156
with:
157-
java-version: '11'
157+
java-version: '17'
158158
distribution: 'temurin'
159159
cache: 'maven'
160160

.github/workflows/sonar.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ jobs:
3030
with:
3131
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
3232

33-
- name: Set up JDK 11
33+
- name: Set up JDK
3434
uses: actions/setup-java@v3
3535
with:
3636
distribution: 'temurin'
37-
java-version: 11
37+
java-version: 17
3838

3939
- name: Cache SonarCloud packages
4040
uses: actions/cache@v3

.github/workflows/test-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/setup-java@v3
1717
with: # running setup-java again overwrites the settings.xml
1818
distribution: 'temurin'
19-
java-version: '11'
19+
java-version: '17'
2020
server-id: ossrh
2121
server-username: MAVEN_CENTRAL_USERNAME
2222
server-password: MAVEN_CENTRAL_TOKEN

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,12 @@ vite.config.ts
8181
vite.generated.ts
8282
/*/frontend/generated/
8383
/*/frontend/index.html
84+
/*/src/main/dev-bundle/
8485

8586
#custom
8687
.flattened-pom.xml
8788
.tern-project
8889

89-
# Ignore Testcontainer generic folders
90-
PutObjectStoreDirHere/
91-
ObjectStore/
92-
9390
# == IntelliJ ==
9491
*.iml
9592
*.ipr

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ We encourage you to read the [contribution instructions by GitHub](https://guide
2020
### Software Requirements
2121
You should have the following things installed:
2222
* Git
23-
* Java 11 or 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
23+
* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
2424
* Maven
2525

2626
### Recommended setup

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2020 XDEV Software
189+
Copyright 2023 XDEV Software
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0.svg)](https://vaadin.com/directory/component/leafletmap-for-vaadin)
2-
[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/vaadin-maps-leaflet-flow)](https://mvnrepository.com/artifact/com.xdev-software/vaadin-maps-leaflet-flow)
1+
[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0?logo=vaadin)](https://vaadin.com/directory/component/leafletmap-for-vaadin)
2+
[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/vaadin-maps-leaflet-flow?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/vaadin-maps-leaflet-flow)
33
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-maps-leaflet-flow/checkBuild.yml?branch=develop)](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
44
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_vaadin-maps-leaflet-flow&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_vaadin-maps-leaflet-flow)
5-
![Vaadin 23+](https://img.shields.io/badge/Vaadin%20Platform/Flow-23+-00b4f0.svg)
5+
![Vaadin 24+](https://img.shields.io/badge/Vaadin%20Platform/Flow-24+-00b4f0)
66

77
# vaadin-maps-leaflet-flow
88
Vaadin Flow Java API for [Leaflet Maps](https://leafletjs.com/) Component

0 commit comments

Comments
 (0)