.gitignore

@@ -1 +1 @@
-SOURCES/jctools-2.0.2.tar.gz
+SOURCES/JCTools-3.3.0.tar.gz

.jctools.metadata

@@ -1 +1 @@
-35969e3255117fcfe1b66fb601f886cad3d4b743 SOURCES/jctools-2.0.2.tar.gz
+fc2d43993feb32878e0e63cb44b7832a62ff9abc SOURCES/JCTools-3.3.0.tar.gz

SPECS/jctools.spec

@@ -1,21 +1,30 @@
-%global namedreltag %nil
-%global namedversion %{version}%{?namedreltag}
+%global srcname JCTools
 
-Name:          jctools
-Version:       2.0.2
-Release:       2%{?dist}
-Summary:       Java Concurrency Tools for the JVM
-License:       ASL 2.0
-URL:           http://jctools.github.io/JCTools/
-Source0:       https://github.com/JCTools/JCTools/archive/v%{namedversion}/%{name}-%{namedversion}.tar.gz
+Name:           jctools
+Version:        3.3.0
+Release:        3%{?dist}
+Summary:        Java Concurrency Tools for the JVM
+License:        ASL 2.0
 
-BuildRequires: maven-local
-BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.hamcrest:hamcrest-all)
-BuildRequires: mvn(org.ow2.asm:asm-all)
+URL:            https://github.com/JCTools/JCTools
+Source0:        %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz
 
-BuildArch:     noarch
+BuildArch:      noarch
+
+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.hamcrest:hamcrest-all)
+
+# unused parent package was removed for fedora 33+
+Obsoletes:      %{name}-parent < 3.1.0-1
+
+# unused channels and experimental modules disabled with 3.1.0 for fedora 33+
+# Unsafe.defineClass is not available in JDK 11:
+# https://github.com/JCTools/JCTools/issues/254
+Obsoletes:      %{name}-channels < 3.1.0-1
+Obsoletes:      %{name}-experimental < 3.1.0-1
 
 %description
 This project aims to offer some concurrent data structures
@@ -29,90 +38,136 @@ currently missing from the JDK:
 ° Low contention stats counters
 ° Executor
 
-%package experimental
-Summary:       JCTools Experimental implementations
-
-%description experimental
-Experimental implementations for the
-Java Concurrency Tools Library.
 
 %package javadoc
-Summary:       Javadoc for %{name}
+Summary:        Javadoc for %{name}
 
 %description javadoc
 This package contains javadoc for %{name}.
 
-%package parent
-Summary:       JCTools Parent POM
-
-%description parent
-JCTools Parent POM.
 
 %prep
-%setup -q -n JCTools-%{namedversion}
-# Cleanup
-find . -name '*.class' -print -delete
-find . -name '*.jar' -print -delete
+%setup -q -n %{srcname}-%{version}
 
-%pom_xpath_set pom:project/pom:version %{namedversion}
-%pom_xpath_set -r pom:parent/pom:version %{namedversion} %{name}-core %{name}-experimental
+# drop some failure-prone tests (race conditions?)
+rm jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscCompound.java
+rm jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscCompound.java
+rm jctools-core/src/test/java/org/jctools/maps/NonBlockingHashMapTest.java
 
-# Prevent build failure
+# set correct version in all pom.xml files
+%pom_xpath_set pom:project/pom:version %{version}
+%pom_xpath_set pom:parent/pom:version %{version} jctools-{build,core,channels,experimental}
+
+# remove plugins unnecessary for RPM builds
+%pom_remove_plugin :coveralls-maven-plugin jctools-core
+%pom_remove_plugin :jacoco-maven-plugin jctools-core
 %pom_remove_plugin :maven-enforcer-plugin
+%pom_remove_plugin :maven-source-plugin jctools-core
+%pom_remove_plugin :maven-javadoc-plugin jctools-core
 
-# Unavailable deps
-%pom_disable_module %{name}-benchmarks
-%pom_disable_module %{name}-concurrency-test
+# remove tests with additional kotlin dependencies
+%pom_remove_dep org.jetbrains.kotlinx:lincheck jctools-core
+rm -r jctools-core/src/test/java/org/jctools/maps/linearizability_test/
 
