Merge pull request #12 from xdev-software/develop

v1.0.0

Author: JohannesRabauer

.github/dependabot.yml

@@ -21,6 +21,6 @@ updates:
     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"
+  - dependency-name: "org.springframework.boot:*"
+    # Version 3+ requires Vaadin 24
+    versions: ">=3.0.0"

.github/workflows/checkBuild.yml

@@ -59,5 +59,5 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: demo-files-java-${{ matrix.java }}
-        path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.war
+        path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
         if-no-files-found: error

.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

.gitignore

@@ -109,3 +109,5 @@ ObjectStore/
 .idea/codeStyles/*
 !.idea/codeStyles/codeStyleConfig.xml
 !.idea/codeStyles/Project.xml
+
+.run/*

.idea/codeStyles/Project.xml

@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run Demo" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="software.xdev.vaadin.Application" />
+    <module name="vaadin-editable-label-demo" />
+    <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="software.xdev.vaadin.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/Run Demo.run.xml

@@ -0,0 +1,2 @@
+# 1.0.0 
+Initial release