Update to OpenJDK-11 and fix LenientDateTimeFieldTest
(cherry picked from commit 2eedd48dc60441234d3ba2a1d5495017d6beb050)
This commit is contained in:
parent
033d7555af
commit
10f1cfcb67
@ -1,6 +1,6 @@
|
|||||||
Name: apache-mime4j
|
Name: apache-mime4j
|
||||||
Version: 0.8.7
|
Version: 0.8.7
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Apache JAMES Mime4j
|
Summary: Apache JAMES Mime4j
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
URL: http://james.apache.org/mime4j
|
URL: http://james.apache.org/mime4j
|
||||||
@ -13,6 +13,9 @@ BuildRequires: mvn(org.apache:apache:pom:) mvn(org.apache.felix:maven-bund
|
|||||||
BuildRequires: mvn(org.assertj:assertj-core) mvn(org.codehaus.mojo:javacc-maven-plugin)
|
BuildRequires: mvn(org.assertj:assertj-core) mvn(org.codehaus.mojo:javacc-maven-plugin)
|
||||||
BuildRequires: mvn(org.mockito:mockito-core) mvn(org.slf4j:slf4j-api)
|
BuildRequires: mvn(org.mockito:mockito-core) mvn(org.slf4j:slf4j-api)
|
||||||
BuildRequires: mvn(com.google.guava:guava)
|
BuildRequires: mvn(com.google.guava:guava)
|
||||||
|
BuildRequires: java-11-openjdk-devel
|
||||||
|
Requires: java-11-openjdk
|
||||||
|
Requires: javapackages-tools
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%description
|
%description
|
||||||
Java stream based MIME message parser.
|
Java stream based MIME message parser.
|
||||||
@ -27,20 +30,14 @@ API documentation for %{name}.
|
|||||||
%pom_remove_plugin :apache-rat-plugin
|
%pom_remove_plugin :apache-rat-plugin
|
||||||
%pom_remove_plugin :maven-jar-plugin
|
%pom_remove_plugin :maven-jar-plugin
|
||||||
%pom_disable_module assemble
|
%pom_disable_module assemble
|
||||||
sed -i 's/Date: Thu, 4 Oct 2001 20:12:26 -0700 (PDT),Thu, 4 Oct 2001 20:12:26 -0700/Date: Fri, 5 Oct 2001 03:12:26 -0700 (PDT),Fri, 5 Oct 2001 03:12:26 -0700/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
|
|
||||||
sed -i 's/Date: Wed, 16 Jul 2008 17:12:33 +0200 (PDT)/Date: Wed, 16 Jul 2008 15:12:33 +0200 (PDT)/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
|
|
||||||
sed -i 's/Date: Wed, 16 Jul 08 17:12:33 +0200/Date: Wed, 16 Jul 08 15:12:33 +0200/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
|
|
||||||
sed -i 's/Date: Wed, 16 Jul 2008 17:12:33 +0200/Date: Wed, 16 Jul 2008 15:12:33 +0200/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
|
|
||||||
sed -i 's/Date: 16 Jul 2008 17:12:33 +0200/Date: 16 Jul 2008 15:12:33 +0200/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
|
|
||||||
sed -i 's/1175052759000L/1175088759000L/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
|
|
||||||
for p in core dom storage; do
|
for p in core dom storage; do
|
||||||
%mvn_file :*$p %{name}/%{name}-$p %{name}/$p
|
%mvn_file :*$p %{name}/%{name}-$p %{name}/$p
|
||||||
done
|
done
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch riscv64
|
export JAVA_HOME=%{_jvmdir}/java-11-openjdk
|
||||||
export JAVA_TOOL_OPTIONS="-Xmx4096m"
|
export CFLAGS="${RPM_OPT_FLAGS}"
|
||||||
%endif
|
export CXXFLAGS="${RPM_OPT_FLAGS}"
|
||||||
%mvn_build
|
%mvn_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -54,6 +51,9 @@ export JAVA_TOOL_OPTIONS="-Xmx4096m"
|
|||||||
%license LICENSE NOTICE
|
%license LICENSE NOTICE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 11 2024 Dingli Zhang <dingli@iscas.ac.cn> - 0.8.7-4
|
||||||
|
- Update to OpenJDK-11 and fix LenientDateTimeFieldTest
|
||||||
|
|
||||||
* Thu Feb 29 2024 yaoxin <yao_xin001@hoperun.com> - 0.8.7-3
|
* Thu Feb 29 2024 yaoxin <yao_xin001@hoperun.com> - 0.8.7-3
|
||||||
- Fix CVE-2024-21742
|
- Fix CVE-2024-21742
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user