11 changed files with 220 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
-SOURCES/2.0.0.Final.tar.gz
+/*.tar.gz
+/*.src.rpm
--- a/.jdeparser.metadata
+++ b/.jdeparser.metadata
@ -1 +1 @@
-642ff836b067e3eee9f5372a313eefa77e66efdd SOURCES/2.0.0.Final.tar.gz
+67a4608c75355338b3ba55594411077b8529ebea jdeparser-2.0.3.Final.tar.gz
--- a/0001-Fix-build-error-depending-on-class-removed-in-Java-1.patch
+++ b/0001-Fix-build-error-depending-on-class-removed-in-Java-1.patch
@ -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
+
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,8 @@
+# recipients: rhcs-team
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+
--- a/SPECS/jdeparser.spec
+++ b/SPECS/jdeparser.spec
@ -2,17 +2,19 @@
 %global namedversion %{version}%{?namedreltag}

 Name:             jdeparser
-Version:          2.0.0
-Release:          5%{?dist}
+Version:          2.0.3
+Release:          13%{?dist}
 Summary:          Source generator library for Java
 License:          ASL 2.0
 URL:              https://github.com/jdeparser/jdeparser2
 # 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
+Patch1:           0001-Fix-build-error-depending-on-class-removed-in-Java-1.patch
 BuildArch:        noarch

+BuildRequires:    java-11-openjdk-devel
 BuildRequires:    maven-local
-BuildRequires:    mvn(jdepend:jdepend)
+BuildRequires:    mvn(junit:junit)
 BuildRequires:    mvn(org.jboss:jboss-parent:pom:)

 %description
@ -29,7 +31,7 @@ This package contains the API documentation for %{name}.

 %prep
 %setup -q -n jdeparser2-%{namedversion}
-%pom_remove_plugin :maven-javadoc-plugin
+%patch1 -p1

 %build
 %mvn_build
@ -44,8 +46,43 @@ This package contains the API documentation for %{name}.
 %license LICENSE.txt

 %changelog
-* Wed May 30 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-5
- Remove custom apiviz javadoc doclet
+* Fri Mar 10 2023 Red Hat PKI Team <rhcs-maint@redhat.com> 2.0.3-13
+- Bug 2176827 - [RHEL9][FTBFS]: jdeparser-2.0.3-12.el9
+
+* Tue Aug 17 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 2.0.3-9
+- 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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (jdeparser-2.0.3.Final.tar.gz) = cfcc7b443f8bf65678fb56c544ee71f9c197b00529534e4c06270ef45ef8966a36770631f51f3e593786ea4a640452a51a5bb12e4bd419dabe50eafec2a616c9
--- a/tests/roles/Test_Setup/files/ca.cfg
+++ b/tests/roles/Test_Setup/files/ca.cfg
@ -0,0 +1,25 @@
+[DEFAULT]
+pki_server_database_password=Secret.123
+
+[CA]
+pki_admin_email=caadmin@example.com
+pki_admin_name=caadmin
+pki_admin_nickname=caadmin
+pki_admin_password=Secret.123
+pki_admin_uid=caadmin
+
+pki_client_database_password=Secret.123
+pki_client_database_purge=False
+pki_client_pkcs12_password=Secret.123
+
+pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
+pki_ds_database=ca
+pki_ds_password=Secret.123
+
+pki_security_domain_name=EXAMPLE
+
+pki_ca_signing_nickname=ca_signing
+pki_ocsp_signing_nickname=ca_ocsp_signing
+pki_audit_signing_nickname=ca_audit_signing
+pki_sslserver_nickname=sslserver
+pki_subsystem_nickname=subsystem
--- a/tests/roles/Test_Setup/files/ds-create.sh
+++ b/tests/roles/Test_Setup/files/ds-create.sh
@ -0,0 +1,24 @@
+#!/bin/bash -ex
+
+# This command needs to be executed as it pulls the machine name
+# dynamically.
+dscreate create-template /tmp/test_dir/ds.inf
+
+sed -i \
+    -e "s/;instance_name = .*/instance_name = localhost/g" \
+    -e "s/;root_password = .*/root_password = Secret.123/g" \
+    -e "s/;suffix = .*/suffix = dc=example,dc=com/g" \
+    -e "s/;self_sign_cert = .*/self_sign_cert = False/g" \
+    /tmp/test_dir/ds.inf
+
+dscreate from-file /tmp/test_dir/ds.inf
+
+ldapadd -h $HOSTNAME -x -D "cn=Directory Manager" -w Secret.123 << EOF
+dn: dc=example,dc=com
+objectClass: domain
+dc: example
+
+dn: dc=pki,dc=example,dc=com
+objectClass: domain
+dc: pki
+EOF
--- a/tests/roles/Test_Setup/files/kra.cfg
+++ b/tests/roles/Test_Setup/files/kra.cfg
@ -0,0 +1,27 @@
+[DEFAULT]
+pki_server_database_password=Secret.123
+
+[KRA]
+pki_admin_email=kraadmin@example.com
+pki_admin_name=kraadmin
+pki_admin_nickname=kraadmin
+pki_admin_password=Secret.123
+pki_admin_uid=kraadmin
+
+pki_client_database_password=Secret.123
+pki_client_database_purge=False
+pki_client_pkcs12_password=Secret.123
+
+pki_ds_base_dn=dc=kra,dc=pki,dc=example,dc=com
+pki_ds_database=kra
+pki_ds_password=Secret.123
+
+pki_security_domain_name=EXAMPLE
+pki_security_domain_user=caadmin
+pki_security_domain_password=Secret.123
+
+pki_storage_nickname=kra_storage
+pki_transport_nickname=kra_transport
+pki_audit_signing_nickname=kra_audit_signing
+pki_sslserver_nickname=sslserver
+pki_subsystem_nickname=subsystem
--- a/tests/roles/Test_Setup/tasks/main.yml
+++ b/tests/roles/Test_Setup/tasks/main.yml
@ -0,0 +1,26 @@
+---
+
+- name: Install resteasy packages
+  dnf:
+    name: >
+      pki-resteasy-client, pki-resteasy-core, pki-resteasy-jackson2-provider, pki-resteasy-jaxb-provider
+
+- name: Install required packages
+  dnf:
+    name: >
+      389-ds-base, pki-ca, pki-kra
+
+- name: Creates directory
+  file: path=/tmp/test_files state=directory
+
+- name: Copying templates to /tmp folder
+  copy : src=.  dest=/tmp/test_dir
+
+- name: Setup DS Service
+  shell: sh /tmp/test_dir/ds-create.sh
+
+- name: Install CA subsystem
+  shell: pkispawn -f /tmp/test_dir/ca.cfg -s CA -v
+
+- name: Install KRA subsystem
+  shell: pkispawn -f /tmp/test_dir/kra.cfg -s KRA -v
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,29 @@
+- hosts: localhost
+  remote_user: root
+  tags:
+    - classic
+  roles:
+  - role: Test_Setup
+  - role: standard-test-basic
+    tests:
+    - verify_spawn_ca:
+        dir: .
+        run: "curl http://localhost:8080/ca/admin/ca/getStatus | grep '<Status>running</Status>'"
+    - verify_spawn_kra:
+        dir: .
+        run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep '<Status>running</Status>'"
+    - destroy_kra:
+        dir: .
+        run: "pkidestroy -i pki-tomcat -s KRA && sleep 5"
+    - verify_destroy_kra:
+        dir: .
+        run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep 'HTTP Status 404'"
+    - destroy_ca:
+        dir: .
+        run: "pkidestroy -i pki-tomcat -s CA"
+    - verify_destroy_ca:
+        dir: .
+        run: "curl http://localhost:8080/ca/admin/ca/getStatus  &> testfile.log || true && grep 'Connection refused' testfile.log"
+    required_packages:
+    - pki-ca
+    - pki-kra
				`@ -0,0 +1 @@`
				`SHA512 (jdeparser-2.0.3.Final.tar.gz) = cfcc7b443f8bf65678fb56c544ee71f9c197b00529534e4c06270ef45ef8966a36770631f51f3e593786ea4a640452a51a5bb12e4bd419dabe50eafec2a616c9`