Merge branch 'release/1.2.0'

Author: PenghaiZhang

.github/workflows/ci.yaml

@@ -18,10 +18,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Gradle Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -31,7 +31,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: adopt
           java-version: 8
@@ -40,13 +40,13 @@ jobs:
         run: ./gradlew build
 
       - name: Save artefacts
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.1.1
         with:
           name: Artefacts
           path: build/distributions
 
       - name: Save Coverage Report
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.1.1
         with:
           name: CoverageReport
           path: build/reports/tests/test

README.md

@@ -53,11 +53,11 @@ unable to find valid certification path to requested target
 
 This is because the Java Keystore used by the admin console package does not recognize the Root CA certificate used to sign openEQUELLA's SSL certificate.
 
-The admin-console-package uses its own copy of the JRE, in the `jdk8u242-b08-jre` folder. 
-The keystore we need to update is within this folder, at the path `jdk8u242-b08-jre/lib/security/cacerts`.
+The admin-console-package uses its own copy of the JRE, in the `jdk-11.0.18+10-jre` folder. 
+The keystore we need to update is within this folder, at the path `jdk-11.0.18+10-jre/lib/security/cacerts`.
 
 The bundled JRE comes with a command line tool which you can use for updating these keystores, called `keytool`. 
-This should work in Mac, Linux and Windows. It is stored in `jdk8u242-b08-jre/bin`.
+This should work in Mac, Linux and Windows. It is stored in `jdk-11.0.18+10-jre/bin`.
 
 **NOTE:**
 
@@ -72,7 +72,7 @@ You will need a copy of the Root CA certificate used to sign your SSL certificat
 in which case you should use whatever it was set to.
 
 ```
-keytool -import -trustcacerts -keystore path/to/adminconsolepackage/jdk8u242-b08-jre/lib/security/cacerts -storepass changeit -alias giveYourCertANameHere -file path/to/rootCA.pem
+keytool -import -trustcacerts -keystore path/to/adminconsolepackage/jdk-11.0.18+10-jre/lib/security/cacerts -storepass changeit -alias giveYourCertANameHere -file path/to/rootCA.pem
 ```
 
 The command will display the certificate and prompt the user to `Trust this certificate? [no]:`. Type `yes` and hit Enter.

build.gradle

@@ -2,36 +2,31 @@ plugins {
     id 'java'
     id 'application'
     id 'base'
-    id 'nebula.lint' version '16.26.0'
-    id 'com.github.hierynomus.license' version '0.15.0'
+    id 'com.github.hierynomus.license' version '0.16.1'
 }
 
 apply plugin: 'java'
 apply plugin: 'base'
-apply plugin: 'nebula.lint'
 apply plugin: 'com.github.hierynomus.license'
 apply plugin: "application"
 
 repositories {
     mavenLocal()
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
-    implementation 'org.slf4j:slf4j-api:1.7.31'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.3'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.0'
     implementation 'org.jasypt:jasypt:1.9.3'
-    runtimeOnly 'org.slf4j:slf4j-simple:1.7.31'
+    runtimeOnly 'org.slf4j:slf4j-simple:1.7.36'
     testImplementation "junit:junit:$junitVersion"
 }
 
 group = 'org.apereo.openequella.adminconsole'
 version = System.getenv("TRAVIS_TAG") ?: artifactVersion
 mainClassName = 'org.apereo.openequella.adminconsole.launcher.ClientLauncher'
 
-// Gradlelint is broken: https://github.com/nebula-plugins/gradle-lint-plugin/issues/203
-gradleLint.rules = [/*'all-dependency', */'dependency-parentheses', 'duplicate-dependency-class']
-
 license {
     strictCheck
     header = file('LICENSE')
@@ -59,20 +54,20 @@ final launcherScripts = [
 class JreProperties {
     String hash
     String fileName
-    String getDownloadUrl() {"https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/${fileName}"}
+    String getDownloadUrl() {"https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18%2B10/${fileName}"}
     File getJre() {new File("build/jre-downloads/${fileName}")}
 }
 
 final jreProperties = [
     windows: new JreProperties(
-            hash: 'b00c361e6ce022c6dc63b7c747cfdd9d28c17943e50bc1855adf36854ce46898',
-            fileName: 'OpenJDK8U-jre_x64_windows_hotspot_8u242b08.zip'),
+            hash: 'dea0fe7fd5fc52cf5e1d3db08846b6a26238cfcc36d5527d1da6e3cb059071b3',
+            fileName: 'OpenJDK11U-jre_x64_windows_hotspot_11.0.18_10.zip'),
     linux: new JreProperties(
-            hash: '5edfaefdbb0469d8b24d61c8aef80c076611053b1738029c0232b9a632fe2708',
-            fileName: 'OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz'),
+            hash: '0e7b196ef8603ac3d38caaf7768b7b0a3c613d60e15a6511bcfb2c894b609e99',
+            fileName: 'OpenJDK11U-jre_x64_linux_hotspot_11.0.18_10.tar.gz'),
     mac: new JreProperties(
-            hash: 'fae3777e3441dc7384c339a9054aa7efc40cd2c501625a535c2d4648367ccca3',
-            fileName: 'OpenJDK8U-jre_x64_mac_hotspot_8u242b08.tar.gz')
+            hash: '7c73b1a731fc840f2ecb5633906d687bfee4346a8191d3cb1c4370168b16351f',
+            fileName: 'OpenJDK11U-jre_x64_mac_hotspot_11.0.18_10.tar.gz')
 ]
 
 task copyDependencies(type: Copy, description: 'Copy dependencies to /build/libs') {
@@ -135,16 +130,9 @@ task unzipJre(description: 'Unzip a JRE when the extract directory is missing',
             !new File(jreExtractDir(sys)).exists()
         }.each {String sys, JreProperties props ->
             println "Unzip JRE for ${sys}"
-            if (props.jre.name.endsWith('zip')) {
-                copy {
-                    from zipTree(props.jre)
-                    into file(jreExtractDir(sys))
-                }
-            } else {
-                copy {
-                    from tarTree(resources.gzip(props.jre))
-                    into file(jreExtractDir(sys))
-                }
+            copy {
+                from props.jre.name.endsWith('zip') ? zipTree(props.jre) : tarTree(resources.gzip(props.jre))
+                into file(jreExtractDir(sys))
             }
         }
     }
@@ -160,7 +148,7 @@ distributions {
     launcherScripts.each { String sys, String scriptFileName ->
         String scriptFileDir = "${projectDir}/launcher-scripts/${scriptFileName}"
         "${sys}Packages" {
-            baseName = "admin-console-package-for-${sys}"
+            distributionBaseName = "admin-console-package-for-${sys}"
             contents {
                 from("${buildDir}") {
                     include "libs/*"

gradle.properties

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

gradle/wrapper/gradle-wrapper.jar

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