6
0
forked from pool/mybatis

Compare commits

...

15 Commits

Author SHA256 Message Date
e57d1a44d7 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
2024-04-25 18:48:31 +00:00
ad353d39d6 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mybatis?expand=0&rev=21 2024-04-24 09:16:02 +00:00
6839355844 Accepting request 1148619 from Java:packages
rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148619
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mybatis?expand=0&rev=10
2024-02-21 17:00:28 +00:00
8c5746ba6f rpm 4.20 compat
OBS-URL: https://build.opensuse.org/package/show/Java:packages/mybatis?expand=0&rev=19
2024-02-21 10:51:58 +00:00
448ee3e403 Accepting request 1109988 from Java:packages
Reproducible builds improvement

OBS-URL: https://build.opensuse.org/request/show/1109988
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mybatis?expand=0&rev=9
2023-09-10 11:10:56 +00:00
03220605f0 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mybatis?expand=0&rev=17 2023-09-09 14:42:36 +00:00
4f82325f10 Accepting request 1105111 from Java:packages
RHEL fixes

OBS-URL: https://build.opensuse.org/request/show/1105111
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mybatis?expand=0&rev=8
2023-08-23 12:57:14 +00:00
a161fb18da Accepting request 1089006 from home:sbluhm:branches:systemsmanagement:Uyuni:Master:Other
- Fix for Enterprise Linux to allow building with log4j v1 and v2
  dependencies.

OBS-URL: https://build.opensuse.org/request/show/1089006
OBS-URL: https://build.opensuse.org/package/show/Java:packages/mybatis?expand=0&rev=15
2023-05-25 11:37:29 +00:00
15dafa056a Accepting request 1001718 from Java:packages
help build system to chose the right provider

OBS-URL: https://build.opensuse.org/request/show/1001718
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mybatis?expand=0&rev=7
2022-09-08 12:22:43 +00:00
1d0b1d1df0 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mybatis?expand=0&rev=13 2022-09-07 11:00:14 +00:00
853dda6deb Accepting request 1000797 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/1000797
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mybatis?expand=0&rev=6
2022-09-02 19:56:21 +00:00
6396904c28 Accepting request 998644 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/998644
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mybatis?expand=0&rev=5
2022-08-23 12:29:42 +00:00
e3a9e8b850 Accepting request 998535 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/998535
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mybatis?expand=0&rev=4
2022-08-22 09:04:59 +00:00
8a0ab5214b Accepting request 957077 from Java:packages
Build against reload4j

OBS-URL: https://build.opensuse.org/request/show/957077
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mybatis?expand=0&rev=3
2022-02-23 18:06:58 +00:00
05536de080 Accepting request 841697 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/841697
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mybatis?expand=0&rev=2
2020-10-14 13:39:25 +00:00
2 changed files with 39 additions and 5 deletions

View File

@@ -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>

View File

@@ -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
%patch0 -p1
%pom_remove_dep ognl:ognl
%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,10 +84,17 @@ 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 \
%endif
-Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
-Dproject.build.sourceEncoding=UTF-8
%install