diff --git a/.gitignore b/.gitignore
index fe33249..0236d25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/jss-4.6.2.tar.gz
+SOURCES/jss-4.7.0-b4.tar.gz
diff --git a/.jss.metadata b/.jss.metadata
index d14bd57..e839928 100644
--- a/.jss.metadata
+++ b/.jss.metadata
@@ -1 +1 @@
-4fea1d770e0882aa9c1c6c493bce9eb579b5c085 SOURCES/jss-4.6.2.tar.gz
+efe5f117b59556c41cf7c1eac05da22d8d781312 SOURCES/jss-4.7.0-b4.tar.gz
diff --git a/SOURCES/0001-Fix-NativeProxy-reference-tracker.patch b/SOURCES/0001-Fix-NativeProxy-reference-tracker.patch
deleted file mode 100644
index 529b576..0000000
--- a/SOURCES/0001-Fix-NativeProxy-reference-tracker.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 91514ca0a2979ba778d27220ced0cd312e2cd2d2 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Tue, 29 Oct 2019 10:43:56 -0400
-Subject: [PATCH] Fix NativeProxy reference tracker
-
-In eb5df01003d74b57473eacb84e538d31f5bb06ca, I introduced a bug by
-setting mPointer after trying to add NativeProxy to the registry. In
-most instances this won't matter, however, if another instance exists in
-the HashSet with the same hash value, the equals comparator will be
-used, triggering a NPE.
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
----
- org/mozilla/jss/util/NativeProxy.java | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/org/mozilla/jss/util/NativeProxy.java b/org/mozilla/jss/util/NativeProxy.java
-index 1c6d1aa5..a0811f76 100644
---- a/org/mozilla/jss/util/NativeProxy.java
-+++ b/org/mozilla/jss/util/NativeProxy.java
-@@ -40,8 +40,8 @@ public abstract class NativeProxy implements AutoCloseable
- */
- public NativeProxy(byte[] pointer) {
- assert(pointer!=null);
-- registry.add(this);
- mPointer = pointer;
-+ registry.add(this);
-
- if (saveStacktraces) {
- mTrace = Arrays.toString(Thread.currentThread().getStackTrace());
-@@ -61,15 +61,12 @@ public abstract class NativeProxy implements AutoCloseable
- if( ! (obj instanceof NativeProxy) ) {
- return false;
- }
-- if( ((NativeProxy)obj).mPointer.length != mPointer.length) {
-+ if (((NativeProxy)obj).mPointer == null) {
-+ /* If mPointer is null, we have no way to compare the values
-+ * of the pointers, so assume they're unequal. */
- return false;
- }
-- for(int i=0; i < mPointer.length; i++) {
-- if(mPointer[i] != ((NativeProxy)obj).mPointer[i]) {
-- return false;
-- }
-- }
-- return true;
-+ return Arrays.equals(((NativeProxy)obj).mPointer, mPointer);
- }
-
- /**
---
-2.21.0
-
diff --git a/SPECS/jss.spec b/SPECS/jss.spec
index 02cceb3..cf402e2 100644
--- a/SPECS/jss.spec
+++ b/SPECS/jss.spec
@@ -6,9 +6,9 @@ Summary: Java Security Services (JSS)
URL: http://www.dogtagpki.org/wiki/JSS
License: MPLv1.1 or GPLv2+ or LGPLv2+
-Version: 4.6.2
-Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
-# global _phase -a1
+Version: 4.7.0
+Release: 0.4%{?_timestamp}%{?_commit_id}%{?dist}
+%global _phase -b4
# To generate the source tarball:
# $ git clone https://github.com/dogtagpki/jss.git
@@ -25,7 +25,6 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
# <version tag> \
# > jss-VERSION-RELEASE.patch
# Patch: jss-VERSION-RELEASE.patch
-Patch: 0001-Fix-NativeProxy-reference-tracker.patch
################################################################################
# Build Dependencies
@@ -35,11 +34,13 @@ Patch: 0001-Fix-NativeProxy-reference-tracker.patch
BuildRequires: git
BuildRequires: make
BuildRequires: cmake
+BuildRequires: zip
+BuildRequires: unzip
BuildRequires: gcc-c++
BuildRequires: nspr-devel >= 4.13.1
-BuildRequires: nss-devel >= 3.30
-BuildRequires: nss-tools >= 3.30
+BuildRequires: nss-devel >= 3.44
+BuildRequires: nss-tools >= 3.44
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: slf4j
@@ -50,11 +51,10 @@ BuildRequires: glassfish-jaxb-api
BuildRequires: slf4j-jdk14
%endif
BuildRequires: apache-commons-lang
-BuildRequires: apache-commons-codec
BuildRequires: junit
-Requires: nss >= 3.30
+Requires: nss >= 3.44
Requires: java-headless
Requires: jpackage-utils
Requires: slf4j
@@ -65,7 +65,6 @@ Requires: glassfish-jaxb-api
Requires: slf4j-jdk14
%endif
Requires: apache-commons-lang
-Requires: apache-commons-codec
Conflicts: ldapjdk < 4.20
Conflicts: idm-console-framework < 1.2
@@ -117,7 +116,7 @@ rm -rf build && mkdir -p build && cd build
..
%{__make} all
-%{__make} javadoc || true
+%{__make} javadoc
ctest --output-on-failure
################################################################################
@@ -148,7 +147,8 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
%files
%defattr(-,root,root,-)
-%doc jss.html MPL-1.1.txt gpl.txt lgpl.txt
+%doc jss.html
+%license MPL-1.1.txt gpl.txt lgpl.txt
%{_libdir}/*
%{_jnidir}/*
@@ -160,6 +160,21 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
################################################################################
%changelog
+* Thu Jun 25 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 4.7.0-0.4
+- Rebased to JSS 4.7.0-b4
+
+* Mon Jun 22 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 4.7.0-0.3
+- Rebased to JSS 4.7.0-b3
+
+* Tue May 26 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 4.7.0-0.1
+- Rebased to JSS 4.7.0-b1
+
+* Mon Mar 23 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 4.6.2-4
+- Red Hat Bugzilla #1807371 - KRA-HSM: Async and sync key recovery using kra agent web is failing
+
+* Mon Mar 02 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 4.6.2-3
+- Red Hat Bugzilla #1807371 - KRA-HSM: Async and sync key recovery using kra agent web is failing
+
* Tue Oct 29 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 4.6.2-2
- Red Hat Bugzilla #1730767 - JSS: Wrap NSS CMAC + KDF implementations
- Rebased to JSS 4.6.2