.gitignore

@@ -1 +1 @@
-SOURCES/glassfish-annotation-api-1.2-src-svn.tar.gz
+SOURCES/javax.annotation-1.3.2.tar.gz

.glassfish-annotation-api.metadata

@@ -1 +1 @@
-7699cd0404ef68ee1ddda5dfea1d953ead1663d3 SOURCES/glassfish-annotation-api-1.2-src-svn.tar.gz
+311dc9a6f9d635c696712e98bda057ce00279486 SOURCES/javax.annotation-1.3.2.tar.gz

SPECS/glassfish-annotation-api.spec

@@ -1,25 +1,28 @@
 %global namedreltag %{nil}
 %global namedversion %{version}%{?namedreltag}
 %global oname javax.annotation-api
-Name:          glassfish-annotation-api
+%global sname javax.annotation
-Version:       1.2
-Release:       15%{?dist}
-Summary:       Common Annotations API Specification (JSR 250)
-License:       CDDL-1.0 or GPLv2 with exceptions
-# http://jcp.org/en/jsr/detail?id=250
-URL:           http://glassfish.java.net/
-# svn export https://svn.java.net/svn/glassfish~svn/tags/javax.annotation-api-1.2/ glassfish-annotation-api-1.2
-# tar czf glassfish-annotation-api-1.2-src-svn.tar.gz glassfish-annotation-api-1.2
-Source0:       %{name}-%{namedversion}-src-svn.tar.gz
 
-BuildRequires: jvnet-parent
+Name:          glassfish-annotation-api
-BuildRequires: glassfish-legal
+Version:       1.3.2
+Release:       3%{?dist}
+Summary:       Common Annotations API Specification (JSR 250)
+License:       CDDL-1.1 or GPLv2 with exceptions
+
+# NOTE: The new upstream repository under the Eclipse EE4J umbrella is here:
+# https://github.com/eclipse-ee4j/common-annotations-api
+# However, the new package provides a different groupId:artifactId.
+URL:           https://github.com/javaee/%{sname}
+Source0:       %{url}/archive/%{version}/%{sname}-%{version}.tar.gz
 
 BuildRequires: maven-local
-BuildRequires: maven-plugin-bundle
+BuildRequires: mvn(net.java:jvnet-parent:pom:)
-BuildRequires: maven-remote-resources-plugin
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: maven-source-plugin
+BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
-BuildRequires: spec-version-maven-plugin
+BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires: mvn(org.glassfish.build:spec-version-maven-plugin)
+# xmvn-builddep misses this one
+BuildRequires: mvn(org.glassfish:legal)
 
 BuildArch:     noarch
 
@@ -33,33 +36,44 @@ Summary:       Javadoc for %{name}
 This package contains javadoc for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
+%setup -q -n %{sname}-%{namedversion}
+
+%pom_remove_plugin :findbugs-maven-plugin
+%pom_remove_plugin :maven-gpg-plugin
+%pom_remove_plugin :maven-javadoc-plugin
 
-%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
 %mvn_file :%{oname} %{name}
 
 %build
-
 %mvn_build
 
-sed -i 's/\r//' target/classes/META-INF/LICENSE.txt
-cp -p target/classes/META-INF/LICENSE.txt .
-
 %install
 %mvn_install
 
 %files -f .mfiles
-%license LICENSE.txt
+%license LICENSE
 
 %files javadoc -f .mfiles-javadoc
-%license LICENSE.txt
+%license LICENSE
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-15
+* Wed Apr 01 2020 Mat Booth <mat.booth@redhat.com> - 1.3.2-3
-- Mass rebuild for javapackages-tools 201902
+- Avoid explicit javadoc plugin invokation
 
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-14
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-2
-- Mass rebuild for javapackages-tools 201901
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Oct 16 2019 Fabio Valentini <decathorpe@gmail.com> - 1.3.2-1
+- Update to version 1.3.2.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild