public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: jmagne <jmagne@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/jss] pqc: Rebase to JSS 5.8.0-beta1.
Date: Tue, 28 Jul 2026 16:49:13 GMT [thread overview]
Message-ID: <178525735389.1.14413930285641217350.rpms-jss-0b7b51984cfc@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/jss
Branch : pqc
Commit : 0b7b51984cfc72ea2536039d1a185dc4fd79c792
Author : jmagne <jmagne@redhat.com>
Date : 2025-07-09T15:20:54-07:00
Stats : +39/-17 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/jss/c/0b7b51984cfc72ea2536039d1a185dc4fd79c792?branch=pqc
Log:
Rebase to JSS 5.8.0-beta1.
---
diff --git a/.gitignore b/.gitignore
index 377c2aa..337a5da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ jss-4.2.6.tar.gz
/jss-5.5.0.tar.gz
/jss-5.5.1.tar.gz
/jss-5.6.0-alpha1.tar.gz
+/jss-5.8.0-beta1.tar.gz
diff --git a/jss.spec b/jss.spec
index 155a73d..e66dbc6 100644
--- a/jss.spec
+++ b/jss.spec
@@ -7,7 +7,7 @@ Name: jss
# Upstream version number:
%global major_version 5
-%global minor_version 6
+%global minor_version 8
%global update_version 0
# Downstream release number:
@@ -19,7 +19,7 @@ Name: jss
# - development (unsupported): alpha<n> where n >= 1
# - stabilization (unsupported): beta<n> where n >= 1
# - GA/update (supported): <none>
-%global phase alpha1
+%global phase beta1
%undefine timestamp
%undefine commit_id
@@ -28,7 +28,7 @@ Summary: Java Security Services (JSS)
URL: https://github.com/dogtagpki/jss
License: (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND Apache-2.0
Version: %{major_version}.%{minor_version}.%{update_version}
-Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1
+Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
# To generate the source tarball:
# $ git clone https://github.com/dogtagpki/jss.git
@@ -56,9 +56,26 @@ ExcludeArch: i686
# Java
################################################################################
+# use Java 17 on Fedora 39 or older and RHEL 9 or older
+# otherwise, use Java 21
+
+# maven-local is a subpackage of javapackages-tools
+
+%if 0%{?fedora} && 0%{?fedora} <= 39 || 0%{?rhel} && 0%{?rhel} <= 9
+
+%define java_devel java-17-openjdk-devel
+%define java_headless java-17-openjdk-headless
+%define java_home %{_jvmdir}/jre-17-openjdk
+%define maven_local maven-local-openjdk17
+
+%else
+
%define java_devel java-21-openjdk-devel
%define java_headless java-21-openjdk-headless
%define java_home %{_jvmdir}/jre-21-openjdk
+%define maven_local maven-local
+
+%endif
################################################################################
# Build Options
@@ -84,11 +101,11 @@ BuildRequires: zip
BuildRequires: unzip
BuildRequires: gcc-c++
-BuildRequires: nss-devel >= 3.66
-BuildRequires: nss-tools >= 3.66
+BuildRequires: nss-devel >= 3.101
+BuildRequires: nss-tools >= 3.101
BuildRequires: %{java_devel}
-BuildRequires: maven-local
+BuildRequires: %{maven_local}
BuildRequires: mvn(org.apache.commons:commons-lang3)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-jdk14)
@@ -104,7 +121,7 @@ This only works with gcj. Other JREs require that JCE providers be signed.
Summary: Java Security Services (JSS)
-Requires: nss >= 3.66
+Requires: nss >= 3.101
Requires: %{java_headless}
Requires: mvn(org.apache.commons:commons-lang3)
@@ -132,21 +149,21 @@ This only works with gcj. Other JREs require that JCE providers be signed.
Summary: Java Security Services (JSS) Connector for Tomcat
# Tomcat
-BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
-BuildRequires: mvn(org.apache.tomcat:tomcat-coyote) >= 9.0.62
-BuildRequires: mvn(org.apache.tomcat:tomcat-juli) >= 9.0.62
+BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.33
+BuildRequires: mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.33
+BuildRequires: mvn(org.apache.tomcat:tomcat-juli) >= 10.1.33
Requires: %{product_id} = %{version}-%{release}
-Requires: mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
-Requires: mvn(org.apache.tomcat:tomcat-coyote) >= 9.0.62
-Requires: mvn(org.apache.tomcat:tomcat-juli) >= 9.0.62
+Requires: mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.33
+Requires: mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.33
+Requires: mvn(org.apache.tomcat:tomcat-juli) >= 10.1.33
# Tomcat JSS has been replaced with JSS Connector for Tomcat.
# This will remove installed Tomcat JSS packages.
Obsoletes: tomcatjss <= 8.5
Conflicts: tomcatjss <= 8.5
-Obsoletes: dogtag-tomcatjss <= 8.5
-Conflicts: dogtag-tomcatjss <= 8.5
+Obsoletes: %{vendor_id}-tomcatjss <= 8.5
+Conflicts: %{vendor_id}-tomcatjss <= 8.5
%if 0%{?rhel} <= 8
# PKI Servlet Engine has been replaced with Tomcat.
@@ -227,11 +244,11 @@ This package provides test suite for JSS.
# specify Maven artifact locations
%mvn_file org.dogtagpki.jss:jss-tomcat jss/jss-tomcat
-%mvn_file org.dogtagpki.jss:jss-tomcat-9.0 jss/jss-tomcat-9.0
+%mvn_file org.dogtagpki.jss:jss-tomcat-10.1 jss/jss-tomcat-10.1
# specify Maven artifact packages
%mvn_package org.dogtagpki.jss:jss-tomcat jss-tomcat
-%mvn_package org.dogtagpki.jss:jss-tomcat-9.0 jss-tomcat
+%mvn_package org.dogtagpki.jss:jss-tomcat-10.1 jss-tomcat
################################################################################
%build
@@ -376,6 +393,9 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
################################################################################
%changelog
+* Wed Jul 09 2025 Dogtag PKI Team <devel@lists.dogtagpki.org> 5.8.0.1
+- Rebase to JSS 5.8.0-beta1
+
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-0.1.alpha1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
diff --git a/sources b/sources
index 8d8bc4b..45d1760 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (jss-5.6.0-alpha1.tar.gz) = 239952d7b1fc9d005760e9234aec84a84a02becefffa525853e9cccd5cfc88e6e0d9d2ea2eea59f43e3b6d1686878081eae1e615ed68d759b3c5aef7397a5472
+SHA512 (jss-5.8.0-beta1.tar.gz) = 7890b416218260d215ae80082a05a6c59b3671603ed64afd3ed1e20da20577c34674f53622a075073c568003f3f8dcb05b7b447bd1e32d39292e5e613cbfe894
reply other threads:[~2026-07-28 16:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178525735389.1.14413930285641217350.rpms-jss-0b7b51984cfc@fedoraproject.org \
--to=jmagne@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox