Merge pull request #114 from openequella/release/1.2.1

Release 1.2.1

Author: edalex-ian

.github/workflows/ci.yaml

@@ -1,4 +1,4 @@
-name: openEQUELLA Admin Console Launcer CI
+name: openEQUELLA Admin Console Launcher CI
 
 on:
   push:
@@ -30,23 +30,27 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: adopt
-          java-version: 8
+          distribution: temurin
+          java-version: 11
 
       - name: Build with Gradle
         run: ./gradlew build
 
+      - name: Generate artefact hashes
+        run: ../../generate-hashes.sh *
+        working-directory: build/distributions
+
       - name: Save artefacts
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           name: Artefacts
           path: build/distributions
 
       - name: Save Coverage Report
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           name: CoverageReport
           path: build/reports/tests/test
@@ -57,5 +61,4 @@ jobs:
         with:
           files: build/distributions/*
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.idea/misc.xml

@@ -16,10 +16,10 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.0'
+    implementation 'org.slf4j:slf4j-api:2.0.7'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
     implementation 'org.jasypt:jasypt:1.9.3'
-    runtimeOnly 'org.slf4j:slf4j-simple:1.7.36'
+    runtimeOnly 'org.slf4j:slf4j-simple:2.0.7'
     testImplementation "junit:junit:$junitVersion"
 }
 

build.gradle

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+# This script generates the hash files for specified files. These can be generated as part of the
+# build process to provide later validation of artefact integrity.
+#
+# To validate with the output files from this you simply run:
+#   sha256sum -c <hashfile>
+
+# Enable globstar and nullglob options, so as to support filename globs - e.g. artefacts*.zip
+shopt -s globstar nullglob
+
+if [ $# -lt 1 ]; then
+  echo "Usage: $0 <file...>"
+  echo "Where:"
+  echo "  <file> is the name of the file(s) to generate a hash for."
+  exit 1
+fi
+
+# Loop over arguments, each one being the name of a file to hash
+for file in "$@"; do
+  # double loop to support globbing
+  for filename in "$file"; do
+    echo "Processing: $filename"
+    hash_contents=$(sha256sum "$filename")
+    hash_result=$?
+
+    if [ $hash_result -ne 0 ]; then
+        echo "Failed to hash [${filename}], exiting."
+        exit $hash_result
+    fi
+
+    echo $hash_contents > "${filename}.sha256"
+  done
+done

generate-hashes.sh

@@ -1,2 +1,2 @@
 junitVersion=4.13.2
-artifactVersion=1.2.0
+artifactVersion=1.2.1

gradle.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradle/wrapper/gradle-wrapper.properties

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%