public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/canl-java] f44: Update to 2.9.0
@ 2026-08-30 10:41 Mattias Ellert
  0 siblings, 0 replies; only message in thread
From: Mattias Ellert @ 2026-08-30 10:41 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/canl-java
Branch : f44
Commit : 4b4cf5208b91c1e911286a8531c27f83388dd390
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date   : 2026-08-30T12:37:26+02:00
Stats  : +27/-54 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/canl-java/c/4b4cf5208b91c1e911286a8531c27f83388dd390?branch=f44

Log:
Update to 2.9.0

---
diff --git a/canl-java-test.patch b/canl-java-test.patch
index 2cc4eb2..c73803b 100644
--- a/canl-java-test.patch
+++ b/canl-java-test.patch
@@ -1,23 +1,3 @@
-diff --git a/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java b/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java
-index de1c957..5a00ca6 100644
---- a/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java
-+++ b/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java
-@@ -24,6 +24,7 @@ import static org.junit.Assert.*;
- 
- import org.apache.commons.io.FileUtils;
- import org.bouncycastle.util.encoders.Base64;
-+import org.junit.Ignore;
- import org.junit.Test;
- import org.junit.experimental.categories.Category;
- 
-@@ -199,6 +200,7 @@ public class CRLTest
- 	
- 	@Test
- 	@Category(RiskyIntegrationTests.class)
-+	@Ignore
- 	public void testLoadPlain() throws Exception
- 	{
- 		File dir = initDir();
 diff --git a/src/test/java/eu/emi/security/authn/x509/impl/TestSSLHelpers.java b/src/test/java/eu/emi/security/authn/x509/impl/TestSSLHelpers.java
 index 87c7c06..39a6713 100644
 --- a/src/test/java/eu/emi/security/authn/x509/impl/TestSSLHelpers.java
@@ -47,24 +27,3 @@ index 87c7c06..39a6713 100644
  	public void testCreation() throws Exception
  	{
  		System.out.println("Running func:cli-srv functional test");
-diff --git a/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java b/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java
-index fba63e8..2b912cf 100644
---- a/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java
-+++ b/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java
-@@ -43,6 +43,8 @@ import org.bouncycastle.operator.ContentSigner;
- import org.bouncycastle.operator.OperatorCreationException;
- import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
- import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-+
-+import org.junit.Ignore;
- import org.junit.Test;
- 
- import eu.emi.security.authn.x509.ValidationResult;
-@@ -429,6 +431,7 @@ public class ProxyGenerationTest
- 	 * @throws Exception
- 	 */
- 	@Test
-+	@Ignore
- 	public void testSha2Proxy() throws Exception
- 	{
- 		System.out.println("Running func:cli-srv-sha2 functional test");

diff --git a/canl-java.spec b/canl-java.spec
index 87cc502..e8f1721 100644
--- a/canl-java.spec
+++ b/canl-java.spec
@@ -1,6 +1,6 @@
 Name:		canl-java
-Version:	2.8.3
-Release:	13%{?dist}
+Version:	2.9.0
+Release:	1%{?dist}
 Summary:	EMI Common Authentication library - bindings for Java
 
 #		The main parts of the code are BSD
@@ -9,20 +9,29 @@ Summary:	EMI Common Authentication library - bindings for Java
 #		Parts derived from Apache Commons IO are Apache 2.0
 #		See LICENSE.txt for details
 License:	BSD-3-Clause AND Apache-2.0 AND MIT
-URL:		https://github.com/eu-emi/%{name}/
-Source0:	https://github.com/eu-emi/%{name}/archive/canl-%{version}/%{name}-%{version}.tar.gz
+URL:		https://github.com/eu-emi/%{name}
+Source0:	%{url}/archive/canl-%{version}/%{name}-%{version}.tar.gz
 #		Disable tests that require network connections
 Patch0:		%{name}-test.patch
 
 BuildArch:	noarch
 ExclusiveArch:	%{java_arches} noarch
 
+%if %{?fedora}%{!?fedora:0} >= 43 || %{?rhel}%{!?rhel:0} >= 11
 BuildRequires:	maven-local-openjdk25
-BuildRequires:	mvn(commons-io:commons-io) >= 2.4
-BuildRequires:	mvn(junit:junit) >= 4.8
+%else
+BuildRequires:	maven-local
+%endif
+BuildRequires:	mvn(commons-io:commons-io)
+BuildRequires:	mvn(junit:junit)
 BuildRequires:	mvn(org.assertj:assertj-core)
-BuildRequires:	mvn(org.bouncycastle:bcpkix-jdk18on) >= 1.69
-Requires:	mvn(org.bouncycastle:bcpkix-jdk18on) >= 1.69
+%if %{?fedora}%{!?fedora:0} >= 40 || %{?rhel}%{!?rhel:0} >= 10
+BuildRequires:	mvn(org.bouncycastle:bcprov-jdk18on)
+BuildRequires:	mvn(org.bouncycastle:bcpkix-jdk18on)
+%else
+BuildRequires:	mvn(org.bouncycastle:bcprov-jdk15on)
+BuildRequires:	mvn(org.bouncycastle:bcpkix-jdk15on)
+%endif
 
 %description
 This is the Java part of the EMI caNl -- the Common Authentication Library.
@@ -35,10 +44,12 @@ Javadoc documentation for EMI caNl.
 
 %prep
 %setup -q -n %{name}-canl-%{version}
-%patch -P 0 -p1
+%patch -P0 -p1
 
-# Remove maven-wagon-webdav-jackrabbit dependency
-%pom_xpath_remove pom:build/pom:extensions
+%if ! ( %{?fedora}%{!?fedora:0} >= 40 || %{?rhel}%{!?rhel:0} >= 10 )
+%pom_change_dep org.bouncycastle:bcprov-jdk18on org.bouncycastle:bcprov-jdk15on
+%pom_change_dep org.bouncycastle:bcpkix-jdk18on org.bouncycastle:bcpkix-jdk15on
+%endif
 
 # GPG signing requires a GPG key
 %pom_remove_plugin org.apache.maven.plugins:maven-gpg-plugin
@@ -51,7 +62,7 @@ Javadoc documentation for EMI caNl.
 %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
 
 # Do not stage
-%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin
+%pom_remove_plugin org.sonatype.central:central-publishing-maven-plugin
 
 %build
 %mvn_build
@@ -67,6 +78,9 @@ Javadoc documentation for EMI caNl.
 %license LICENSE.txt
 
 %changelog
+* Fri Aug 21 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 2.9.0-1
+- Update to 2.9.0
+
 * Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.3-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/sources b/sources
index fb95ae4..c8e0fe8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (canl-java-2.8.3.tar.gz) = cf748386a1605f769193aab6b0ee1b35a7799073c76b419b2ee0f9a85f918403450064cc45de9023d179cec64cacd465065a702a40049bda7192882a9be595ed
+SHA512 (canl-java-2.9.0.tar.gz) = 5b99f6851bebefea2d5cc5f385de625e07276f7d501de6279a4dbdda6c76c58d388f0dc6ac633705d240689be6a499ed32920e178714439b29eacb0c32c44920

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-30 10:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-30 10:41 [rpms/canl-java] f44: Update to 2.9.0 Mattias Ellert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox