RHEL-52907: Switch to using Java 21 as the default JDK

This commit is contained in:
Adam Krajcik 2024-08-06 17:09:56 +02:00
parent 985c8682c5
commit 9b70164324

View File

@ -6,10 +6,10 @@ Epoch: 1
%global drop R-%{jar_ver}-202203080310 %global drop R-%{jar_ver}-202203080310
Summary: Eclipse Compiler for Java Summary: Eclipse Compiler for Java
Name: ecj Name: ecj
Version: %{eclipse_ver} Version: %{eclipse_ver}
Release: 9%{?dist} Release: 10%{?dist}
URL: https://www.eclipse.org URL: https://www.eclipse.org
License: EPL-2.0 License: EPL-2.0
Source0: https://download.eclipse.org/eclipse/downloads/drops4/%{drop}/ecjsrc-%{jar_ver}.jar Source0: https://download.eclipse.org/eclipse/downloads/drops4/%{drop}/ecjsrc-%{jar_ver}.jar
@ -22,11 +22,13 @@ Source2: MANIFEST.MF
Patch0: 0001-Always-generate-bytecode-debuginfo.patch Patch0: 0001-Always-generate-bytecode-debuginfo.patch
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
BuildRequires: ant BuildRequires: ant
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: java-devel >= 1:11 BuildRequires: java-devel
Requires: java-headless
Requires: javapackages-tools
%description %description
ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as
@ -41,6 +43,7 @@ sed -i -e '/compilerarg/s/Xlint:none/Xlint:none -encoding cp1252/' build.xml
cp %{SOURCE1} pom.xml cp %{SOURCE1} pom.xml
mkdir -p scripts/binary/META-INF/ mkdir -p scripts/binary/META-INF/
cp %{SOURCE2} scripts/binary/META-INF/MANIFEST.MF cp %{SOURCE2} scripts/binary/META-INF/MANIFEST.MF
rm ./META-INF/ECLIPSE_.{SF,RSA}
# Aliases # Aliases
%mvn_alias org.eclipse.jdt:ecj org.eclipse.jdt:core org.eclipse.jdt.core.compiler:ecj \ %mvn_alias org.eclipse.jdt:ecj org.eclipse.jdt:core org.eclipse.jdt.core.compiler:ecj \
@ -67,6 +70,10 @@ install -m 644 -p ecj.1 $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1
%{_mandir}/man1/ecj* %{_mandir}/man1/ecj*
%changelog %changelog
* Tue Aug 06 2024 Adam Krajcik <akrajcik@redhat.com> - 1:4.23-10
- Add gating
- Resolves: RHEL-52907 - Switch to using Java 21 as the default JDK
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:4.23-9 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:4.23-9
- Bump release for June 2024 mass rebuild - Bump release for June 2024 mass rebuild