!8 Update to version 1.6.0

From: @wang--ge 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2024-01-02 09:52:05 +00:00 committed by Gitee
commit 0b3e30692f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 5 additions and 67 deletions

View File

@ -1,65 +0,0 @@
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

Binary file not shown.

BIN
1.6.0.tar.gz Normal file

Binary file not shown.

View File

@ -1,11 +1,10 @@
Name: xmlstreambuffer Name: xmlstreambuffer
Version: 1.5.6 Version: 1.6.0
Release: 1 Release: 1
Summary: XML Stream Buffer Summary: XML Stream Buffer
License: CDDL-1.1 or GPLv2 with exceptions License: CDDL-1.1 or GPLv2 with exceptions
URL: http://java.net/projects/xmlstreambuffer/ URL: http://java.net/projects/xmlstreambuffer/
Source0: https://github.com/javaee/metro-xmlstreambuffer/archive/refs/tags/%{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: jvnet-parent maven-local maven-enforcer-plugin maven-plugin-bundle
BuildRequires: maven-surefire-provider-junit stax-ex >= 1.7.1 junit woodstox-core BuildRequires: maven-surefire-provider-junit stax-ex >= 1.7.1 junit woodstox-core
BuildArch: noarch BuildArch: noarch
@ -24,6 +23,7 @@ This package contains of man files for xmlstreambuffer.
%prep %prep
%autosetup -n metro-xmlstreambuffer-%{version} -p1 %autosetup -n metro-xmlstreambuffer-%{version} -p1
cd streambuffer cd streambuffer
sed -i '/<release>/d' pom.xml
%pom_remove_plugin :maven-deploy-plugin %pom_remove_plugin :maven-deploy-plugin
%pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-source-plugin
%pom_remove_plugin :findbugs-maven-plugin %pom_remove_plugin :findbugs-maven-plugin
@ -51,6 +51,9 @@ cd -
%files help -f streambuffer/.mfiles-javadoc %files help -f streambuffer/.mfiles-javadoc
%changelog %changelog
* Thu Dec 28 2023 Ge Wang <wang__ge@126.com> - 1.6.0-1
- Update to version 1.6.0
* Fri May 05 2023 Ge Wang <wang__ge@126.com> - 1.5.6-1 * Fri May 05 2023 Ge Wang <wang__ge@126.com> - 1.5.6-1
- Update to version 1.5.6 - Update to version 1.5.6