use jdk-18 to compile
(cherry picked from commit c3e6dabb6c3725e6d165c4ac1fb9d4daac078e71)
This commit is contained in:
parent
9ff3f3b8c4
commit
60d0bd95ac
14
castor.spec
14
castor.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: An open source data binding framework for Java
|
Summary: An open source data binding framework for Java
|
||||||
Name: castor
|
Name: castor
|
||||||
Version: 1.3.3
|
Version: 1.3.3
|
||||||
Release: 1
|
Release: 2
|
||||||
License: BSD and ASL 2.0
|
License: BSD and ASL 2.0
|
||||||
URL: http://castor-data-binding.github.io/castor/
|
URL: http://castor-data-binding.github.io/castor/
|
||||||
Source0: http://dist.codehaus.org/castor/%{version}/castor-%{version}-src.tgz
|
Source0: http://dist.codehaus.org/castor/%{version}/castor-%{version}-src.tgz
|
||||||
@ -16,7 +16,8 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
|
|||||||
BuildRequires: mvn(org.codehaus.castor:castor-xml) mvn(org.codehaus:codehaus-parent:pom:)
|
BuildRequires: mvn(org.codehaus.castor:castor-xml) mvn(org.codehaus:codehaus-parent:pom:)
|
||||||
BuildRequires: mvn(org.codehaus.mojo:castor-maven-plugin) mvn(org.easymock:easymock)
|
BuildRequires: mvn(org.codehaus.mojo:castor-maven-plugin) mvn(org.easymock:easymock)
|
||||||
BuildRequires: mvn(org.springframework:spring-context) mvn(oro:oro) mvn(velocity:velocity)
|
BuildRequires: mvn(org.springframework:spring-context) mvn(oro:oro) mvn(velocity:velocity)
|
||||||
BuildRequires: mvn(xmlunit:xmlunit)
|
BuildRequires: mvn(xmlunit:xmlunit) java-latest-openjdk-devel
|
||||||
|
Requires: java-latest-openjdk-headless
|
||||||
Obsoletes: castor-demo < 1.3.2
|
Obsoletes: castor-demo < 1.3.2
|
||||||
Obsoletes: castor-test < 1.3.2
|
Obsoletes: castor-test < 1.3.2
|
||||||
Obsoletes: castor-xml < 1.3.2
|
Obsoletes: castor-xml < 1.3.2
|
||||||
@ -52,8 +53,12 @@ sed -i 's@edu.umd.cs.mtc@edu.umd.cs@g' pom.xml xml/pom.xml
|
|||||||
%pom_remove_dep "javax.xml.stream:stax-api" . xml
|
%pom_remove_dep "javax.xml.stream:stax-api" . xml
|
||||||
%pom_remove_dep "stax:stax" . xml
|
%pom_remove_dep "stax:stax" . xml
|
||||||
|
|
||||||
|
%pom_xpath_set "pom:configuration/pom:source" 1.8
|
||||||
|
%pom_xpath_set "pom:configuration/pom:target" 1.8
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%mvn_build -- -Dgpg.skip=true -Dmaven.test.skip=true
|
export JAVA_HOME=/usr/lib/jvm/java-18
|
||||||
|
%mvn_build -- -Dsource=18 -Dmaven.compiler.target=18 -Dmaven.compiler.source=18 -Dgpg.skip=true -Dmaven.test.skip=true
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_install
|
%mvn_install
|
||||||
@ -66,5 +71,8 @@ sed -i 's@edu.umd.cs.mtc@edu.umd.cs@g' pom.xml xml/pom.xml
|
|||||||
%doc src/doc/license.txt src/doc/new-license.txt
|
%doc src/doc/license.txt src/doc/new-license.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 13 2022 baizhonggui <baizhonggui@h-partners.com> - 1.3.3-2
|
||||||
|
- Use jdk-18 to compile for fixing build error
|
||||||
|
|
||||||
* Wed Oct 28 2020 shaoqiang kang <kangshaoqiang1@huawei.com> - 1.3.3-1
|
* Wed Oct 28 2020 shaoqiang kang <kangshaoqiang1@huawei.com> - 1.3.3-1
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user