Merge pull request #202 from xdev-software/develop

Release v2.0.3

Author: JohannesRabauer

.github/workflows/release.yml

@@ -8,6 +8,10 @@ env:
   PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
   DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   check_code: # Validates the code (see develop.yml)
     runs-on: ubuntu-latest
@@ -70,8 +74,8 @@ jobs:
       id: version
       run: |
         version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-        echo "::set-output name=release::$version"
-        echo "::set-output name=releasenumber::${version//[!0-9]/}"
+        echo "release=$version" >> $GITHUB_OUTPUT
+        echo "releasenumber=${version//[!0-9]/}" >> $GITHUB_OUTPUT
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Commit and Push
@@ -84,9 +88,7 @@ jobs:
     
     - name: Create Release
       id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      uses: shogo82148/actions-create-release@v1
       with:
         tag_name: v${{ steps.version.outputs.release }}
         release_name: v${{ steps.version.outputs.release }}
@@ -104,8 +106,6 @@ jobs:
              <version>${{ steps.version.outputs.release }}</version>
           </dependency>
           ```
-        draft: false
-        prerelease: false
 
   publish_central: # Publish the code to central
     runs-on: ubuntu-latest
@@ -170,13 +170,11 @@ jobs:
     - name: Get version
       id: version
       run: |
-       echo "::set-output name=release::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
+       echo "release=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Upload Release Asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      uses: shogo82148/actions-upload-release-asset@v1
       with:
         upload_url: ${{ needs.prepare_release.outputs.upload_url }}
         asset_path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-${{ steps.version.outputs.release }}.zip
@@ -270,7 +268,6 @@ jobs:
     - name: pull-request
       uses: repo-sync/pull-request@v2
       with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
         destination_branch: "develop"
         pr_title: "Sync back"
         pr_body: "An automated PR to sync changes back"

.github/workflows/sonar.yml

@@ -0,0 +1,57 @@
+name: Sonar
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ develop ]
+    paths-ignore: 
+      - '**.md'
+      - 'assets/**'
+      - 'config/**'
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths-ignore: 
+      - '**.md'
+      - 'assets/**'
+      - 'config/**'
+
+env:
+  SONARCLOUD_ORG: ${{ github.event.organization.login }}
+  SONARCLOUD_HOST: https://sonarcloud.io
+
+jobs:
+  sonar:
+    name: SonarCloud Scan
+    runs-on: ubuntu-latest
+    # Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
+    if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 11
+
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Build with Maven
+        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} -Dsonar.organization=${{ env.SONARCLOUD_ORG }} -Dsonar.host.url=${{ env.SONARCLOUD_HOST }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/update-from-template.yml

@@ -60,7 +60,7 @@ jobs:
             echo "Deleting origin branch that contains the updates - if present"
             git push -f origin --delete ${{ env.UPDATE_BRANCH }} || true
             
-            echo "::set-output name=abort::1"
+            echo "abort=1" >> $GITHUB_OUTPUT
             exit 0
           fi
           
@@ -76,9 +76,9 @@ jobs:
           echo "Getting current branch"
           current_branch=$(git branch --show-current)
           echo "Current branch is $current_branch"
-          echo "::set-output name=current_branch::$current_branch"
+          echo "current_branch=$current_branch" >> $GITHUB_OUTPUT
 
-          echo "::set-output name=abort::0"
+          echo "abort=0" >> $GITHUB_OUTPUT
           
       - name: pull-request
         uses: repo-sync/pull-request@v2

.idea/codeStyles/Project.xml

@@ -1,3 +1,8 @@
+## 2.0.3
+* Updated dependencies
+* Fixed problem with setting lon/lan in LMarker
+* Added constructors for LMap
+
 ## 2.0.2
 * Updated dependencies
 

CHANGELOG.md

@@ -1,6 +1,7 @@
 [![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0.svg)](https://vaadin.com/directory/component/leafletmap-for-vaadin)
 [![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)
-[![Build](https://img.shields.io/github/workflow/status/xdev-software/vaadin-maps-leaflet-flow/Check%20Build/develop)](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
+[![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)
+[![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)
 ![Vaadin 23+](https://img.shields.io/badge/Vaadin%20Platform/Flow-23+-00b4f0.svg)
 
 # vaadin-maps-leaflet-flow
@@ -39,10 +40,10 @@ Vaadin Flow Java API for [Leaflet Maps](https://leafletjs.com/) Component
 View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/vaadin-maps-leaflet-flow/dependencies/)
 
 
-## Releasing [![Build](https://img.shields.io/github/workflow/status/xdev-software/vaadin-maps-leaflet-flow/Release?label=Release)](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/release.yml)
+## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-maps-leaflet-flow/release.yml?branch=master)](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/release.yml)
 
 Before releasing:
-* Consider doing a [test-deployment](https://github.com/xdev-software/vaadin-addon-template/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
+* Consider doing a [test-deployment](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
 * Check the [changelog](CHANGELOG.md)
 
 If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes

README.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/vaadin-maps-leaflet-flow/security/advisories/new).

SECURITY.md

@@ -33,7 +33,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>23.2.4</vaadin.version>
+		<vaadin.version>23.3.4</vaadin.version>
 	</properties>
 
 
@@ -73,7 +73,7 @@
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>10.0.12</version>
+				<version>10.0.13</version>
 				<configuration>
 					<scan>1</scan>
 				</configuration>

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

@@ -42,16 +42,14 @@
 	</licenses>
 
 	<properties>
-		<license.licenseName>apache_v2</license.licenseName>
-
 		<javaVersion>11</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>23.2.4</vaadin.version>
+		<vaadin.version>23.3.4</vaadin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -110,7 +108,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.13.4.2</version>
+			<version>2.14.1</version>
 		</dependency>
 
 		<dependency>
@@ -123,22 +121,30 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
+				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>2.0.0</version>
+				<version>4.1</version>
+				<configuration>
+					<properties>
+						<email>${project.organization.url}</email>
+					</properties>
+					<licenseSets>
+						<licenseSet>
+							<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
+							<includes>
+								<include>src/main/java/**</include>
+								<include>src/test/java/**</include>
+							</includes>
+						</licenseSet>
+					</licenseSets>
+				</configuration>
 				<executions>
 					<execution>
 						<id>first</id>
 						<goals>
-							<goal>update-file-header</goal>
+							<goal>format</goal>
 						</goals>
 						<phase>process-sources</phase>
-						<configuration>
-							<roots>
-								<root>src/main/java</root>
-								<root>src/test/java</root>
-							</roots>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>

vaadin-maps-leaflet-flow/pom.xml

@@ -1,26 +1,23 @@
-
-package software.xdev.vaadin.maps.leaflet.flow;
-
-/*-
- * #%L
- * vaadin-maps-leaflet-flow
- * %%
- * Copyright (C) 2019 XDEV Software
- * %%
+/*
+ * Copyright © 2019 XDEV Software (https://xdev.software/en)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * #L%
  */
 
+package software.xdev.vaadin.maps.leaflet.flow;
+
+
+
 import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
 
 import java.util.ArrayList;
@@ -88,6 +85,18 @@ public LMap(final double lat, final double lon, final int zoom)
 		this.setViewPoint(this.center);
 	}
 
+	public LMap(final double lat, final double lon, final int zoom, final LTileLayer tileLayer)
+	{
+		this(lat, lon, zoom);
+		this.setTileLayer(tileLayer);
+	}
+	
+	public LMap(final LTileLayer tileLayer)
+	{
+		this();
+		this.setTileLayer(tileLayer);
+	}
+	
 	public void setZoom(final int zoom)
 	{
 		this.getElement().executeJs(CLIENT_MAP + ".setZoom(" + zoom + ");");