Merge pull request #87 from xdev-software/develop

v1.1.0

Author: AB-xdev

.github/dependabot.yml

@@ -4,11 +4,15 @@ updates:
   directory: "/"
   schedule:
     interval: daily
-    time: "04:00"
   open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: "*"
+    # GitHub actions are using git tags (v1 = v1.2 = v1.2.3) which should be compatible until a major change is performed
+    update-types: 
+    - "version-update:semver-minor"
+    - "version-update:semver-patch"
 - package-ecosystem: maven
   directory: "/"
   schedule:
     interval: daily
-    time: "04:00"
   open-pull-requests-limit: 10

.github/workflows/develop.yml renamed to .github/workflows/checkBuild.yml

@@ -1,10 +1,14 @@
-name: Develop CI
-
+name: Check Build
 on:
+  workflow_dispatch:
   push:
     branches: [ develop ]
+    paths-ignore: 
+      - '**.md'
   pull_request:
     branches: [ develop ]
+    paths-ignore: 
+      - '**.md'
 
 jobs:
   build:
@@ -13,10 +17,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        java-version: '8'
+        distribution: 'adopt'
 
     - name: Cache local Maven repository
       uses: actions/cache@v2

.github/workflows/master.yml renamed to .github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Master CI
+name: Release
 
 on:
   push:
@@ -10,10 +10,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        java-version: '8'
+        distribution: 'adopt'
 
     - name: Cache local Maven repository
       uses: actions/cache@v2
@@ -116,10 +117,11 @@ jobs:
         git config --global user.name "GitHub Actions"
         git pull
     
-    - name: Set up JDK 1.8 Apache Maven Central
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8 Apache Maven Central
+      uses: actions/setup-java@v2
       with: # running setup-java again overwrites the settings.xml
-        java-version: 1.8
+        java-version: '8'
+        distribution: 'adopt'
         server-id: ossrh
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN
@@ -146,10 +148,11 @@ jobs:
         git config --global user.name "GitHub Actions"
         git pull
     
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        java-version: '8'
+        distribution: 'adopt'
 
     - name: Build for Vaadin Directory
       run: mvn -B install -Pdirectory
@@ -192,9 +195,10 @@ jobs:
         git pull
 
     - name: Setup - Java
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        java-version: '8'
+        distribution: 'adopt'
 
     - name: Restore - Maven Cache
       uses: actions/cache@v1

README.md

@@ -1,7 +1,7 @@
 [![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0.svg)](https://vaadin.com/directory/component/leafletmap-for-vaadin)
-[![Build](https://img.shields.io/github/workflow/status/xdev-software/vaadin-maps-leaflet-flow/Master%20CI)](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions?query=workflow%3A%22Master+CI%22)
 [![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 Develop](https://img.shields.io/github/workflow/status/xdev-software/vaadin-maps-leaflet-flow/Develop%20CI/develop?label=build%20develop)](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions?query=workflow%3A%22Develop+CI%22+branch%3Adevelop)
+[![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)
+![Vaadin 14+](https://img.shields.io/badge/Vaadin%20Platform/Flow-14+-00b4f0.svg)
 
 # vaadin-maps-leaflet-flow
 Vaadin Flow Java API for [Leaflet Maps](https://leafletjs.com/) Component
@@ -13,7 +13,7 @@ Vaadin Flow Java API for [Leaflet Maps](https://leafletjs.com/) Component
 
 ## Run the Demo
 * Checkout the repo
-* Run ``mvn clean package``
+* Run ``mvn clean install``
 * Navigate into ``vaadin-maps-leaflet-flow-demo`` 
 * Run ``mvn jetty:run``
 * Open http://localhost:8080
@@ -25,7 +25,7 @@ Vaadin Flow Java API for [Leaflet Maps](https://leafletjs.com/) Component
 </details>
 
 
-## Releasing
+## 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)
 If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes
 
 When the release is finished do the following:

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>vaadin-maps-leaflet-flow-root</artifactId>
-	<version>1.0.7-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>vaadin-maps-leaflet-flow-root</name>

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

@@ -5,10 +5,9 @@
 	xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 
-
 	<groupId>com.xdev-software</groupId>
 	<artifactId>vaadin-maps-leaflet-flow-demo</artifactId>
-	<version>1.0.7-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 	<name>Vaadin Maps Leaflet Flow Demo</name>
@@ -41,7 +40,7 @@
 		<failOnMissingWebXml>false</failOnMissingWebXml>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>14.4.10</vaadin.version>
+		<vaadin.version>14.6.5</vaadin.version>
 	</properties>
 
 
@@ -81,7 +80,7 @@
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>9.4.38.v20210224</version>
+				<version>9.4.42.v20210604</version>
 				<configuration>
 					<scanIntervalSeconds>1</scanIntervalSeconds>
 				</configuration>