The package rpms/jboss-logging-tools.git has added or updated architecture specific
content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/jboss-logging-tools.git/commit/?i....
Change:
+ExclusiveArch: %{java_arches} noarch
Thanks.
Full change:
============
commit 5b2385d3bb0c343f93f02c3efd8d568863f1365c
Author: Chris Kelley <ckelley(a)redhat.com>
Date: Thu Feb 29 11:13:46 2024 +0000
Bump release for Java 21
diff --git a/jboss-logging-tools.spec b/jboss-logging-tools.spec
index 729d5c9..e152a14 100644
--- a/jboss-logging-tools.spec
+++ b/jboss-logging-tools.spec
@@ -3,7 +3,7 @@
Name: jboss-logging-tools
Version: 2.2.1
-Release: 14%{?dist}
+Release: 16%{?dist}
Summary: JBoss Logging I18n Annotation Processor
# Not available license file
https://issues.jboss.org/browse/LOGTOOL-107
# ./annotations/src/main/java/org/jboss/logging/annotations/*.java: Apache (v2.0)
@@ -50,6 +50,12 @@ rm
processor/src/test/java/org/jboss/logging/processor/generated/GeneratedSource
%doc README.adoc
%changelog
+* Thu Feb 29 2024 Chris Kelley <ckelley(a)redhat.com> - 2.2.1-16
+- Patched to work with java-21-openjdk as system jdk
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek(a)redhat.com> - 2.2.1-15
+- Rebuilt for java-21-openjdk as system jdk
+
* Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.1-14
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit 9dbdd81232f9f24d16438abbc4bb1ac704a3fffe
Author: Chris Kelley <ckelley(a)redhat.com>
Date: Thu Feb 29 11:02:06 2024 +0000
Additional fix for java 21
diff --git a/0001-Add-getEnclosingMethod-to-DelegatingExecutableElemen.patch
b/0001-Add-getEnclosingMethod-to-DelegatingExecutableElemen.patch
index 1ab3c99..a56cfeb 100644
--- a/0001-Add-getEnclosingMethod-to-DelegatingExecutableElemen.patch
+++ b/0001-Add-getEnclosingMethod-to-DelegatingExecutableElemen.patch
@@ -1,4 +1,4 @@
-From ea892dd568ab4903c8d0f485418cf47004018cf4 Mon Sep 17 00:00:00 2001
+From 4011d34acaafd98ae0cff3bfe348be0d893db90a Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley(a)redhat.com>
Date: Thu, 29 Feb 2024 10:43:54 +0000
Subject: [PATCH] Add getEnclosingMethod() to DelegatingExecutableElement
@@ -6,10 +6,18 @@ Subject: [PATCH] Add getEnclosingMethod() to
DelegatingExecutableElement
The method has moved class in Java 21.
diff --git
a/processor/src/main/java/org/jboss/logging/processor/model/DelegatingExecutableElement.java
b/processor/src/main/java/org/jboss/logging/processor/model/DelegatingExecutableElement.java
-index 202552f..aa15113 100644
+index 202552f..5be0f7f 100644
---
a/processor/src/main/java/org/jboss/logging/processor/model/DelegatingExecutableElement.java
+++
b/processor/src/main/java/org/jboss/logging/processor/model/DelegatingExecutableElement.java
-@@ -56,6 +56,11 @@ public interface DelegatingExecutableElement extends
ExecutableElement, Delegati
+@@ -24,6 +24,7 @@ package org.jboss.logging.processor.model;
+
+ import java.util.List;
+ import javax.lang.model.element.AnnotationValue;
++import javax.lang.model.element.Element;
+ import javax.lang.model.element.ExecutableElement;
+ import javax.lang.model.element.Name;
+ import javax.lang.model.element.TypeParameterElement;
+@@ -56,6 +57,11 @@ public interface DelegatingExecutableElement extends
ExecutableElement, Delegati
return getDelegate().getReturnType();
}
commit f91c5691ef722771f7f7eee1bcaac6143bc14dc9
Author: Chris Kelley <ckelley(a)redhat.com>
Date: Thu Feb 29 10:47:40 2024 +0000
Patch DelegatingExecutableElement for Java 21
diff --git a/0001-Add-getEnclosingMethod-to-DelegatingExecutableElemen.patch
b/0001-Add-getEnclosingMethod-to-DelegatingExecutableElemen.patch
new file mode 100644
index 0000000..1ab3c99
--- /dev/null
+++ b/0001-Add-getEnclosingMethod-to-DelegatingExecutableElemen.patch
@@ -0,0 +1,26 @@
+From ea892dd568ab4903c8d0f485418cf47004018cf4 Mon Sep 17 00:00:00 2001
+From: Chris Kelley <ckelley(a)redhat.com>
+Date: Thu, 29 Feb 2024 10:43:54 +0000
+Subject: [PATCH] Add getEnclosingMethod() to DelegatingExecutableElement
+
+The method has moved class in Java 21.
+
+diff --git
a/processor/src/main/java/org/jboss/logging/processor/model/DelegatingExecutableElement.java
b/processor/src/main/java/org/jboss/logging/processor/model/DelegatingExecutableElement.java
+index 202552f..aa15113 100644
+---
a/processor/src/main/java/org/jboss/logging/processor/model/DelegatingExecutableElement.java
++++
b/processor/src/main/java/org/jboss/logging/processor/model/DelegatingExecutableElement.java
+@@ -56,6 +56,11 @@ public interface DelegatingExecutableElement extends
ExecutableElement, Delegati
+ return getDelegate().getReturnType();
+ }
+
++ @Override
++ default Element getEnclosingElement() {
++ return getDelegate().getEnclosingElement();
++ }
++
+ @Override
+ default List<? extends VariableElement> getParameters() {
+ return getDelegate().getParameters();
+--
+2.43.2
+
diff --git a/jboss-logging-tools.spec b/jboss-logging-tools.spec
index 4606ca9..729d5c9 100644
--- a/jboss-logging-tools.spec
+++ b/jboss-logging-tools.spec
@@ -11,9 +11,10 @@ License: Apache-2.0 and LGPL-2.0-or-later
URL:
https://github.com/jboss-logging/jboss-logging-tools
Source0: %{url}/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz
Source1:
http://www.apache.org/licenses/LICENSE-2.0.txt
+Patch1: 0001-Add-getEnclosingMethod-to-DelegatingExecutableElemen.patch
BuildArch: noarch
-ExclusiveArch: %{java_arches} noarch
+ExclusiveArch: %{java_arches} noarch
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
@@ -25,7 +26,7 @@ BuildRequires: mvn(org.jboss.logging:jboss-logging)
This pacakge contains JBoss Logging I18n Annotation Processor
%prep
-%setup -q -n %{name}-%{namedversion}
+%autosetup -n %{name}-%{namedversion} -p 1
cp %{SOURCE1} .