.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1,4 @@
-SOURCES/jsr-305-20130910svn.tgz
+jsr-305-0.4.20090319.tar.xz
+/jsr-305-20130910svn.tgz
+/jsr-305-3.0.2.tar.gz
+/jcip-annotations-1.0-1.tar.gz

.jsr-305.metadata

@@ -1 +0,0 @@
-7c8efd7ef2c258e3d3393f47ef7148894f52bfbb SOURCES/jsr-305-20130910svn.tgz

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_contexts:
+  - osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

generate-tarball.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+name=jsr-305
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+
+rm -rf "${name}-${version}"
+
+git clone 'https://github.com/amaembo/jsr-305'
+pushd 'jsr-305'
+git checkout 'd7734b13c61492982784560ed5b4f4bd6cf9bb2c'
+popd
+
+mv 'jsr-305' "${name}-${version}"
+
+rm -f "${name}-${version}.tar.gz"
+tar -czf "${name}-${version}.tar.gz" "${name}-${version}"
+rm -rf "${name}-${version}"

jsr-305.spec

@@ -1,38 +1,52 @@
+%bcond_with bootstrap
+
 Name:           jsr-305
-Version:        0
+Version:        3.0.2
-Release:        0.25.20130910svn%{?dist}
+Release:        17%{?dist}
 Summary:        Correctness annotations for Java code
 
-# The majority of code is BSD-licensed, but some Java sources
+# The majority of code is BSD-licensed.
-# are licensed under CC-BY license, see: $ grep -r Creative .
+# JCIP annotations are Apache-licensed.
-License:        BSD and CC-BY
+License:        BSD-3-Clause AND Apache-2.0
-URL:            http://jsr-305.googlecode.com/
+URL:            https://code.google.com/p/jsr-305
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-# There has been no official release yet.  This is a snapshot of the Subversion
+# ./generate-tarball.sh
-# repository as of 10 Sep 2013.  Use the following commands to generate the
+Source0:        %{name}-%{version}.tar.gz
-# tarball:
+Source1:        https://github.com/stephenc/jcip-annotations/archive/refs/tags/jcip-annotations-1.0-1.tar.gz
-#   svn export -r 51 http://jsr-305.googlecode.com/svn/trunk jsr-305
-#   tar -czvf jsr-305-20130910svn.tgz jsr-305
-Source0:        jsr-305-20130910svn.tgz
-# File containing URL to CC-BY license text
-Source1:        NOTICE-CC-BY.txt
 
-BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+%endif
 
 %description
 This package contains reference implementations, test cases, and other
 documents for Java Specification Request 305: Annotations for Software Defect
 Detection.
 
-%{?module_package}
 %{?javadoc_package}
 
 %prep
-%setup -q -n %{name}
+%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
 
 %mvn_file :ri %{name}
 %mvn_alias :ri com.google.code.findbugs:jsr305
@@ -41,26 +55,114 @@ cp %{SOURCE1} NOTICE-CC-BY
 # do not build sampleUses module - it causes Javadoc generation to fail
 %pom_disable_module sampleUses
 
+%pom_remove_parent ri
+%pom_add_parent org.jsr-305:jsr-305:0.1-SNAPSHOT ri
+
+%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin ri
+%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin ri
+%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin ri
+%pom_remove_plugin org.apache.maven.plugins:maven-gpg-plugin ri
+
 %build
 %mvn_build
 
 %install
 %mvn_install
 
-%files -n %{?module_prefix}%{name} -f .mfiles
+%files -f .mfiles
-%license ri/LICENSE NOTICE-CC-BY
+%license ri/LICENSE jcip-annotations-jcip-annotations-1.0-1/LICENSE.txt
 %doc sampleUses
 
 %changelog
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.0.2-17
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* 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
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.0.2-5
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* 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
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.31.20130910svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Sep 11 2020 Marian Koncek <mkoncek@redhat.com> - 3.0.2-1
+- Rebuild a properly versioned package
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.30.20130910svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0-0.29.20130910svn
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Sat May 23 2020 Richard Fearn <richardfearn@gmail.com> - 0-0.28.20130910svn
+- Enable building with JDK 11: use source/target 1.8
+
+* Sun Feb 02 2020 Richard Fearn <richardfearn@gmail.com> - 0-0.27.20130910svn
+- Use %%license
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.26.20130910svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 0-0.25.20130910svn
 - Build with OpenJDK 8
 
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0-0.24.20130910svn
 - Mass rebuild for javapackages-tools 201902
 
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.25.20130910svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0-0.23.20130910svn
 - Mass rebuild for javapackages-tools 201901
 
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.24.20130910svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.23.20130910svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.22.20130910svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

plans/javapackages.fmf

@@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: c10s
+execute:
+  how: tmt

sources

@@ -0,0 +1,2 @@
+SHA512 (jsr-305-3.0.2.tar.gz) = 378df0a3bb91d6ebf2e1673ff09e9c416734508a724c772834bed8d15d158d844c437ed126b2b8602997a3241cf2487b8bae9d00aa0cabe6464cebaf25bbcaeb
+SHA512 (jcip-annotations-1.0-1.tar.gz) = 22eb285a445b25a718846dad45581dbe7a324a2d670bd05f4b2aa5e850ae34af6bcedbf143e17a7cd6cf7e510e0dd447992ba1d5316432e8a8db5584a1e1973e