Accepting request 1170004 from Java:packages

commons-ognl should be explicit dependency

OBS-URL: https://build.opensuse.org/request/show/1170004
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mybatis?expand=0&rev=11

mybatis.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Wed Apr 24 09:15:10 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Make the apache-commons-ognl a non-optional dependency
+
+-------------------------------------------------------------------
+Wed Feb 21 10:51:56 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Sat Sep  9 14:42:27 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Reproducible builds: use SOURCE_DATE_EPOCH for timestamp
+
+-------------------------------------------------------------------
+Thu May 25 10:56:16 UTC 2023 - Stefan Bluhm <stefan.bluhm@clacee.eu>
+
+- Fix for Enterprise Linux to allow building with log4j v1 and v2
+  dependencies.
+
+-------------------------------------------------------------------
+Wed Sep  7 10:59:38 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Help the build to chose slf4j-reload4j if it exists
+
 -------------------------------------------------------------------
 Sun Jun 19 14:18:33 UTC 2022 - Michael Calmer <mc@suse.com>
 

mybatis.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mybatis
 #
-# 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
@@ -72,8 +72,9 @@ This package contains javadoc for %{name}.
 %prep
 %setup -q -n %{name}-3-%{name}-%{version}
 
-%pom_change_dep ognl:ognl org.apache.commons:commons-ognl:4.0-SNAPSHOT
+%pom_remove_dep ognl:ognl
-%patch0 -p1
+%pom_add_dep org.apache.commons:commons-ognl:4.0-SNAPSHOT
+%patch -P 0 -p1
 
 %pom_remove_plugin :maven-pdf-plugin
 %pom_remove_plugin :maven-shade-plugin
@@ -83,11 +84,18 @@ sed -i 's/\r//' LICENSE NOTICE
 %{mvn_file} :%{name} %{name}
 
 %build
+
+# Build despite duplicate log4j availability (v1 and v2)
+%if 0%{?rhel}
+%{mvn_config} resolverSettings/ignoreDuplicateMetadata false
+%endif
+
 %{mvn_build} -f -- \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-	-Dmaven.compiler.release=8 \
+    -Dmaven.compiler.release=8 \
 %endif
-	-Dproject.build.sourceEncoding=UTF-8
+    -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
+    -Dproject.build.sourceEncoding=UTF-8
 
 %install
 %mvn_install