Accepting request 1174399 from Java:packages

Fix build with maven-plugin-plugin >= 3.11

OBS-URL: https://build.opensuse.org/request/show/1174399
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/istack-commons?expand=0&rev=8

istack-commons.changes

@@ -1,7 +1,28 @@
+-------------------------------------------------------------------
+Thu May 16 08:19:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Fix build with maven-plugin-plugin >= 3.11
+
+-------------------------------------------------------------------
+Mon Apr 29 14:43:53 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- The binaries are compatible with java 1.8
+
+-------------------------------------------------------------------
+Wed Oct 25 18:43:14 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source and target levels 8
+
+-------------------------------------------------------------------
+Wed Sep 13 06:24:30 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Reproducible builds: use SOURCE_DATE_EPOCH for timestamp
+
 -------------------------------------------------------------------
 Wed Mar 30 10:23:40 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
 - Build against the standalone JavaEE modules inconditionally
+  (jsc#SLE-23217)
 
 -------------------------------------------------------------------
 Wed Mar 23 23:31:07 UTC 2022 - Fridrich Strba <fstrba@suse.com>

istack-commons.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package istack-commons
 #
-# 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,6 +16,9 @@
 #
 
 
+# The automatic requires would be java-headless >= 9, but the
+# binaries are java 8 compatible
+%define __requires_exclude java-headless
 Name:           istack-commons
 Version:        3.0.7
 Release:        0
@@ -59,6 +62,7 @@ BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
 BuildRequires:  mvn(org.jsoup:jsoup)
 BuildRequires:  mvn(org.tukaani:xz)
+Requires:       java-headless >= 1.8
 BuildArch:      noarch
 
 %description
@@ -67,6 +71,7 @@ Code shared between JAXP, JAXB, SAAJ, and JAX-WS projects.
 %package maven-plugin
 Summary:        Istack-commons Maven Mojo
 Group:          Development/Libraries/Java
+Requires:       java-headless >= 1.8
 
 %description maven-plugin
 This package contains the istack-commons Maven Mojo.
@@ -74,6 +79,7 @@ This package contains the istack-commons Maven Mojo.
 %package -n import-properties-plugin
 Summary:        Istack-commons import properties plugin
 Group:          Development/Libraries/Java
+Requires:       java-headless >= 1.8
 
 %description -n import-properties-plugin
 This package contains the istack-commons import properties Maven Mojo.
@@ -81,6 +87,7 @@ This package contains the istack-commons import properties Maven Mojo.
 %package buildtools
 Summary:        Istack-commons buildtools
 Group:          Development/Libraries/Java
+Requires:       java-headless >= 1.8
 
 %description buildtools
 This package contains istack-commons buildtools.
@@ -88,6 +95,7 @@ This package contains istack-commons buildtools.
 %package runtime
 Summary:        Istack-commons runtime
 Group:          Development/Libraries/Java
+Requires:       java-headless >= 1.8
 
 %description runtime
 This package contains istack-commons runtime.
@@ -95,6 +103,7 @@ This package contains istack-commons runtime.
 %package soimp
 Summary:        Istack-commons soimp
 Group:          Development/Libraries/Java
+Requires:       java-headless >= 1.8
 
 %description soimp
 This package contains istack-commons soimp.
@@ -102,6 +111,7 @@ This package contains istack-commons soimp.
 %package test
 Summary:        Istack-commons test
 Group:          Development/Libraries/Java
+Requires:       java-headless >= 1.8
 
 %description test
 This package contains istack-commons test.
@@ -109,6 +119,7 @@ This package contains istack-commons test.
 %package tools
 Summary:        Istack-commons tools
 Group:          Development/Libraries/Java
+Requires:       java-headless >= 1.8
 
 %description tools
 This package contains istack-commons tools.
@@ -135,6 +146,18 @@ pushd %{name}
 
 %pom_add_dep javax.activation:javax.activation-api runtime
 
+%pom_xpath_set "pom:plugin[pom:artifactId[text()='maven-compiler-plugin']]/pom:configuration/pom:source" "1.8"
+%pom_xpath_set "pom:plugin[pom:artifactId[text()='maven-compiler-plugin']]/pom:configuration/pom:target" "1.8"
+
+%pom_xpath_set "pom:plugin[pom:artifactId[text()='maven-compiler-plugin']]/pom:executions/pom:execution[pom:id[text()='base-compile']]/pom:configuration/pom:source" "1.8" runtime tools
+%pom_xpath_set "pom:plugin[pom:artifactId[text()='maven-compiler-plugin']]/pom:executions/pom:execution[pom:id[text()='base-compile']]/pom:configuration/pom:target" "1.8" runtime tools
+%pom_xpath_set "pom:plugin[pom:artifactId[text()='maven-compiler-plugin']]/pom:executions/pom:execution[pom:id[text()='base-compile']]/pom:configuration/pom:jdkToolchain/pom:version" "1.8" runtime tools
+
+%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-plugin-plugin']" "
+  <configuration>
+    <goalPrefix>import-properties</goalPrefix>
+  </configuration>" import-properties-plugin
+
 # backward compatibility symlinks
 %{mvn_file} com.sun.istack:%{name}-buildtools %{name}-buildtools %{name}/%{name}-buildtools
 %{mvn_file} com.sun.istack:%{name}-runtime %{name}-runtime %{name}/%{name}-runtime
@@ -146,7 +169,9 @@ popd
 
 %build
 pushd %{name}
-%{mvn_build} -f -j -s -- -Dproject.build.sourceEncoding=UTF-8
+%{mvn_build} -f -j -s -- \
+    -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
+    -Dproject.build.sourceEncoding=UTF-8
 popd
 
 %install