Merge pull request #77 from xdev-software/develop

6.0.2

Author: AB-xdev

.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

.github/workflows/checkBuild.yml

@@ -17,29 +17,29 @@ jobs:
 
     strategy:
       matrix:
-        java: [8, 11, 17] 
+        java: [8, 11, 17]
         java-package: [jdk]
         distribution: [temurin]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: ${{ matrix.distribution }}
         java-version: ${{ matrix.java }}
         java-package: ${{ matrix.java-package }}
         cache: 'maven'
-        server-id: xdevjfrog
-        server-username: JFROG_ARTIFACTORY_USERNAME # env variable name for username of Artifactory server
-        server-password: JFROG_ARTIFACTORY_TOKEN # env variable name for Artifactory access token
+        server-id: proprietary-xdev-dependencies
+        server-username: GH_PACKAGES_READ_USERNAME # env variable name for username of Artifactory server
+        server-password: GH_PACKAGES_READ_TOKEN # env variable name for Artifactory access token
 
     - name: Build with Maven
       run: mvn -B clean verify
       env:
-        JFROG_ARTIFACTORY_USERNAME: ${{ secrets.JFROG_ARTIFACTORY_USERNAME }}
-        JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
+        GH_PACKAGES_READ_USERNAME: ${{ secrets.GH_PACKAGES_READ_USERNAME }}
+        GH_PACKAGES_READ_TOKEN: ${{ secrets.GH_PACKAGES_READ_TOKEN }}
 
     - name: Check for uncommited changes
       run: |
