Merge pull request #160 from xdev-software/develop

Release v2.0.0

Author: AB-xdev

.github/dependabot.yml

@@ -4,6 +4,8 @@ updates:
   directory: "/"
   schedule:
     interval: daily
+    # Run it at a specific time so that we don't get emails all day long
+    time: "00:00"
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: "*"
@@ -15,4 +17,10 @@ updates:
   directory: "/"
   schedule:
     interval: daily
+    # Run it at a specific time so that we don't get emails all day long
+    time: "00:00"
   open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: "org.eclipse.jetty:jetty-maven-plugin"
+    # Version 11+ requires jakarta.* instead of javax.* (see https://www.eclipse.org/jetty/download.php#what-jetty-version)
+    versions: ">=11.0.0"

.github/workflows/checkBuild.yml

@@ -1,4 +1,5 @@
 name: Check Build
+
 on:
   workflow_dispatch:
   push:
@@ -10,26 +11,28 @@ on:
     paths-ignore: 
       - '**.md'
 
+env:
+  PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
+  DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        java: [11, 17]
+        distribution: [temurin]
+
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
+    - name: Set up JDK
+      uses: actions/setup-java@v3
       with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
+        distribution: ${{ matrix.distribution }}
+        java-version: ${{ matrix.java }}
+        cache: 'maven'
 
     - name: Build with Maven
       run: mvn -B clean package -Pproduction
@@ -53,8 +56,8 @@ jobs:
         fi
 
     - name: Upload demo files
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
-        name: demo-files
-        path: vaadin-maps-leaflet-flow-demo/target/vaadin-maps-leaflet-flow-demo.war
+        name: demo-files-java-${{ matrix.java }}
+        path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.war
         if-no-files-found: error

.github/workflows/release.yml

@@ -4,20 +4,24 @@ on:
   push:
     branches: [ master ]
 
+env:
+  PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
+  DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
+
 jobs:
   check_code: # Validates the code (see develop.yml)
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
+    - name: Set up JDK
+      uses: actions/setup-java@v3
       with:
-        java-version: '8'
-        distribution: 'adopt'
+        java-version: '11'
+        distribution: 'temurin'
 
     - name: Cache local Maven repository
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -51,7 +55,7 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Configure Git
       run: |
@@ -63,17 +67,19 @@ jobs:
 
     - name: Un-SNAP demo
       run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
-      working-directory: vaadin-maps-leaflet-flow-demo
+      working-directory: ${{ env.DEMO_MAVEN_MODULE }}
 
     - name: Un-SNAP 
       run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
-      working-directory: vaadin-maps-leaflet-flow
+      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Get version
       id: version
       run: |
-       echo "::set-output name=release::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
-      working-directory: vaadin-maps-leaflet-flow
+        version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+        echo "::set-output name=release::$version"
+        echo "::set-output name=releasenumber::${version//[!0-9]/}"
+      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Commit and Push
       run: |
@@ -93,12 +99,15 @@ jobs:
         release_name: v${{ steps.version.outputs.release }}
         commitish: master
         body: |
