From ba67449f6aef0a67913097259d1a7fda6378cad4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 26 Apr 2022 21:19:22 +0200 Subject: [PATCH] Disable jctools-build module Resolves FTBFS: - https://bugzilla.redhat.com/show_bug.cgi?id=2045729 - https://bugzilla.redhat.com/show_bug.cgi?id=2051170 --- jctools.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/jctools.spec b/jctools.spec index a562b0e..ef953f6 100644 --- a/jctools.spec +++ b/jctools.spec @@ -2,7 +2,7 @@ Name: jctools Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java Concurrency Tools for the JVM License: ASL 2.0 @@ -11,12 +11,10 @@ Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz BuildArch: noarch -BuildRequires: maven-local -BuildRequires: mvn(com.github.javaparser:javaparser-core) >= 3.14.16 +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(com.google.guava:guava-testlib) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-all) # unused parent package was removed for fedora 33+ @@ -80,6 +78,9 @@ rm -r jctools-core/src/test/java/org/jctools/maps/linearizability_test/ %pom_disable_module jctools-channels %pom_disable_module jctools-experimental +%pom_disable_module jctools-build +%pom_remove_plugin :exec-maven-plugin jctools-core + # do not install internal build tools %mvn_package :jctools-build __noinstall @@ -88,7 +89,8 @@ rm -r jctools-core/src/test/java/org/jctools/maps/linearizability_test/ %build -%mvn_build -s +# Tests time out in Koji +%mvn_build -s -f %install @@ -104,6 +106,10 @@ rm -r jctools-core/src/test/java/org/jctools/maps/linearizability_test/ %changelog +* Wed Apr 27 2022 Mikolaj Izdebski - 3.3.0-4 +- Build with OpenJDK 8 +- Disable jctools-build module + * Sat Feb 05 2022 Jiri Vanek - 3.3.0-3 - Rebuilt for java-17-openjdk as system jdk