-# This dep is unused and unneeded
-%pom_remove_dep "com.google.guava:guava-testlib" jctools-experimental
+# disable unused modules with unavailable dependencies
+%pom_disable_module jctools-benchmarks
+%pom_disable_module jctools-concurrency-test
 
-# Not available
-%pom_remove_plugin :cobertura-maven-plugin %{name}-core
+# incompatible with Java 11 and unused in fedora:
+# https://github.com/JCTools/JCTools/issues/254
+%pom_disable_module jctools-channels
+%pom_disable_module jctools-experimental
 
-# Useless tasks
-%pom_remove_plugin :maven-source-plugin %{name}-core
-%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:executions" %{name}-core
+%pom_disable_module jctools-build
+%pom_remove_plugin :exec-maven-plugin jctools-core
+
+# do not install internal build tools
+%mvn_package :jctools-build __noinstall
+
+# do not install unused parent POM
+%mvn_package :jctools-parent __noinstall
 
-# Add OSGi support
-for mod in core experimental; do
- %pom_xpath_set "pom:project/pom:packaging" bundle %{name}-${mod}
- %pom_add_plugin org.apache.felix:maven-bundle-plugin:2.3.7 %{name}-${mod} '
- <extensions>true</extensions>
- <executions>
-   <execution>
-     <id>bundle-manifest</id>
-     <phase>process-classes</phase>
-     <goals>
-       <goal>manifest</goal>
-     </goals>
-   </execution>
- </executions>
- <configuration>
-  <excludeDependencies>true</excludeDependencies>
- </configuration>'
-done
 
 %build
+# Tests time out in CentOS Stream 9 Koji
+%mvn_build -s -f
 
-%mvn_build -s
 
 %install
 %mvn_install
 
-%files -f .mfiles-%{name}-core
+
+%files -f .mfiles-jctools-core
 %doc README.md
 %license LICENSE
 
-%files experimental -f .mfiles-%{name}-experimental
-
 %files javadoc -f .mfiles-javadoc
 %license LICENSE
 
-%files parent -f .mfiles-%{name}-parent
-%license LICENSE
 
 %changelog
+* Wed Feb 23 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-3
+- Build with OpenJDK 8
+
+* Mon Feb 21 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-2
+- Remove dependency on javaparser and exec-maven-plugin
+- Disable tests
+
+* Tue Aug 10 2021 Sérgio Basto <sergio@serjux.com> - 3.3.0-1
+- Update to 3.3.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Feb 02 2021 Fabio Valentini <decathorpe@gmail.com> - 3.2.0-1
+- Update to version 3.2.0.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Sep 04 2020 Mat Booth <mat.booth@redhat.com> - 3.1.0-1
+- Update to latest upstream version
+- Obsolete sub-packages that cannot be built on JDK 11
+
+* Tue Jul 28 2020 Mat Booth <mat.booth@redhat.com> - 2.1.2-10
+- Patch for javaparser API changes
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.1.2-8
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Fri Jun 26 2020 Roland Grunberg <rgrunber@redhat.com> - 2.1.2-7
+- Force Java 8 as we cannot build with Java 11 due to upstream bug.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Dec 19 2019 Mat Booth <mat.booth@redhat.com> - 2.1.2-5
+- Skip problematic NonBlockingHashMapTest
+
+* Mon Sep 09 2019 Fabio Valentini <decathorpe@gmail.com> - 2.1.2-4
+- Disable another failure-prone unreliable test.
+
+* Mon Sep 09 2019 Fabio Valentini <decathorpe@gmail.com> - 2.1.2-3
+- Disable failure-prone unreliable test.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Feb 13 2019 Mat Booth <mat.booth@redhat.com> - 2.1.2-1
+- Update to latest upstream release
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Sun Sep 17 2017 Mat Booth <mat.booth@redhat.com> - 2.0.2-2
 - Drop unneeded dep on guava-testlib
 
@@ -136,3 +191,4 @@ done
 
 * Tue May 19 2015 gil cattaneo <puntogil@libero.it> 1.1-0.1.alpha
 - initial rpm
+