diff --git a/castor.spec b/castor.spec index 04d81e3..211c777 100644 --- a/castor.spec +++ b/castor.spec @@ -1,7 +1,7 @@ Summary: An open source data binding framework for Java Name: castor Version: 1.3.3 -Release: 1 +Release: 2 License: BSD and ASL 2.0 URL: http://castor-data-binding.github.io/castor/ 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.mojo:castor-maven-plugin) mvn(org.easymock:easymock) 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-test < 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 "stax:stax" . xml +%pom_xpath_set "pom:configuration/pom:source" 1.8 +%pom_xpath_set "pom:configuration/pom:target" 1.8 + %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 %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 %changelog +* Mon Jun 13 2022 baizhonggui - 1.3.3-2 +- Use jdk-18 to compile for fixing build error + * Wed Oct 28 2020 shaoqiang kang - 1.3.3-1 - Package init