From b9d5d24b03c0d077717b5c59438bac32c1102d99b726960ffc0dbacbf5f9c291 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 25 Apr 2024 08:52:09 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apiguardian?expand=0&rev=6 --- ...api-1.0.0.pom => apiguardian-api-1.1.2.pom | 9 ++++-- apiguardian-build.xml | 29 +++++++++++++++++-- apiguardian.spec | 8 +++-- r1.0.0.tar.gz | 3 -- r1.1.2.tar.gz | 3 ++ 5 files changed, 41 insertions(+), 11 deletions(-) rename apiguardian-api-1.0.0.pom => apiguardian-api-1.1.2.pom (69%) delete mode 100644 r1.0.0.tar.gz create mode 100644 r1.1.2.tar.gz diff --git a/apiguardian-api-1.0.0.pom b/apiguardian-api-1.1.2.pom similarity index 69% rename from apiguardian-api-1.0.0.pom rename to apiguardian-api-1.1.2.pom index 218ea27..66714af 100644 --- a/apiguardian-api-1.0.0.pom +++ b/apiguardian-api-1.1.2.pom @@ -1,10 +1,15 @@ - + + + + + 4.0.0 org.apiguardian apiguardian-api - 1.0.0 + 1.1.2 org.apiguardian:apiguardian-api @API Guardian https://github.com/apiguardian-team/apiguardian diff --git a/apiguardian-build.xml b/apiguardian-build.xml index dcee67b..544812b 100644 --- a/apiguardian-build.xml +++ b/apiguardian-build.xml @@ -10,7 +10,7 @@ - + @@ -22,7 +22,8 @@ - + + @@ -39,11 +40,14 @@ + + + + + + + + + + + + @@ -92,7 +115,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> - + diff --git a/apiguardian.spec b/apiguardian.spec index 909d082..a379aa1 100644 --- a/apiguardian.spec +++ b/apiguardian.spec @@ -1,7 +1,7 @@ # # spec file for package apiguardian # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: apiguardian -Version: 1.0.0 +Version: 1.1.2 Release: 0 Summary: API Guardian Java annotation License: Apache-2.0 @@ -28,7 +28,7 @@ Source1: %{name}-build.xml Source100: https://repo1.maven.org/maven2/org/apiguardian/apiguardian-api/%{version}/apiguardian-api-%{version}.pom BuildRequires: ant BuildRequires: fdupes -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 9 BuildRequires: javapackages-local BuildArch: noarch @@ -51,6 +51,8 @@ API documentation for %{name}. find -name \*.jar -delete cp -p %{SOURCE1} . +mv src/module/java/*/module-info.java src/main/java/ + %build %{ant} -f %{name}-build.xml jar javadoc diff --git a/r1.0.0.tar.gz b/r1.0.0.tar.gz deleted file mode 100644 index d8327f4..0000000 --- a/r1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f89bff4471bd353bd19462df08190e49f87444f899554981af25812694292bd4 -size 61405 diff --git a/r1.1.2.tar.gz b/r1.1.2.tar.gz new file mode 100644 index 0000000..8c99632 --- /dev/null +++ b/r1.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59655868b2f301868ae85745d3e003e17f7d75608f9d5dac8879c3f5d0e970ec +size 67267 From 61ac9072d4d36ea8e8743186b5892cf85f0a444969ac9d6ef3db68e9e3f79727 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 28 Apr 2024 13:02:00 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apiguardian?expand=0&rev=7 --- apiguardian.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apiguardian.spec b/apiguardian.spec index a379aa1..888ab04 100644 --- a/apiguardian.spec +++ b/apiguardian.spec @@ -29,7 +29,7 @@ Source100: https://repo1.maven.org/maven2/org/apiguardian/apiguardian-api/% BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 9 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildArch: noarch %description @@ -62,7 +62,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name} install -pm 0644 target/apiguardian-api-%{version}.jar %{buildroot}%{_javadir}/%{name}/apiguardian-api.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 %{SOURCE100} %{buildroot}%{_mavenpomdir}/%{name}/apiguardian-api.pom +%{mvn_install_pom} %{SOURCE100} %{buildroot}%{_mavenpomdir}/%{name}/apiguardian-api.pom %add_maven_depmap %{name}/apiguardian-api.pom %{name}/apiguardian-api.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir} From b7ccaa11b665be81cfb515109969afa2b0168ccf830326ab2632f3b317e61dd5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 29 Apr 2024 07:18:56 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apiguardian?expand=0&rev=8 --- apiguardian.changes | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/apiguardian.changes b/apiguardian.changes index c574112..861c4a5 100644 --- a/apiguardian.changes +++ b/apiguardian.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Apr 29 07:13:35 UTC 2024 - Fridrich Strba + +- Upgrade to upstream vesion 1.1.2 + * Fixes: + + Javadoc 1.8 cannot link to the published 1.1.0 API + documentation + + Add LICENSE/NOTICE to the generated jar + + Allow @API to be declared at the package level + + Explain usage of Status.DEPRECATED + + Include OSGi metadata in manifest + ------------------------------------------------------------------- Wed Mar 23 23:07:10 UTC 2022 - Fridrich Strba From 51a4c91efa411046e1641fa3ebc7f4696ec84cec87f5d41e04246eecee5b75dd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 29 Apr 2024 07:20:07 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apiguardian?expand=0&rev=9 --- apiguardian-build.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/apiguardian-build.xml b/apiguardian-build.xml index 544812b..c70a6b8 100644 --- a/apiguardian-build.xml +++ b/apiguardian-build.xml @@ -86,7 +86,6 @@ packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" - old="false" verbose="false" version="true" use="true" From 63ba044fdbd0497761422e12b1ade7049919796eddd558dd3a5caca292064ae0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 29 Apr 2024 16:35:37 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apiguardian?expand=0&rev=10 --- apiguardian.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apiguardian.spec b/apiguardian.spec index 888ab04..fcd18cb 100644 --- a/apiguardian.spec +++ b/apiguardian.spec @@ -16,6 +16,9 @@ # +# The automatic requires would be java-headless >= 9, but the +# binaries are java 8 compatible +%define __requires_exclude java-headless Name: apiguardian Version: 1.1.2 Release: 0 @@ -30,6 +33,7 @@ BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 9 BuildRequires: javapackages-local >= 6 +Requires: java-headless >= 1.8 BuildArch: noarch %description