From 371598349754dea076a2efbe0b25c738727ffec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20L=C3=B6ffler?= <22102800+Oliver-Loeffler@users.noreply.github.com> Date: Wed, 2 Oct 2024 18:42:00 +0200 Subject: [PATCH 1/2] build: Replaced deprecated --compress 2 option with new JLink 21 compliant --compress zip-6 (#743) --- .github/scripts/jpackage.bat | 4 ++-- .github/scripts/jpackage.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/jpackage.bat b/.github/scripts/jpackage.bat index 809e6b381..523980368 100644 --- a/.github/scripts/jpackage.bat +++ b/.github/scripts/jpackage.bat @@ -8,7 +8,7 @@ REM set MODULES=java.desktop,java.logging,java.naming,java.prefs,java.security.j --module-path %JAVAFX_HOME% ^ --add-modules %JDEPS_MODULES%,%JAVAFX_MODULES% ^ --output app/target/runtime ^ ---strip-debug --compress 2 --no-header-files --no-man-pages +--strip-debug --compress zip-6 --no-header-files --no-man-pages %JPACKAGE_HOME%\bin\jpackage ^ --app-version %APP_VERSION% ^ @@ -30,4 +30,4 @@ REM set MODULES=java.desktop,java.logging,java.naming,java.prefs,java.security.j --win-menu ^ --win-menu-group "Scene Builder" ^ --win-per-user-install ^ ---win-shortcut \ No newline at end of file +--win-shortcut diff --git a/.github/scripts/jpackage.sh b/.github/scripts/jpackage.sh index 62255871c..cce59551d 100755 --- a/.github/scripts/jpackage.sh +++ b/.github/scripts/jpackage.sh @@ -5,7 +5,7 @@ $JAVA_HOME/bin/jlink \ --module-path $JAVAFX_HOME \ --add-modules $jdeps_modules,$JAVAFX_MODULES \ --output app/target/runtime \ ---strip-debug --compress 2 --no-header-files --no-man-pages +--strip-debug --compress zip-6 --no-header-files --no-man-pages $JPACKAGE_HOME/bin/jpackage \ --app-version $APP_VERSION \ @@ -19,4 +19,4 @@ $JPACKAGE_HOME/bin/jpackage \ --verbose \ --runtime-image app/target/runtime \ --dest $INSTALL_DIR \ -"$@" \ No newline at end of file +"$@" From 458530b2a3bb052d86001533d10b8ccb4e452a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20L=C3=B6ffler?= <22102800+Oliver-Loeffler@users.noreply.github.com> Date: Wed, 2 Oct 2024 18:43:27 +0200 Subject: [PATCH 2/2] docs: Updated license copyright year to 2024 (#742) --- LICENSE.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 0998b7b49..dc97dbc7c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ -Copyright (c) 2016, 2023, Gluon and/or its affiliates. +Copyright (c) 2016, 2024, Gluon and/or its affiliates. Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. Use is subject to license terms. @@ -28,4 +28,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.