diff --git a/jaxb2-common-basics.spec b/jaxb2-common-basics.spec index ae400b50302389a74001adc56274be477280627b..1cbc625d0c20626f973dbd1cbd46c988601458d9 100644 --- a/jaxb2-common-basics.spec +++ b/jaxb2-common-basics.spec @@ -1,6 +1,6 @@ Name: jaxb2-common-basics Version: 0.9.5 -Release: 1 +Release: 2 Summary: JAXB2 Basics License: BSD Url: https://github.com/highsource/jaxb2-basics @@ -16,7 +16,7 @@ BuildRequires: mvn(org.jvnet.jaxb2.maven2:maven-jaxb22-plugin) BuildRequires: mvn(org.jvnet.jaxb2.maven2:maven-jaxb2-plugin-testing) BuildRequires: mvn(org.slf4j:jcl-over-slf4j) mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) -BuildRequires: mvn(org.springframework:spring-context-support) mvn(xmlunit:xmlunit) +BuildRequires: springframework-context mvn(xmlunit:xmlunit) BuildArch: noarch %description JAXB2 Basics is a part of JAXB2 Commons project which @@ -31,6 +31,7 @@ This package contains javadoc for %{name}. %prep %setup -q -n jaxb2-basics-%{version} %patch0 -p1 +#%patch1 -p1 find -name "*.bat" -print -delete find -name "*.class" -print -delete find -name "*.jar" -print -delete @@ -40,9 +41,10 @@ find -name "*.jar" -print -delete %pom_disable_module dist %pom_disable_module samples %pom_disable_module tests + %pom_change_dep :ant-optional org.apache.ant:ant -%pom_change_dep -r org.springframework:spring org.springframework:spring-context-support %pom_change_dep :maven-jaxb2-plugin :maven-jaxb22-plugin +%pom_change_dep -r org.springframework:spring org.springframework:spring-context %pom_xpath_set "pom:dependency[pom:artifactId = 'tools' ]/pom:groupId" com.sun %pom_xpath_remove "pom:dependency[pom:artifactId = 'tools' ]/pom:scope" %pom_xpath_remove "pom:dependency[pom:artifactId = 'tools' ]/pom:systemPath" @@ -63,5 +65,8 @@ sed -i -e 's/com\.vividsolutions\.jts/org.locationtech.jts/' $(find -name *.java %license LICENSE %changelog +* Wed Oct 28 2020 baizhonggui - 0.9.5-2 +- Remove spring-context-support dep + * Wed Aug 5 2020 chengzihan - 0.9.5-1 - Package init