diff --git a/0001-fix-maven-compiler-plugin-release-flag.patch b/0001-fix-maven-compiler-plugin-release-flag.patch new file mode 100644 index 0000000000000000000000000000000000000000..11c600cd94c2b4a87bcd4d6b02793c7723a6d784 --- /dev/null +++ b/0001-fix-maven-compiler-plugin-release-flag.patch @@ -0,0 +1,186 @@ +From 92ae7610d3af4e9a4785b4009a86e852b462f3d0 Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Fri, 31 Dec 2021 17:45:51 +0800 +Subject: [PATCH] fix maven compiler plugin release flag + +--- + stax-ex/pom.xml | 121 +++++++++--------------------------------------- + 1 file changed, 21 insertions(+), 100 deletions(-) + +diff --git a/stax-ex/pom.xml b/stax-ex/pom.xml +index 7d59984..b6a91ac 100644 +--- a/stax-ex/pom.xml ++++ b/stax-ex/pom.xml +@@ -127,30 +127,11 @@ + maven-jar-plugin + 3.1.0 + +- +- maven-deploy-plugin +- 2.8.2 +- +- +- org.codehaus.mojo +- findbugs-maven-plugin +- 3.0.5 +- +- +- org.glassfish.copyright +- glassfish-copyright-maven-plugin +- 1.49 +- + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + +- +- org.codehaus.mojo +- buildnumber-maven-plugin +- 1.4 +- + + org.apache.felix + maven-bundle-plugin +@@ -190,7 +171,9 @@ + + default-compile + +- 9 ++ 1.7 ++ 1.7 ++ UTF-8 + + + +@@ -200,60 +183,33 @@ + compile + + +- 7 +- +- module-info.java +- ++ 1.7 ++ 1.7 ++ UTF-8 + + + + +- 7 ++ 1.7 ++ 1.7 ++ UTF-8 + + + + org.apache.maven.plugins + maven-javadoc-plugin +- +- -Xdoclint:none +- +- +- +- org.codehaus.mojo +- findbugs-maven-plugin +- +- ${findbugs.skip} +- ${findbugs.threshold} +- true +- +- exclude-common.xml,${findbugs.exclude} +- +- true +- -Xms64m -Xmx256m +- +- +- +- org.glassfish.findbugs +- findbugs +- 1.7 +- +- +- +- +- org.glassfish.copyright +- glassfish-copyright-maven-plugin +- +- ${project.basedir}/copyright.txt +- ${project.basedir}/copyright-exclude +- +- true +- +- true +- +- false +- +- false +- ++ ++ ++ attach-javadocs ++ package ++ ++ jar ++ ++ ++ -Xdoclint:none ++ ++ ++ + + + org.codehaus.mojo +@@ -269,34 +225,6 @@ + + + +- +- org.codehaus.mojo +- buildnumber-maven-plugin +- +- true +- {0,date,yyyy-MM-dd'T'HH:mm:ssZ} +- +- javasvn +- +- true +- false +- +- +- +- validate +- +- create +- +- +- +- +- +- org.tmatesoft.svnkit +- svnkit +- 1.7.4-v1 +- +- +- + + maven-jar-plugin + +@@ -324,13 +252,6 @@ + + + +- +- org.apache.maven.plugins +- maven-deploy-plugin +- +- 10 +- +- + + + +-- +2.30.0 + diff --git a/1.8.tar.gz b/1.8.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..637192d6d76d97df72b519f83961f7c921678c06 Binary files /dev/null and b/1.8.tar.gz differ diff --git a/stax-ex-1.7.7.tar.gz b/stax-ex-1.7.7.tar.gz deleted file mode 100644 index 058809cb25a7a3ec8e97b58f498ff0b09352ed4d..0000000000000000000000000000000000000000 Binary files a/stax-ex-1.7.7.tar.gz and /dev/null differ diff --git a/stax-ex.spec b/stax-ex.spec index 411e71117841f02b6bb023f8418f97cdb356f742..ed2668ddd076f05bb8aa6606a97b45ea141a016f 100644 --- a/stax-ex.spec +++ b/stax-ex.spec @@ -1,13 +1,14 @@ Name: stax-ex -Version: 1.7.7 -Release: 12 +Version: 1.8 +Release: 1 Summary: StAX API extensions License: CDDL or GPLv2 Url: https://stax-ex.dev.java.net -Source0: https://github.com/javaee/metro-stax-ex/archive/stax-ex-%{version}.tar.gz -BuildRequires: dos2unix maven-local mvn(javax.xml.stream:stax-api) mvn(junit:junit) -BuildRequires: mvn(net.java:jvnet-parent:pom:) mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +Source0: https://github.com/javaee/metro-stax-ex/archive/%{version}.tar.gz +Source1: xmvn-reactor +Patch0: 0001-fix-maven-compiler-plugin-release-flag.patch +BuildRequires: maven java-1.8.0-openjdk-devel dos2unix maven-local +Requires: javapackages-tools java-1.8.0-openjdk BuildArch: noarch %description @@ -25,30 +26,45 @@ Obsoletes: stax-ex-javadoc < %{version}-%{release} The package provides javadoc for stax-ex. %prep -%autosetup -n metro-stax-ex-stax-ex-%{version} -p1 -%pom_remove_dep javax.activation:activation -%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin -%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin -%pom_remove_plugin org.glassfish.copyright:glassfish-copyright-maven-plugin -%pom_remove_plugin org.apache.maven.plugins:maven-deploy-plugin +%autosetup -n metro-stax-ex-%{version} -p1 +find . -name '*.jar' -print -delete +find . -name '*.class' -print -delete +pushd %{name} +cp %{SOURCE1} ./.xmvn-reactor +echo `pwd` > absolute_prefix.log +sed -i 's/\//\\\//g' absolute_prefix.log +absolute_prefix=`head -n 1 absolute_prefix.log` +sed -i 's/absolute-prefix/'"$absolute_prefix"'/g' .xmvn-reactor +rm -rf src/java/module-info.java mv LICENSE.txt LICENSE.txt.tmp iconv -f ISO-8859-1 -t UTF-8 LICENSE.txt.tmp > LICENSE.txt dos2unix LICENSE.txt %mvn_file :stax-ex stax-ex +popd %build -%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 +pushd %{name} +mvn -Dproject.build.sourceEncoding=UTF-8 -DskipTests -DskipIT package +popd %install +pushd %{name} %mvn_install +popd +install -d -m 0755 %{buildroot}/%{_javadocdir}/%{name} +install -m 0755 %{name}/target/stax-ex-1.8-javadoc.jar %{buildroot}/%{_javadocdir}/%{name} -%files -f .mfiles -%license LICENSE.txt +%files -f %{name}/.mfiles +%license LICENSE -%files help -f .mfiles-javadoc -%license LICENSE.txt +%files help +%license LICENSE +%{_javadocdir}/%{name} %changelog +* Tue Apr 19 2022 wangkai - 1.8-1 +- Update to version 1.8 + * Fri Jul 30 2021 chenyanpanHW - 1.7.7-12 - DESC: delete -S git from %autosetup, and delete BuildRequires git diff --git a/xmvn-reactor b/xmvn-reactor new file mode 100644 index 0000000000000000000000000000000000000000..385bc3c867b0f36a1685840ee2d4173465a1efb0 --- /dev/null +++ b/xmvn-reactor @@ -0,0 +1,26 @@ + + + + + org.jvnet.staxex + stax-ex + 1.8 + absolute-prefix/target/stax-ex-1.8.jar + + jar + 1.6 + + + + org.jvnet.staxex + stax-ex + pom + 1.8 + absolute-prefix/pom.xml + + jar + 1.6 + + + +