update to version 1.5.6

This commit is contained in:
wang--ge 2023-05-05 17:08:14 +08:00
parent 69703606f9
commit 0830f8a29e
4 changed files with 83 additions and 8 deletions

View File

@ -0,0 +1,65 @@
From 1d32d1cbca37106f76bd4d7ab855c9391eab798e Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<configuration>
+ <sourceFileExcludes>
+ <exclude>module-info.java</exclude>
+ </sourceFileExcludes>
<additionalOptions>-Xdoclint:none</additionalOptions>
</configuration>
</plugin>
@@ -301,32 +304,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
- <executions>
- <execution>
- <id>default-compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <release>9</release>
- </configuration>
- </execution>
- <execution>
- <id>base-compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <release>7</release>
- <excludes>
- <exclude>module-info.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
+ <version>2.5.1</version>
<configuration>
- <release>9</release>
+ <source>1.5</source>
+ <target>1.5</target>
+ <excludes>
+ <exclude>module-info.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
--
2.33.0

BIN
1.5.6.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -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 <wang__ge@126.com> - 1.5.6-1
- Update to version 1.5.6
* Mon Jun 20 2022 Chenyx <chenyixiong3@huawei.com> - 1.5.4-2
- License compliance rectification