From d0bceb5f4b3be660280f62c95813c183e06c27c3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2019 09:51:46 +1000 Subject: [PATCH 01/11] Update dependency gradle to v5.5.0 PR #19 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3114113..14700ea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Mon May 13 17:09:22 AEST 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 5ed4705af31d72057e64c1bbf319c4a8d25c8617 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 10 Jul 2019 20:57:59 +0000 Subject: [PATCH 02/11] Update dependency gradle to v5.5.1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 14700ea..17b2183 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Mon May 13 17:09:22 AEST 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From a1c16ccc60bbdeb50a1046475713650a1a54cf53 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 14 Aug 2019 21:36:02 +0000 Subject: [PATCH 03/11] Update dependency gradle to v5.6.0 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17b2183..4550030 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Mon May 13 17:09:22 AEST 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 5ee7c777ea015f1ac72ceaba71219f44ba60474a Mon Sep 17 00:00:00 2001 From: PenghaiZhang <47203811+PenghaiZhang@users.noreply.github.com> Date: Thu, 14 Nov 2019 09:07:16 +1100 Subject: [PATCH 04/11] Support running the launcher from different directories (#27) Also fix the issue of failing to launch from directories containing spaces. --- launcher-scripts/Linux-launcher.sh | 7 ++++--- launcher-scripts/Mac-launcher.sh | 5 +++-- launcher-scripts/Windows-launcher.bat | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/launcher-scripts/Linux-launcher.sh b/launcher-scripts/Linux-launcher.sh index bcf1969..d6090a4 100755 --- a/launcher-scripts/Linux-launcher.sh +++ b/launcher-scripts/Linux-launcher.sh @@ -1,5 +1,6 @@ #!/bin/bash OLD_JAVA_HOME=$JAVA_HOME -export JAVA_HOME=`pwd`/jdk8u212-b03-jre -"$JAVA_HOME/bin/java" -DLAUNCHER_JAVA_PATH="$JAVA_HOME/bin/java" -jar ./libs/admin.jar -export JAVA_HOME=$OLD_JAVA_HOME +SCRIPT_DIRECTORY=`readlink -f "$(dirname "$0")"` +export JAVA_HOME=$SCRIPT_DIRECTORY/jdk8u212-b03-jre +"$JAVA_HOME/bin/java" -DLAUNCHER_JAVA_PATH="$JAVA_HOME/bin/java" -jar "$SCRIPT_DIRECTORY/libs/admin.jar" +export JAVA_HOME=$OLD_JAVA_HOME \ No newline at end of file diff --git a/launcher-scripts/Mac-launcher.sh b/launcher-scripts/Mac-launcher.sh index f4b45e5..188e99a 100755 --- a/launcher-scripts/Mac-launcher.sh +++ b/launcher-scripts/Mac-launcher.sh @@ -1,5 +1,6 @@ #!/bin/bash OLD_JAVA_HOME=$JAVA_HOME -export JAVA_HOME=`pwd`/jdk8u212-b03-jre/Contents/Home -"$JAVA_HOME/bin/java" -DLAUNCHER_JAVA_PATH="$JAVA_HOME/bin/java" -jar ./libs/admin.jar +SCRIPT_DIRECTORY=`readlink -f "$(dirname "$0")"` +export JAVA_HOME=$SCRIPT_DIRECTORY/jdk8u212-b03-jre/Contents/Home +"$JAVA_HOME/bin/java" -DLAUNCHER_JAVA_PATH="$JAVA_HOME/bin/java" -jar "$SCRIPT_DIRECTORY/libs/admin.jar" export JAVA_HOME=$OLD_JAVA_HOME diff --git a/launcher-scripts/Windows-launcher.bat b/launcher-scripts/Windows-launcher.bat index a7d6f1a..c23546d 100755 --- a/launcher-scripts/Windows-launcher.bat +++ b/launcher-scripts/Windows-launcher.bat @@ -1,6 +1,6 @@ @echo off set OLD_JAVA_HOME=%JAVA_HOME% set JAVA_HOME=%cd%\jdk8u212-b03-jre -start "Admin console launcher" /D "%cd%\libs" %JAVA_HOME%\bin\javaw -DLAUNCHER_JAVA_PATH="%JAVA_HOME%\bin\java" -jar admin.jar +start "Admin console launcher" /D "%cd%\libs" "%JAVA_HOME%\bin\javaw" -DLAUNCHER_JAVA_PATH="%JAVA_HOME%\bin\java" -jar admin.jar set JAVA_HOME=%OLD_JAVA_HOME% set OLD_JAVA_HOME= \ No newline at end of file From e277ff3ac7ac9549ef040373a3787c2476dea115 Mon Sep 17 00:00:00 2001 From: PenghaiZhang <47203811+PenghaiZhang@users.noreply.github.com> Date: Mon, 18 Nov 2019 11:36:24 +1100 Subject: [PATCH 05/11] Publish build results to Github Release via Travis (#29) --- .travis.yml | 18 ++++++++++++------ build.gradle | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 868f183..dd5d0d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,14 +14,20 @@ install: true script: - ./gradlew build -after_success: - - aws s3 --region us-east-1 cp --recursive build/distributions s3://oeq-admin-console-package/`printf %04d $TRAVIS_BUILD_NUMBER`/ before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ -env: - global: - - secure: aY/WM0UPndWHcsHMT6M658Q1bBWYQ635brtMavLZnGRn0FCiB94rUgOo6vn+y3H7BBPBBRk2z0UMaA/VXBV/EcVxrfZx8q9BZg7/jUrlzA/FC01LA1nFCHH4+PGl9GvEd4D6hRMp9UYBbb3sLTucSwtiXIT7mNNC910uRWI+wG/ceIqNz1v4peqhEbDepwN5/7sYqHk9SlWYw9lPwmp3nok0o8Crhv1OTzgeLitWnwXKf4wnzpdcCHI7WJHYtcA0nV09DNJmkJcUdseTT86qztBti5inGXE6/eDV5jj5JXGSHCHiLxG0/a6ZDnDQd3OL8dcqxjzL0JHG9uDROlsgPBy+8SB4nhZj3CdTMfYQr09l4+oN0WmSHIm/CaNGR4hEG7hr5EuHzttFChg84F9i9sJOaVHA6NLjkJYBvydr3Sajn4bRVyZusldwoWsAlo9wJScRdYsepcVo7NQdROfRWEwJiJk1H3uOb0xvBSbpg92v0puskdOHqiv8jT1HNaHpBjFrxtTLv13JA3brKWQUEbVZoR3oa1iZxNEIC5J4x7EVzXJzuwup0TAH7Z03oYC8FPksWyjsCF5mUFrPmg6U/dl+V+SeD/OTThZzngVcHm9L+lB3S1boO+hdvmD08+PkM0ZvCcyAMWss4eJ8Rdy5f1q327IE43FXbC3P231oWIA= - - secure: G2sEQTeSn74fP4jjInA+IidpXNitfRNxR7qFuU49dvtbFOuqnKsDvwCGakpStRRChcu9SQSh+N2U0x/1KNmYOxKReqVTwd4UksNzcdVvvMmxDMqtQCpJuT7TWIgtTpgd52PySAcZSqs4ZKYFZRlydOWgZ3rWOrdAHTXkZXOieF0PHNwkc43f7JaDPml8fZThKDLIc0dfRfigSiHjk4K2AKyLP9h5DK6G0irlSP8QaE0TnNt+it+R5qEA5Thx1dWg0J6qiMLUhHqBwiiHeV7riGDe/PkhuSGe5jnKWDwHu/MimSWsdlvYsMw/S1zOsif3erokBxzcmFAW/JAJLcisJqTMYp+JkyykKljmsdVdw9DUSsJX9ldjmYIK4flCU6o17BxFxRvhWdVPYrniyxsB6WbMi5pPxBUGA769qAFORZuuc4wHyjphhbOLvDqqHDcQS9kRZXzzjba/G3sTCZcEeaqK1ZBkVbMXS8a5Ia2n0UlZxtCQTycivzQa4LJmSVrCKwnOFYPGKKuBYcWsSC8w52hi6UTlL8OFAMOq4dIXAPrN6YFS9RuoH883sH0xJ6mi/qID48DlQPzH9NEHv//Z3m+X/uMdL4Fe+7o6FPbzE2yRlXmJdoOG2BTV5CmK7A/bNiIaetNPYlMtzQTCvsvJ3vZ/qD4KEn+Z3ZKfO5RpZsw= +deploy: + provider: releases + api_key: + secure: qNeNM5lLhByeDVJ3FKihyfSQv8/sUOCYRYSATOHtUi8DJLnDmi1TU//N911LQjIzncJZCNYef+HoSTWXxdIDP5BvkAbZ1izoRDaPFAr/sqdXb47hzvMxscVCwqZ+jaTDGB72MbS48dnXHYM0pT3+8Pnu3+BsiXkgBR+HW0MpyBzeV9TzQmiB4yc7IfmwZmxVZeNnM8SGztzOjHsi+D973sO7QZ1tIAahQ48QdJ2GFCLIGhIMVd/F3yfg22VlyZL6uu7+AHejpN2jXLAZEcAAHrIwGMCiC9pvuEXBf7LGl+WGOwEpncqNNRT9yACVrROO06lQQisJG3JBxuvPIN2+JShSEBbmHnM3FyZV4VBe8l5IzPN6oXCFQhSxK5fJWDnfs1O/iZANbxlqMzk7mHD0BPIkhEGCotNDS+WkIz64wyTh+oNzGlADlM5cQY1+/lCdJfH4Gp8M/ga4/t0c4sWBnPUtj5Kjxy3CIj7P5kKXoL5uKfzLddvZGdJE1GBrUJG07k0bLsIjjw04m15kS0r7/28qIrk+g8y6zJ7AeNMpCZ0PyG5F77zXx/5Ut4ayxqnbFG5Tc7LtgRie4pKF92uFN4rIWfmty1illSDbXjI7tNlVE9/zyl9d7aQ93jWfVTdMz5YZSY0kE1n9EQBtfRstENOKcAbVakj1TJ4TFq+kczw= + file_glob: true + file: build/distributions/* + skip_cleanup: true + on: + tags: true + all_branches: true + condition: $TRAVIS_BRANCH =~ ^(master|release)$ + diff --git a/build.gradle b/build.gradle index bec80d3..e78dfc8 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ dependencies { } group = 'org.apereo.openequella.adminconsole' -version = artifactVersion +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 From 48ff4db359c49885adf3617d5b61cbf52983d6d5 Mon Sep 17 00:00:00 2001 From: Penghai Date: Mon, 2 Dec 2019 15:02:48 +1100 Subject: [PATCH 06/11] Merge branch 'release/1.0.1' --- .travis.yml | 9 +++------ gradle.properties | 2 +- launcher-scripts/Windows-launcher.bat | 5 +++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd5d0d8..98bdae7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,13 +21,10 @@ before_cache: deploy: provider: releases - api_key: - secure: qNeNM5lLhByeDVJ3FKihyfSQv8/sUOCYRYSATOHtUi8DJLnDmi1TU//N911LQjIzncJZCNYef+HoSTWXxdIDP5BvkAbZ1izoRDaPFAr/sqdXb47hzvMxscVCwqZ+jaTDGB72MbS48dnXHYM0pT3+8Pnu3+BsiXkgBR+HW0MpyBzeV9TzQmiB4yc7IfmwZmxVZeNnM8SGztzOjHsi+D973sO7QZ1tIAahQ48QdJ2GFCLIGhIMVd/F3yfg22VlyZL6uu7+AHejpN2jXLAZEcAAHrIwGMCiC9pvuEXBf7LGl+WGOwEpncqNNRT9yACVrROO06lQQisJG3JBxuvPIN2+JShSEBbmHnM3FyZV4VBe8l5IzPN6oXCFQhSxK5fJWDnfs1O/iZANbxlqMzk7mHD0BPIkhEGCotNDS+WkIz64wyTh+oNzGlADlM5cQY1+/lCdJfH4Gp8M/ga4/t0c4sWBnPUtj5Kjxy3CIj7P5kKXoL5uKfzLddvZGdJE1GBrUJG07k0bLsIjjw04m15kS0r7/28qIrk+g8y6zJ7AeNMpCZ0PyG5F77zXx/5Ut4ayxqnbFG5Tc7LtgRie4pKF92uFN4rIWfmty1illSDbXjI7tNlVE9/zyl9d7aQ93jWfVTdMz5YZSY0kE1n9EQBtfRstENOKcAbVakj1TJ4TFq+kczw= + api-key: + secure: TXedn0kc5TaLol+/Hl1RoOKvhucANcgUMqQw5FxE4wUJfqxbqT5fVeLVPjn9II8G1tgkB8v1zqG+wMk3e264/vhyf3IA5DBVj0UX5a4X/QfMCO2iQFBoQ+DRFBWCM1szPbfNxwbO2kzr+laX7t/fOBA+ESHPv6d6BLR1Ll0sZaX1re4hQBPT12fpdm+7rx1Peb1u/4j56dxiYMkI1qUbvYzxmS6EgBHO4LtXxNEpw9IPknUCecWCl6tRbKgg1Xsppm9/LQMn9Xc64o7GLE+BD+rBy93QnCZJUHNcUZvK+D0TXGfRxffpkYs6ZBtU9PjSv/603a6N6gmrnyi/m9NDBLpbnRtvBIzRj0CupFFdeAe6pfhEdmQ4HbJGPxdb7BOndOc+waAI6ObT+3qCg138h8mbBW12O0pQRm+0XXrTM5aVWqklMKyprPK2q3GeJt1pBrBZcQpXw6MqG9aF95uz7L2cZ9sfVM4eVGR/diLq+9bSgieR3ZEqi/R0QvrgcGe+V5CuT+O3DxzBZbpdlvxB7f3EKEv23nJFwR7d/i54rCi/GNKhIBAt3vItm6dz5tX8PyyPAfNaRos0+wrmLVxwPFWVPPmttu1zNPRvmia8rv7stG94W5/4Z43DVQYjkbLYU6vND9ZoPtqKC82NuMePKcwKKW2w3XKr2JjRmsoulMc= file_glob: true file: build/distributions/* skip_cleanup: true on: - tags: true - all_branches: true - condition: $TRAVIS_BRANCH =~ ^(master|release)$ - + tags: true \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 4a693b4..d215669 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ junitVersion=4.12 -artifactVersion=1.0.0 +artifactVersion=1.0.1 diff --git a/launcher-scripts/Windows-launcher.bat b/launcher-scripts/Windows-launcher.bat index c23546d..5eeecae 100755 --- a/launcher-scripts/Windows-launcher.bat +++ b/launcher-scripts/Windows-launcher.bat @@ -1,6 +1,7 @@ @echo off set OLD_JAVA_HOME=%JAVA_HOME% -set JAVA_HOME=%cd%\jdk8u212-b03-jre -start "Admin console launcher" /D "%cd%\libs" "%JAVA_HOME%\bin\javaw" -DLAUNCHER_JAVA_PATH="%JAVA_HOME%\bin\java" -jar admin.jar +set BAT_DIRECTORY=%~dp0 +set JAVA_HOME=%BAT_DIRECTORY%jdk8u212-b03-jre +start "Admin console launcher" /D "%BAT_DIRECTORY%\libs" "%JAVA_HOME%\bin\javaw" -DLAUNCHER_JAVA_PATH="%JAVA_HOME%\bin\java" -jar admin.jar set JAVA_HOME=%OLD_JAVA_HOME% set OLD_JAVA_HOME= \ No newline at end of file From 29cc95eeb2dfc984ee1c74057e56ae2c7bcf0410 Mon Sep 17 00:00:00 2001 From: Penghai Date: Tue, 3 Dec 2019 11:51:40 +1100 Subject: [PATCH 07/11] Ensure using the full path of provided JDK --- gradle.properties | 2 +- launcher-scripts/Mac-launcher.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5449d10..6ea2b24 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ junitVersion=4.12 -artifactVersion=1.0.2 +artifactVersion=1.0.3 diff --git a/launcher-scripts/Mac-launcher.sh b/launcher-scripts/Mac-launcher.sh index 349f28e..493274c 100755 --- a/launcher-scripts/Mac-launcher.sh +++ b/launcher-scripts/Mac-launcher.sh @@ -1,6 +1,6 @@ #!/bin/zsh OLD_JAVA_HOME=$JAVA_HOME -SCRIPT_DIRECTORY=${0:h} +SCRIPT_DIRECTORY=${0:A:h} export JAVA_HOME=$SCRIPT_DIRECTORY/jdk8u212-b03-jre/Contents/Home "$JAVA_HOME/bin/java" -DLAUNCHER_JAVA_PATH="$JAVA_HOME/bin/java" -jar "$SCRIPT_DIRECTORY/libs/admin.jar" export JAVA_HOME=$OLD_JAVA_HOME From c086438e4afb1633a03cded0c8afaa5dfcfccdd2 Mon Sep 17 00:00:00 2001 From: Chris Beach Date: Fri, 31 Jan 2020 07:50:17 -0600 Subject: [PATCH 08/11] #35 Upgrade jackson-databind to 2.10.2 and bump version to alpha (#36) * #35 Upgrade jackson-databind to 2.10.2 and bump version to alpha --- build.gradle | 2 +- gradle.properties | 2 +- .../apereo/openequella/adminconsole/service/JsonService.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index e78dfc8..fe0d8fd 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ repositories { dependencies { implementation 'org.slf4j:slf4j-api:1.7.26' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.10.2' implementation 'org.jasypt:jasypt:1.9.2' runtimeOnly 'org.slf4j:slf4j-simple:1.6.4' testImplementation "junit:junit:$junitVersion" diff --git a/gradle.properties b/gradle.properties index 6ea2b24..cf63d44 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ junitVersion=4.12 -artifactVersion=1.0.3 +artifactVersion=1.0.4-Alpha diff --git a/src/main/java/org/apereo/openequella/adminconsole/service/JsonService.java b/src/main/java/org/apereo/openequella/adminconsole/service/JsonService.java index 8218891..2934bc6 100644 --- a/src/main/java/org/apereo/openequella/adminconsole/service/JsonService.java +++ b/src/main/java/org/apereo/openequella/adminconsole/service/JsonService.java @@ -29,7 +29,7 @@ public class JsonService { private static final ObjectMapper jsonMapper = new ObjectMapper(); - + public static T readFile(File file, Class type){ try (final InputStream fis = new FileInputStream(file)) { final T obj = jsonMapper.readValue(fis, type); From e9a0950d4016a0700c017a7220d133a1b723066b Mon Sep 17 00:00:00 2001 From: Chris Beach Date: Mon, 10 Feb 2020 16:41:17 -0600 Subject: [PATCH 09/11] #37 - upgrade jdk/jre to 8u242-b08 (#38) --- build.gradle | 14 +++++++------- launcher-scripts/Linux-launcher.sh | 4 ++-- launcher-scripts/Mac-launcher.sh | 2 +- launcher-scripts/Windows-launcher.bat | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index fe0d8fd..bce88ad 100644 --- a/build.gradle +++ b/build.gradle @@ -59,20 +59,20 @@ final launcherScripts = [ class JreProperties { String hash String fileName - String getDownloadUrl() {"https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u212-b03/${fileName}"} + String getDownloadUrl() {"https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/${fileName}"} File getJre() {new File("build/jre-downloads/${fileName}")} } final jreProperties = [ windows: new JreProperties( - hash: 'c09bab89cd82483c371597c5c364094a145c1fbba43a1d3d7c3e350b89dedc89', - fileName: 'OpenJDK8U-jre_x64_windows_hotspot_8u212b03.zip'), + hash: 'b00c361e6ce022c6dc63b7c747cfdd9d28c17943e50bc1855adf36854ce46898', + fileName: 'OpenJDK8U-jre_x64_windows_hotspot_8u242b08.zip'), linux: new JreProperties( - hash: '74daf0b77a7fd679cbb3a6228e0efa8c4a90b7664aa057f211e34bbfb38640fb', - fileName: 'OpenJDK8U-jre_x64_linux_hotspot_8u212b03.tar.gz'), + hash: '5edfaefdbb0469d8b24d61c8aef80c076611053b1738029c0232b9a632fe2708', + fileName: 'OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz'), mac: new JreProperties( - hash: '80855320c42a3b06617c6e466c64df67731542a805972185b075ca6cb1222c7f', - fileName: 'OpenJDK8U-jre_x64_mac_hotspot_8u212b03.tar.gz') + hash: 'fae3777e3441dc7384c339a9054aa7efc40cd2c501625a535c2d4648367ccca3', + fileName: 'OpenJDK8U-jre_x64_mac_hotspot_8u242b08.tar.gz') ] task copyDependencies(type: Copy, description: 'Copy dependencies to /build/libs') { diff --git a/launcher-scripts/Linux-launcher.sh b/launcher-scripts/Linux-launcher.sh index d6090a4..65c9ef0 100755 --- a/launcher-scripts/Linux-launcher.sh +++ b/launcher-scripts/Linux-launcher.sh @@ -1,6 +1,6 @@ #!/bin/bash OLD_JAVA_HOME=$JAVA_HOME SCRIPT_DIRECTORY=`readlink -f "$(dirname "$0")"` -export JAVA_HOME=$SCRIPT_DIRECTORY/jdk8u212-b03-jre +export JAVA_HOME=$SCRIPT_DIRECTORY/jdk8u242-b08-jre "$JAVA_HOME/bin/java" -DLAUNCHER_JAVA_PATH="$JAVA_HOME/bin/java" -jar "$SCRIPT_DIRECTORY/libs/admin.jar" -export JAVA_HOME=$OLD_JAVA_HOME \ No newline at end of file +export JAVA_HOME=$OLD_JAVA_HOME diff --git a/launcher-scripts/Mac-launcher.sh b/launcher-scripts/Mac-launcher.sh index 493274c..d080a90 100755 --- a/launcher-scripts/Mac-launcher.sh +++ b/launcher-scripts/Mac-launcher.sh @@ -1,6 +1,6 @@ #!/bin/zsh OLD_JAVA_HOME=$JAVA_HOME SCRIPT_DIRECTORY=${0:A:h} -export JAVA_HOME=$SCRIPT_DIRECTORY/jdk8u212-b03-jre/Contents/Home +export JAVA_HOME=$SCRIPT_DIRECTORY/jdk8u242-b08-jre/Contents/Home "$JAVA_HOME/bin/java" -DLAUNCHER_JAVA_PATH="$JAVA_HOME/bin/java" -jar "$SCRIPT_DIRECTORY/libs/admin.jar" export JAVA_HOME=$OLD_JAVA_HOME diff --git a/launcher-scripts/Windows-launcher.bat b/launcher-scripts/Windows-launcher.bat index 5eeecae..1f21924 100755 --- a/launcher-scripts/Windows-launcher.bat +++ b/launcher-scripts/Windows-launcher.bat @@ -1,7 +1,7 @@ @echo off set OLD_JAVA_HOME=%JAVA_HOME% set BAT_DIRECTORY=%~dp0 -set JAVA_HOME=%BAT_DIRECTORY%jdk8u212-b03-jre +set JAVA_HOME=%BAT_DIRECTORY%jdk8u242-b08-jre start "Admin console launcher" /D "%BAT_DIRECTORY%\libs" "%JAVA_HOME%\bin\javaw" -DLAUNCHER_JAVA_PATH="%JAVA_HOME%\bin\java" -jar admin.jar set JAVA_HOME=%OLD_JAVA_HOME% -set OLD_JAVA_HOME= \ No newline at end of file +set OLD_JAVA_HOME= From 716ecad19d8dcdfafe1812a5f955b629499fd69d Mon Sep 17 00:00:00 2001 From: C Beach Date: Tue, 25 Feb 2020 10:42:33 -0600 Subject: [PATCH 10/11] chore - create RC1 for 1.1.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cf63d44..01d5d44 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ junitVersion=4.12 -artifactVersion=1.0.4-Alpha +artifactVersion=1.1.0-RC1 From 3cacc30991f86158c7c63c85264a395b9dec744d Mon Sep 17 00:00:00 2001 From: C Beach Date: Tue, 10 Mar 2020 00:16:34 -0500 Subject: [PATCH 11/11] chore: release 1.1.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 01d5d44..9bd04cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ junitVersion=4.12 -artifactVersion=1.1.0-RC1 +artifactVersion=1.1.0