From 575807271f5db5cdd6fd14d354aeed6ee2ec9b26 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 19 Feb 2024 18:12:23 +0100 Subject: [PATCH] Update to upstream version 1.16.0 --- .gitignore | 1 + javapackages-bootstrap.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 89a2883..8c7dee3 100644 --- a/.gitignore +++ b/.gitignore @@ -157,3 +157,4 @@ /javapackages-bootstrap-1.15.0.tar.xz /plexus-testing.tar.xz /plexus-xml.tar.xz +/javapackages-bootstrap-1.16.0.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 3e369e7..31dbb0d 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -12,7 +12,7 @@ %global debug_package %{nil} -%global javaHomePath %{_jvmdir}/java-17-openjdk +%global javaHomePath %{_jvmdir}/java-21-openjdk %global mavenHomePath %{_datadir}/%{name} %global metadataPath %{mavenHomePath}/maven-metadata %global artifactsPath %{_jnidir} @@ -22,7 +22,7 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.15.0 +Version: 1.16.0 Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING @@ -167,14 +167,14 @@ Source1120: xz-java.tar.xz BuildRequires: byaccj BuildRequires: gcc -BuildRequires: java-17-openjdk-devel +BuildRequires: java-21-openjdk-devel BuildRequires: jurand BuildRequires: rpm-devel BuildRequires: rpm-local-generator-support Requires: bash Requires: coreutils -Requires: java-17-openjdk-devel +Requires: java-21-openjdk-devel Requires: procps-ng Requires: lujavrite%{?_isa} @@ -273,6 +273,10 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Mon Feb 19 2024 Mikolaj Izdebski - 1.16.0-1 +- Update to upstream version 1.16.0 +- Switch from Java 17 to Java 21 + * Wed Feb 07 2024 Mikolaj Izdebski - 1.15.0-1 - Update to upstream version 1.15.0 diff --git a/sources b/sources index ab53210..030c83e 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.15.0.tar.xz) = 19a64926f6b9932cc623f96db7633a6f6b4f408fe155eeffee6ebaf8b8431fc8bda0ee702ce747c002ec581d364d0330700b2b208d051f2d67b1d4a937d729a1 +SHA512 (javapackages-bootstrap-1.16.0.tar.xz) = b118ed671766365b09c8c484b9e944a54f7139c1bf93e86e50774243c955c8699c4c71bcc81534ab8574c503b5ef5341d03ca0089d14857bfc0b7b46cb0c49b8 SHA512 (ant.tar.xz) = 30e4ef50010f04c64c60777f30079099c11a2e3dbdd71f2987dfec3912d2716a802979713d851c9a5f6f324431997a42b77f7739cd9e4fb5d3816cc614271ed4 SHA512 (aopalliance.tar.xz) = 1f9a8a63edb76a73a40dcb3edee72fad069d4b509cc4b702cb9af9aaf694dadeef01fa7d20c285c6c37f7cb030643d267e3a1b834567785399fc986da474e626 SHA512 (apache-pom.tar.xz) = 5aa6bcd3e39a0083e9ee714774734d4066fe571722e543ec08f9e2aac27653b37a9e0fb67d62bbce050d0f51661d842ecb4724208ed200068ea0128af7471a7a