@@ -59,7 +59,8 @@ jobs:
           exit 1
         fi
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: jars-java-${{ matrix.java }}
         path: target/*.jar
+        if-no-files-found: error

.github/workflows/maven/m2-settings-release.xml

@@ -12,9 +12,9 @@
       <passphrase>${env.MAVEN_GPG_PASSPHRASE}</passphrase>
     </server>
     <server>
-      <id>xdevjfrog</id>
-      <username>${env.JFROG_ARTIFACTORY_USERNAME}</username>
-      <password>${env.JFROG_ARTIFACTORY_TOKEN}</password>
+      <id>proprietary-xdev-dependencies</id>
+      <username>${env.GH_PACKAGES_READ_USERNAME}</username>
+      <password>${env.GH_PACKAGES_READ_TOKEN}</password>
     </server>
   </servers>
-</settings>
+</settings>

.github/workflows/release.yml

@@ -4,27 +4,31 @@ on:
   push:
     branches: [ master ]
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
-  check_code: # Validates the code (see develop.yml)
+  check_code: # Validates the code (see checkBuild.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:
         distribution: 'temurin'
         java-version: '8'
         cache: 'maven'
-        server-id: xdevjfrog
-        server-username: JFROG_ARTIFACTORY_USERNAME # env variable name for username of Artifactory server
-        server-password: JFROG_ARTIFACTORY_TOKEN # env variable name for Artifactory access token
+        server-id: proprietary-xdev-dependencies
+        server-username: GH_PACKAGES_READ_USERNAME # env variable name for username of Artifactory server
+        server-password: GH_PACKAGES_READ_TOKEN # env variable name for Artifactory access token
 
     - name: Build with Maven
       run: mvn -B clean verify
       env:
-        JFROG_ARTIFACTORY_USERNAME: ${{ secrets.JFROG_ARTIFACTORY_USERNAME }}
-        JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
+        GH_PACKAGES_READ_USERNAME: ${{ secrets.GH_PACKAGES_READ_USERNAME }}
+        GH_PACKAGES_READ_TOKEN: ${{ secrets.GH_PACKAGES_READ_TOKEN }}
 
     - name: Check for uncommited changes
       run: |
@@ -50,7 +54,7 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_draft.outputs.upload_url }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Configure Git
       run: |
@@ -63,7 +67,9 @@ jobs:
     - name: Get version
       id: version
       run: |
-       echo "::set-output name=release::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
+        version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+        echo "release=$version" >> $GITHUB_OUTPUT
+        echo "releasenumber=${version//[!0-9]/}" >> $GITHUB_OUTPUT
   
     - name: Commit and Push
       run: |
@@ -75,40 +81,38 @@ 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 }}
         commitish: master
         body: |
-          ## Installation [![Maven Central](https://img.shields.io/maven-central/v/com.xdev-software/csapi?versionPrefix=${{ steps.version.outputs.release }})](https://mvnrepository.com/artifact/com.xdev-software/csapi)
+          ## [Changelog](https://github.com/xdev-software/${{ github.event.repository.name }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }})
+          See [Changelog#v${{ steps.version.outputs.release }}](https://github.com/xdev-software/${{ github.event.repository.name }}/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>csapi</artifactId>
+             <artifactId>${{ github.event.repository.name }}</artifactId>
              <version>${{ steps.version.outputs.release }}</version>
           </dependency>
           ```
-        draft: false
-        prerelease: false
 
   publish_central: # Publish the code to central
     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 "actions@github.com"
         git config --global user.name "GitHub Actions"
         git pull
     
-    - name: Set up JDK 8 OSSRH
-      uses: actions/setup-java@v2
+    - name: Set up JDK OSSRH
+      uses: actions/setup-java@v3
       with: # running setup-java again overwrites the settings.xml
         distribution: 'temurin'
         java-version: '8'
@@ -120,7 +124,7 @@ jobs:
         # Due to https://github.com/actions/setup-java/issues/85 we can only 
         # add ONE server using setup-java...
         overwrite-settings: false
-    
+
       # ... so let's simply copy a predefined settings.xml file into the m2 folder
       # until GH makes it work
     - name: Copy predefined settings into home m2 folder
@@ -131,8 +135,8 @@ jobs:
     - name: Publish to OSSRH
       run: mvn -B deploy -Pxdev-build,ossrh
       env:
-        JFROG_ARTIFACTORY_USERNAME: ${{ secrets.JFROG_ARTIFACTORY_USERNAME }}
-        JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
+        GH_PACKAGES_READ_USERNAME: ${{ secrets.GH_PACKAGES_READ_USERNAME }}
+        GH_PACKAGES_READ_TOKEN: ${{ secrets.GH_PACKAGES_READ_TOKEN }}
         MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
@@ -142,31 +146,31 @@ 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 "actions@github.com"
         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:
         distribution: 'temurin'
         java-version: '8'
-        server-id: xdevjfrog
-        server-username: JFROG_ARTIFACTORY_USERNAME # env variable name for username of Artifactory server
-        server-password: JFROG_ARTIFACTORY_TOKEN # env variable name for Artifactory access token
+        server-id: proprietary-xdev-dependencies
+        server-username: GH_PACKAGES_READ_USERNAME # env variable name for username of Artifactory server
+        server-password: GH_PACKAGES_READ_TOKEN # env variable name for Artifactory access token
 
     - name: Build dependencies/licenses files
       run: mvn -B project-info-reports:dependencies
       env:
-        JFROG_ARTIFACTORY_USERNAME: ${{ secrets.JFROG_ARTIFACTORY_USERNAME }}
-        JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
+        GH_PACKAGES_READ_USERNAME: ${{ secrets.GH_PACKAGES_READ_USERNAME }}
+        GH_PACKAGES_READ_TOKEN: ${{ secrets.GH_PACKAGES_READ_TOKEN }}
 
     - name: Upload licenses - Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: dependencies-licenses
         path: target/site
@@ -200,7 +204,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [publish_central]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Init Git and pull
       run: |
@@ -220,7 +224,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/test-deploy.yml

@@ -7,10 +7,10 @@ jobs:
   publish_central: # Publish the code to central
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - name: Set up JDK 8 OSSRH
-      uses: actions/setup-java@v2
+    - name: Set up JDK OSSRH
+      uses: actions/setup-java@v3
       with: # running setup-java again overwrites the settings.xml
         distribution: 'temurin'
         java-version: '8'
@@ -22,7 +22,7 @@ jobs:
         # Due to https://github.com/actions/setup-java/issues/85 we can only 
         # add ONE server using setup-java...
         overwrite-settings: false
-    
+
       # ... so let's simply copy a predefined settings.xml file into the m2 folder
       # until GH makes it work
     - name: Copy predefined settings into home m2 folder
@@ -33,8 +33,8 @@ jobs:
     - name: Publish to OSSRH
       run: mvn -B deploy -Pxdev-build,ossrh
       env:
-        JFROG_ARTIFACTORY_USERNAME: ${{ secrets.JFROG_ARTIFACTORY_USERNAME }}
-        JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
+        GH_PACKAGES_READ_USERNAME: ${{ secrets.GH_PACKAGES_READ_USERNAME }}
+        GH_PACKAGES_READ_TOKEN: ${{ secrets.GH_PACKAGES_READ_TOKEN }}
         MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

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

@@ -0,0 +1,92 @@
+name: Update from Template
+
+# This workflow keeps the repo up to date with changes from the template repo (REMOTE_URL)
+# It duplicates the REMOTE_BRANCH (into UPDATE_BRANCH) and tries to merge it into the 
+# this repos default branch (which is checked out here)
+# Note that this requires a PAT (Personal Access Token) - at best from a servicing account
+# Also note that you should have at least once merged the template repo into the current repo manually
+# otherwise a "refusing to merge unrelated histories" error might occur.
+
+on:
+  schedule:
+    - cron: '55 2 * * 1'
+  workflow_dispatch:
+
+env:
+  UPDATE_BRANCH: update-from-template
+  REMOTE_URL: https://github.com/xdev-software/xdev-swing-framework-template.git
+  REMOTE_BRANCH: master
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          # Required because otherwise there are always changes detected when executing diff/rev-list
+          fetch-depth: 0
+          # If no PAT is used the following error occurs on a push:
+          # refusing to allow a GitHub App to create or update workflow `.github/workflows/xxx.yml` without `workflows` permission
+          token: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }}
+      
+      - name: Init Git
+        run: |
+          git config --global user.email "actions@github.com"
+          git config --global user.name "GitHub Actions"
+
+      - name: Main workflow
+        id: main
+        run: |
+          echo "Adding remote template-repo"
+          git remote add template ${{ env.REMOTE_URL }}
+          
+          echo "Fetching remote template repo"
+          git fetch template
+          
+          echo "Deleting local branch that will contain the updates - if present"
+          git branch -D ${{ env.UPDATE_BRANCH }} || true
+          
+          echo "Checking if the remote template repo has new commits"
+          git rev-list ..template/${{ env.REMOTE_BRANCH }}
+
+          if [ $(git rev-list --count ..template/${{ env.REMOTE_BRANCH }}) -eq 0 ]; then
+            echo "There are no commits new commits on the template repo"
+            
+            echo "Deleting origin branch that contains the updates - if present"
+            git push -f origin --delete ${{ env.UPDATE_BRANCH }} || true
+            
+            echo "abort=1" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          
+          echo "Found new commits on the template repo"
+          
+          echo "Creating update branch"
+          git branch ${{ env.UPDATE_BRANCH }} template/${{ env.REMOTE_BRANCH }}
+          git branch --unset-upstream ${{ env.UPDATE_BRANCH }}
+          
+          echo "Pushing update branch"
+          git push -f -u origin ${{ env.UPDATE_BRANCH }}
+          
+          echo "Getting current branch"
+          current_branch=$(git branch --show-current)
+          echo "Current branch is $current_branch"
+          echo "current_branch=$current_branch" >> $GITHUB_OUTPUT
+
+          echo "abort=0" >> $GITHUB_OUTPUT
+          
+      - name: pull-request
+        uses: repo-sync/pull-request@v2
+        if: steps.main.outputs.abort == 0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          source_branch: ${{ env.UPDATE_BRANCH }}
+          destination_branch: ${{ steps.main.outputs.current_branch }}
+          pr_title: "Update from template"
+          pr_body: "An automated PR to sync changes from the template into this repo"
+