Sync from SUSE:SLFO:Main glassfish-jaxb-api revision cfb135b5d608ba4d3374e0b8c0c989a5

glassfish-jaxb-api-build.xml

@@ -10,7 +10,8 @@
   <property name="project.artifactId" value="jaxb-api"/>
   <property name="project.version" value="2.4.0"/>
 
-  <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}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -52,6 +53,7 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
+           release="${compiler.release}" 
            target="${compiler.target}" 
            verbose="false" 
            fork="false" 
@@ -65,14 +67,16 @@
     <!-- Build Multi-Release classes for Java 9 -->
     <mkdir dir="${build.outputDir.Java9}"/>
     <javac destdir="${build.outputDir.Java9}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="${compiler.target}" 
-           verbose="false" 
-           fork="false" 
-           source="${compiler.source}">
+           nowarn="false"
+           debug="true"
+           encoding="utf-8"
+           optimize="false"
+           deprecation="true"
+           release="9"
+           target="9"
+           verbose="false"
+           fork="false"
+           source="9">
       <src>
         <pathelement location="${build.srcDir.Java9}"/>
       </src>
@@ -82,12 +86,13 @@
       </classpath>
     </javac>
     <!-- Build the module-info.jar file -->
-    <javac destdir="${build.outputDir}"
+    <javac destdir="${build.outputDir.Java9}"
            nowarn="false"
            debug="true"
            encoding="utf-8"
            optimize="false"
            deprecation="true"
+           release="9"
            target="9"
            verbose="false"
            fork="false"

glassfish-jaxb-api.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Apr 29 15:33:30 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- The binaries are compatible with java 1.8
+
+-------------------------------------------------------------------
+Wed Feb 21 22:02:16 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Clean the spec file and simplify it a bit
+
 -------------------------------------------------------------------
 Sun Apr 10 19:13:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

glassfish-jaxb-api.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package glassfish-jaxb-api
 #
-# 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
@@ -18,6 +18,9 @@
 
 %global oname jaxb-spec
 %global bundle jaxb-api
+# The automatic requires would be java-headless >= 9, but the
+# binaries are java 8 compatible
+%define __requires_exclude java-headless
 Name:           glassfish-jaxb-api
 Version:        2.4.0
 Release:        0
@@ -31,9 +34,9 @@ BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  glassfish-activation-api
 BuildRequires:  java-devel >= 9
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  unzip
-Requires:       mvn(javax.activation:javax.activation-api)
+Requires:       java-headless >= 1.8
 BuildArch:      noarch
 
 %description
@@ -62,18 +65,6 @@ cp %{SOURCE1} jaxb-api/build.xml
 %pom_remove_plugin :cobertura-maven-plugin jaxb-api
 %pom_remove_plugin :maven-dependency-plugin jaxb-api
 
-%pom_remove_parent jaxb-api
-%pom_xpath_inject pom:project "
-  <groupId>javax.xml.bind</groupId>
-  <version>%{version}</version>" jaxb-api
-
-%pom_xpath_inject "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:configuration" "
-    <sourceFileExcludes>
-        <exclude>module-info.java</exclude>
-    </sourceFileExcludes>" jaxb-api
-
-%pom_change_dep ::::: ::::: jaxb-api
-
 %build
 pushd jaxb-api
 mkdir -p lib
@@ -88,7 +79,7 @@ install -m 644 %{bundle}/target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{bundle}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} %{bundle}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar
 
 # javadoc