diff --git a/0001-adapt-maven-compiler-plugin.patch b/0001-adapt-maven-compiler-plugin.patch new file mode 100644 index 0000000..08e11e9 --- /dev/null +++ b/0001-adapt-maven-compiler-plugin.patch @@ -0,0 +1,65 @@ +From 1d32d1cbca37106f76bd4d7ab855c9391eab798e Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Fri, 5 May 2023 16:42:52 +0800 +Subject: [PATCH] adapt maven compiler plugin + +--- + streambuffer/pom.xml | 34 +++++++++------------------------- + 1 file changed, 9 insertions(+), 25 deletions(-) + +diff --git a/streambuffer/pom.xml b/streambuffer/pom.xml +index d3ddd1c..d4dd85c 100644 +--- a/streambuffer/pom.xml ++++ b/streambuffer/pom.xml +@@ -159,6 +159,9 @@ + maven-javadoc-plugin + 3.0.1 + ++ ++ module-info.java ++ + -Xdoclint:none + + +@@ -301,32 +304,13 @@ + + org.apache.maven.plugins + maven-compiler-plugin +- 3.7.0 +- +- +- default-compile +- +- compile +- +- +- 9 +- +- +- +- base-compile +- +- compile +- +- +- 7 +- +- module-info.java +- +- +- +- ++ 2.5.1 + +- 9 ++ 1.5 ++ 1.5 ++ ++ module-info.java ++ + + + +-- +2.33.0 + diff --git a/1.5.6.tar.gz b/1.5.6.tar.gz new file mode 100644 index 0000000..5b06ee6 Binary files /dev/null and b/1.5.6.tar.gz differ diff --git a/streambuffer-1.5.4.tar.gz b/streambuffer-1.5.4.tar.gz deleted file mode 100644 index 901b03d..0000000 Binary files a/streambuffer-1.5.4.tar.gz and /dev/null differ diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec index 2e57ffe..44e8072 100644 --- a/xmlstreambuffer.spec +++ b/xmlstreambuffer.spec @@ -1,10 +1,11 @@ Name: xmlstreambuffer -Version: 1.5.4 -Release: 2 +Version: 1.5.6 +Release: 1 Summary: XML Stream Buffer License: CDDL-1.1 or GPLv2 with exceptions URL: http://java.net/projects/xmlstreambuffer/ -Source0: https://github.com/javaee/metro-xmlstreambuffer/archive/streambuffer-%{version}.tar.gz +Source0: https://github.com/javaee/metro-xmlstreambuffer/archive/refs/tags/%{version}.tar.gz +Patch0: 0001-adapt-maven-compiler-plugin.patch BuildRequires: jvnet-parent maven-local maven-enforcer-plugin maven-plugin-bundle BuildRequires: maven-surefire-provider-junit stax-ex >= 1.7.1 junit woodstox-core BuildArch: noarch @@ -21,7 +22,8 @@ Obsoletes: xmlstreambuffer-javadoc < %{version}-%{release} This package contains of man files for xmlstreambuffer. %prep -%autosetup -n metro-xmlstreambuffer-streambuffer-%{version} -p1 +%autosetup -n metro-xmlstreambuffer-%{version} -p1 +cd streambuffer %pom_remove_plugin :maven-deploy-plugin %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :findbugs-maven-plugin @@ -29,21 +31,29 @@ This package contains of man files for xmlstreambuffer. %pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :buildnumber-maven-plugin %pom_remove_plugin :maven-enforcer-plugin -%pom_xpath_set "pom:dependency[pom:groupId = 'org.codehaus.woodstox']/pom:artifactId" woodstox-core-asl rm -r test/com/sun/xml/stream/buffer/stax/InscopeNamespaceTest.java %mvn_file :streambuffer xmlstreambuffer +cd - %build -%mvn_build +cd streambuffer +rm -rf src/module-info.java +%mvn_build --xmvn-javadoc +cd - %install +cd streambuffer %mvn_install +cd - -%files -f .mfiles +%files -f streambuffer/.mfiles -%files help -f .mfiles-javadoc +%files help -f streambuffer/.mfiles-javadoc %changelog +* Fri May 05 2023 Ge Wang - 1.5.6-1 +- Update to version 1.5.6 + * Mon Jun 20 2022 Chenyx - 1.5.4-2 - License compliance rectification