Accepting request 1170837 from Java:packages

1.1.2

OBS-URL: https://build.opensuse.org/request/show/1170837
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apiguardian?expand=0&rev=3

apiguardian-api-1.1.2.pom

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apiguardian</groupId>
   <artifactId>apiguardian-api</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.2</version>
   <name>org.apiguardian:apiguardian-api</name>
   <description>@API Guardian</description>
   <url>https://github.com/apiguardian-team/apiguardian</url>

apiguardian-build.xml

@@ -10,7 +10,7 @@
 
   <property name="project.groupId" value="org.apiguardian"/>
   <property name="project.artifactId" value="apiguardian-api"/>
-  <property name="project.version" value="1.0.0"/>
+  <property name="project.version" value="1.1.2"/>
   <property name="project.name" value="${project.groupId}:${project.artifactId}"/>
   <property name="project.description" value="@API Guardian"/>
 
@@ -22,7 +22,8 @@
 
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <!-- ====================================================================== -->
@@ -39,11 +40,14 @@
 
   <target name="compile" description="Compile the code">
     <mkdir dir="${build.outputDir}"/>
+    <echo message="Compiling all except module-info.java with release=8"/>
     <javac destdir="${build.outputDir}"
            nowarn="false"
            debug="true"
+           encoding="utf-8" 
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
@@ -51,6 +55,25 @@
       <src>
         <pathelement location="${build.srcDir}"/>
       </src>
+	  <exclude name="**/module-info.java"/>
+    </javac>
+    <echo message="Compiling module-info.java with release=9"/>
+    <javac destdir="${build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           encoding="utf-8" 
+           optimize="false" 
+           deprecation="true" 
+           release="9" 
+           verbose="false" 
+           fork="false">
+      <src>
+        <pathelement location="${build.srcDir}"/>
+      </src>
+	  <include name="**/module-info.java"/>
+      <modulepath>
+        <pathelement location="${build.outputDir}"/>
+      </modulepath>
     </javac>
   </target>
 
@@ -63,7 +86,6 @@
              packagenames="*"
              destdir="${reporting.outputDirectory}/apidocs"
              access="protected"
-             old="false"
              verbose="false"
              version="true"
              use="true"
@@ -92,7 +114,7 @@
          basedir="${build.outputDir}"
          excludes="**/package.html">
       <manifest>
-        <attribute name="Automatic-Module-Name" value="${project.artifactId}"/>
+        <attribute name="Implementation-Title" value="${project.artifactId}"/>
         <attribute name="Implementation-Vendor" value="apiguardian.org"/>
         <attribute name="Implementation-Version" value="${project.version}"/>
         <attribute name="Specification-Title" value="${project.artifactId}"/>

apiguardian.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Apr 29 07:13:35 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- 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 <fstrba@suse.com>
 

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
@@ -16,8 +16,11 @@
 #
 
 
+# The automatic requires would be java-headless >= 9, but the
+# binaries are java 8 compatible
+%define __requires_exclude java-headless
 Name:           apiguardian
-Version:        1.0.0
+Version:        1.1.2
 Release:        0
 Summary:        API Guardian Java annotation
 License:        Apache-2.0
@@ -28,8 +31,9 @@ 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:  javapackages-local
+BuildRequires:  java-devel >= 9
+BuildRequires:  javapackages-local >= 6
+Requires:       java-headless >= 1.8
 BuildArch:      noarch
 
 %description
@@ -51,6 +55,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
 
@@ -60,7 +66,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}