+          ## [Changelog](https://github.com/xdev-software/${{ env.PRIMARY_MAVEN_MODULE }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }})
+          See [Changelog#v${{ steps.version.outputs.release }}](https://github.com/xdev-software/${{ env.PRIMARY_MAVEN_MODULE }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }}) for more information.
+
           ## Installation
           Add the following lines to your pom:
           ```XML
           <dependency>
              <groupId>com.xdev-software</groupId>
-             <artifactId>vaadin-maps-leaflet-flow</artifactId>
+             <artifactId>${{ env.PRIMARY_MAVEN_MODULE }}</artifactId>
              <version>${{ steps.version.outputs.release }}</version>
           </dependency>
           ```
@@ -109,19 +118,19 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Init Git and pull
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "GitHub Actions"
         git pull
     
-    - name: Set up JDK 8 Apache Maven Central
-      uses: actions/setup-java@v2
+    - name: Set up JDK Apache Maven Central
+      uses: actions/setup-java@v3
       with: # running setup-java again overwrites the settings.xml
-        java-version: '8'
-        distribution: 'adopt'
+        java-version: '11'
+        distribution: 'temurin'
         server-id: ossrh
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN
@@ -134,59 +143,59 @@ jobs:
         MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-      working-directory: vaadin-maps-leaflet-flow
+      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
   build_directory: # Build a ZIP that can be uploaded to Vaadin Directory
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Init Git and pull
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "GitHub Actions"
         git pull
     
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
+    - name: Set up JDK
+      uses: actions/setup-java@v3
       with:
-        java-version: '8'
-        distribution: 'adopt'
+        java-version: '11'
+        distribution: 'temurin'
 
     - name: Build for Vaadin Directory
       run: mvn -B install -Pdirectory
-      working-directory: vaadin-maps-leaflet-flow
+      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Upload asset
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: vaadin-directory-files
-        path: vaadin-maps-leaflet-flow/target/vaadin-maps-leaflet-flow-*.zip
+        path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-*.zip
         if-no-files-found: error
 
     - name: Get version
       id: version
       run: |
        echo "::set-output name=release::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
-      working-directory: vaadin-maps-leaflet-flow
+      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Upload Release Asset
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ needs.prepare_release.outputs.upload_url }}
-        asset_path: vaadin-maps-leaflet-flow/target/vaadin-maps-leaflet-flow-${{ steps.version.outputs.release }}.zip
-        asset_name: vaadin-maps-leaflet-flow-${{ steps.version.outputs.release }}.zip
+        asset_path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-${{ steps.version.outputs.release }}.zip
+        asset_name: ${{ env.PRIMARY_MAVEN_MODULE }}-${{ steps.version.outputs.release }}.zip
         asset_content_type: application/zip
 
   publish-pages:
     name: Publish dependencies and licenses to github pages
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Init Git and pull
       run: |
@@ -195,34 +204,27 @@ jobs:
         git pull
 
     - name: Setup - Java
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-
-    - name: Restore - Maven Cache
-      uses: actions/cache@v1
+      uses: actions/setup-java@v3
       with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-:  
+        java-version: '11'
+        distribution: 'temurin'
+        cache: 'maven'
 
     - name: Build dependencies/licenses files
       run: mvn -B project-info-reports:dependencies
-      working-directory: vaadin-maps-leaflet-flow
+      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Upload licenses - Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: dependencies-licenses
-        path: vaadin-maps-leaflet-flow/target/site
+        path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site
 
     - name: Generate docs/dependencies dir
       run: mkdir -p docs/dependencies
 
     - name: Move built files into docs/dependencies
-      run: mv vaadin-maps-leaflet-flow/target/site/* docs/dependencies
+      run: mv ${{ env.PRIMARY_MAVEN_MODULE }}/target/site/* docs/dependencies
 
     - name: Rename dependencies.html to index.html
       working-directory: docs/dependencies
@@ -247,7 +249,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [publish_central, build_directory]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Init Git and pull
       run: |
@@ -260,11 +262,11 @@ jobs:
 
     - name: Inc Version and SNAP demo
       run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
-      working-directory: vaadin-maps-leaflet-flow-demo
+      working-directory: ${{ env.DEMO_MAVEN_MODULE }}
 
     - name: Inc Version and SNAP 
       run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
-      working-directory: vaadin-maps-leaflet-flow
+      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Git Commit and Push
       run: |

.github/workflows/test-deploy.yml

@@ -0,0 +1,32 @@
+name: Test Deployment
+
+on:
+  workflow_dispatch:
+
+env:
+  PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
+
+jobs:
+  publish_central: # Publish the code to central
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Set up JDK OSSRH
+      uses: actions/setup-java@v3
+      with: # running setup-java again overwrites the settings.xml
+        distribution: 'temurin'
+        java-version: '11'
+        server-id: ossrh
+        server-username: MAVEN_CENTRAL_USERNAME
+        server-password: MAVEN_CENTRAL_TOKEN
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE
+        gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+
+    - name: Publish to OSSRH
+      run: mvn -B deploy -Possrh
+      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
+      env:
+        MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+        MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+        MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}