4 changed files with 65 additions and 25 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
+SOURCES/jcip-annotations-1.0-1.tar.gz
 SOURCES/jsr-305-3.0.2.tar.gz
--- a/.jsr-305.metadata
+++ b/.jsr-305.metadata
@ -1 +1,2 @@
+026833aa9f5941d7b211f094be691ca47584aec3 SOURCES/jcip-annotations-1.0-1.tar.gz
 23902b1b212fc8cb497d4483dcd44492207f610e SOURCES/jsr-305-3.0.2.tar.gz
--- a/SOURCES/NOTICE-CC-BY.txt
+++ b/SOURCES/NOTICE-CC-BY.txt
@ -1,4 +0,0 @@
-Copyright (c) 2005 Brian Goetz
-Released under the Creative Commons Attribution License
-  (http://creativecommons.org/licenses/by/2.5)
-Official home: http://www.jcip.net
--- a/SPECS/jsr-305.spec
+++ b/SPECS/jsr-305.spec
@ -2,24 +2,24 @@

 Name:           jsr-305
 Version:        3.0.2
-Release:        7%{?dist}
+Release:        17%{?dist}
 Summary:        Correctness annotations for Java code

-# The majority of code is BSD-licensed, but some Java sources
-# are licensed under CC-BY license, see: $ grep -r Creative .
-License:        BSD and CC-BY
+# The majority of code is BSD-licensed.
+# JCIP annotations are Apache-licensed.
+License:        BSD-3-Clause AND Apache-2.0
 URL:            https://code.google.com/p/jsr-305
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch

 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
-# File containing URL to CC-BY license text
-Source1:        NOTICE-CC-BY.txt
+Source1:        https://github.com/stephenc/jcip-annotations/archive/refs/tags/jcip-annotations-1.0-1.tar.gz

-BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 %endif

@ -32,9 +32,18 @@ Detection.

 %prep
 %setup -q
-cp %{SOURCE1} NOTICE-CC-BY

-%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6
+# Replace javax.annotation.concurrent annotations (that are based on
+# code from https://jcip.net/ and are licensed under CC-BY-2.5, which
+# is not Fedora-approved for code) with a clean-room implementation
+# under Apache-2.0 from https://github.com/stephenc/jcip-annotations
+tar xf %{SOURCE1}
+rm -rf ri/src/main/java/javax/annotation/concurrent
+mv jcip-annotations-jcip-annotations-1.0-1/src/main/java/net/jcip/annotations ri/src/main/java/javax/annotation/concurrent
+sed -i /^package/s/net.jcip.annotations/javax.annotation.concurrent/ ri/src/main/java/javax/annotation/concurrent/*
+
+%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.8
+%pom_remove_plugin :maven-compiler-plugin ri

 sed -i 's|<groupId>com\.google\.code\.findbugs</groupId>|<groupId>org.jsr-305</groupId>|' ri/pom.xml
 sed -i 's|<artifactId>jsr305</artifactId>|<artifactId>ri</artifactId>|' ri/pom.xml
@ -61,25 +70,58 @@ sed -i 's|<artifactId>jsr305</artifactId>|<artifactId>ri</artifactId>|' ri/pom.x
 %mvn_install

 %files -f .mfiles
-%license ri/LICENSE NOTICE-CC-BY
+%license ri/LICENSE jcip-annotations-jcip-annotations-1.0-1/LICENSE.txt
 %doc sampleUses

 %changelog
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 3.0.2-7
- Rebuild with regenerated Requires on Java
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.0.2-17
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.0.2-16
+- Rebuilt for MSVSphere 10
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.0.2-16
+- Bump release for Aug 2024 java mass rebuild
+
+* Tue Jul 30 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.2-15
+- Replace CC-BY-2.5 annotations with Apache-2.0 ones
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.0.2-14
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.2-11
+- Rebuild to regenerate auto-Requires on java
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.2-10
+- Convert License tag to SPDX format
+
+* Tue Aug 15 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.2-9
+- Build with default JDK 17
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.2-6
- Rebuild to regenerate auto-requires
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.2-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.0.2-5
+- Rebuilt for java-17-openjdk as system jdk

-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.2-4
- Rebuild to workaround DistroBaker issue
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.2-3
- Bootstrap Maven for CentOS Stream 9
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.2-2
 - Bootstrap build