diff --git a/.gitignore b/.gitignore index 464bdf1..e26bb2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/jsr-305-20130910svn.tgz +SOURCES/jcip-annotations-1.0-1.tar.gz +SOURCES/jsr-305-3.0.2.tar.gz diff --git a/.jsr-305.metadata b/.jsr-305.metadata index 1868958..232edf0 100644 --- a/.jsr-305.metadata +++ b/.jsr-305.metadata @@ -1 +1,2 @@ -7c8efd7ef2c258e3d3393f47ef7148894f52bfbb SOURCES/jsr-305-20130910svn.tgz +026833aa9f5941d7b211f094be691ca47584aec3 SOURCES/jcip-annotations-1.0-1.tar.gz +23902b1b212fc8cb497d4483dcd44492207f610e SOURCES/jsr-305-3.0.2.tar.gz diff --git a/SOURCES/NOTICE-CC-BY.txt b/SOURCES/NOTICE-CC-BY.txt deleted file mode 100644 index ab3e0dd..0000000 --- a/SOURCES/NOTICE-CC-BY.txt +++ /dev/null @@ -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 diff --git a/SPECS/jsr-305.spec b/SPECS/jsr-305.spec index ce22011..a8d9da6 100644 --- a/SPECS/jsr-305.spec +++ b/SPECS/jsr-305.spec @@ -1,38 +1,55 @@ +%bcond_with bootstrap + Name: jsr-305 -Version: 0 -Release: 0.25.20130910svn%{?dist} +Version: 3.0.2 +Release: 36%{?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 -URL: http://jsr-305.googlecode.com/ +# 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 -# There has been no official release yet. This is a snapshot of the Subversion -# repository as of 10 Sep 2013. Use the following commands to generate the -# tarball: -# 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 +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz +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 %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} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep -%setup -q -n %{name} -cp %{SOURCE1} NOTICE-CC-BY +%autosetup -p1 -%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 + +%pom_xpath_set '/pom:project/pom:groupId' 'org.jsr-305' ri/pom.xml +%pom_xpath_set '/pom:project/pom:artifactId' 'ri' ri/pom.xml %mvn_file :ri %{name} %mvn_alias :ri com.google.code.findbugs:jsr305 @@ -41,26 +58,122 @@ 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 -%license ri/LICENSE NOTICE-CC-BY +%files -f .mfiles +%license ri/LICENSE jcip-annotations-jcip-annotations-1.0-1/LICENSE.txt %doc sampleUses +%files javadoc -f .mfiles-javadoc + %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.0.2-34 +- Update javapackages test plan to f42 + +* Sat Nov 23 2024 Marian Koncek - 3.0.2-33 +- Use xpath macros instead of sed + +* Tue Jul 30 2024 Mikolaj Izdebski - 3.0.2-17 +- Replace CC-BY-2.5 annotations with Apache-2.0 ones +- Resolves: rhbz#2301569 + +* Thu Jul 18 2024 Fedora Release Engineering - 3.0.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.0.2-15 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 3.0.2-14 +- bump of release for for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 3.0.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 3.0.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 3.0.2-11 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.0.2-10 +- Convert License tag to SPDX format + +* Tue Aug 15 2023 Mikolaj Izdebski - 3.0.2-9 +- Build with default JDK 17 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.0.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.0.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 3.0.2-5 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.0.2-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 0-0.31.20130910svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Sep 11 2020 Marian Koncek - 3.0.2-1 +- Rebuild a properly versioned package + +* Tue Jul 28 2020 Fedora Release Engineering - 0-0.30.20130910svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 0-0.29.20130910svn +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Sat May 23 2020 Richard Fearn - 0-0.28.20130910svn +- Enable building with JDK 11: use source/target 1.8 + +* Sun Feb 02 2020 Richard Fearn - 0-0.27.20130910svn +- Use %%license + +* Wed Jan 29 2020 Fedora Release Engineering - 0-0.26.20130910svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jan 25 2020 Mikolaj Izdebski - 0-0.25.20130910svn - Build with OpenJDK 8 * Tue Nov 05 2019 Mikolaj Izdebski - 0-0.24.20130910svn - Mass rebuild for javapackages-tools 201902 +* Thu Jul 25 2019 Fedora Release Engineering - 0-0.25.20130910svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 0-0.23.20130910svn - Mass rebuild for javapackages-tools 201901 +* Fri Feb 01 2019 Fedora Release Engineering - 0-0.24.20130910svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0-0.23.20130910svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0-0.22.20130910svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild