Compare commits

..

No commits in common. "c8" and "imports/c9-beta/jdeparser-2.0.3-12.el9" have entirely different histories.

4 changed files with 78 additions and 9 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/2.0.0.Final.tar.gz SOURCES/jdeparser-2.0.3.Final.tar.gz

View File

@ -1 +1 @@
642ff836b067e3eee9f5372a313eefa77e66efdd SOURCES/2.0.0.Final.tar.gz 67a4608c75355338b3ba55594411077b8529ebea SOURCES/jdeparser-2.0.3.Final.tar.gz

View File

@ -0,0 +1,33 @@
From d839be75837da2bc51712af5ae123657c67de30d Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
Date: Mon, 16 Aug 2021 21:22:27 +0100
Subject: [PATCH] Fix build error depending on class removed in Java 11
---
src/main/java/org/jboss/jdeparser/Assertions.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/java/org/jboss/jdeparser/Assertions.java b/src/main/java/org/jboss/jdeparser/Assertions.java
index 017c645..a931b88 100644
--- a/src/main/java/org/jboss/jdeparser/Assertions.java
+++ b/src/main/java/org/jboss/jdeparser/Assertions.java
@@ -18,15 +18,13 @@
package org.jboss.jdeparser;
-import sun.reflect.Reflection;
-
/**
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
*/
class Assertions {
static boolean callerIs(Class<?> clazz) {
try {
- return Reflection.getCallerClass(3) == clazz;
+ return StackWalker.getInstance().getCallerClass() == clazz;
} catch (Throwable ignored) {}
// dunno
return true;
--
2.31.1

View File

@ -2,17 +2,19 @@
%global namedversion %{version}%{?namedreltag} %global namedversion %{version}%{?namedreltag}
Name: jdeparser Name: jdeparser
Version: 2.0.0 Version: 2.0.3
Release: 5%{?dist} Release: 12%{?dist}
Summary: Source generator library for Java Summary: Source generator library for Java
License: ASL 2.0 License: ASL 2.0
URL: https://github.com/jdeparser/jdeparser2 URL: https://github.com/jdeparser/jdeparser2
# old repos https://github.com/jdeparser/jdeparser # old repos https://github.com/jdeparser/jdeparser
Source0: https://github.com/jdeparser/jdeparser2/archive/%{namedversion}.tar.gz Source0: %{url}/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz
Patch: 0001-Fix-build-error-depending-on-class-removed-in-Java-1.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(jdepend:jdepend) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.jboss:jboss-parent:pom:) BuildRequires: mvn(org.jboss:jboss-parent:pom:)
%description %description
@ -29,9 +31,11 @@ This package contains the API documentation for %{name}.
%prep %prep
%setup -q -n jdeparser2-%{namedversion} %setup -q -n jdeparser2-%{namedversion}
%pom_remove_plugin :maven-javadoc-plugin %patch -p1
%build %build
# Use Java 8 as sun.reflect.Reflection is removed in Java 11.
export JAVA_HOME=%{_jvmdir}/java-1.8.0
%mvn_build %mvn_build
%install %install
@ -44,8 +48,40 @@ This package contains the API documentation for %{name}.
%license LICENSE.txt %license LICENSE.txt
%changelog %changelog
* Wed May 30 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-5 * Tue Aug 17 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 2.0.3-9
- Remove custom apiviz javadoc doclet - Bug 1981014 - jdeparser: FTBFS due to access to internal class sun.reflect.Reflection
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.3-8
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.3-7
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Markku Korkeala <markku.korkeala@iki.fi> - 2.0.3-5
- Force Java 8 as sun.reflect.Reflection is removed in Java 11.
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.0.3-3
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Oct 08 2019 Dogtag PKI Team <pki-devel@redhat.com> - 2.0.3-1
- Rebuild as part of revival process
- BZ#1758686
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild