From aa6eecc60b59f420a68c1f0431151d408c6a2cd529faef723bed81c006995e4e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 19 Oct 2024 21:12:16 +0000 Subject: [PATCH 1/6] 2 OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlstreambuffer?expand=0&rev=10 --- .gitattributes | 23 +++++++++ .gitignore | 1 + jakarta.patch | 12 +++++ streambuffer-1.5.4.tar.gz | 3 ++ xmlstreambuffer.changes | 14 ++++++ xmlstreambuffer.spec | 103 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 156 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 jakarta.patch create mode 100644 streambuffer-1.5.4.tar.gz create mode 100644 xmlstreambuffer.changes create mode 100644 xmlstreambuffer.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/jakarta.patch b/jakarta.patch new file mode 100644 index 0000000..629b10e --- /dev/null +++ b/jakarta.patch @@ -0,0 +1,12 @@ +diff -urEbwB xmlstreambuffer-streambuffer-1.5.4.orig/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java xmlstreambuffer-streambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java +--- xmlstreambuffer-streambuffer-1.5.4.orig/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java 2024-10-19 22:50:52.559472154 +0200 ++++ xmlstreambuffer-streambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java 2024-10-19 22:51:00.169524256 +0200 +@@ -45,7 +45,7 @@ + import org.jvnet.staxex.NamespaceContextEx; + import org.jvnet.staxex.XMLStreamWriterEx; + +-import javax.activation.DataHandler; ++import jakarta.activation.DataHandler; + import javax.xml.namespace.NamespaceContext; + import javax.xml.stream.XMLStreamException; + import javax.xml.stream.XMLStreamWriter; diff --git a/streambuffer-1.5.4.tar.gz b/streambuffer-1.5.4.tar.gz new file mode 100644 index 0000000..47c6569 --- /dev/null +++ b/streambuffer-1.5.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5099506e5455bb0dc40e956afa811cf45b9fcaf9615c47a4fdcae84bac27ca8e +size 52973 diff --git a/xmlstreambuffer.changes b/xmlstreambuffer.changes new file mode 100644 index 0000000..97637e0 --- /dev/null +++ b/xmlstreambuffer.changes @@ -0,0 +1,14 @@ +------------------------------------------------------------------- +Tue Sep 12 12:51:36 UTC 2023 - Fridrich Strba + +- Reproducible builds: use SOURCE_DATE_EPOCH for timestamp + +------------------------------------------------------------------- +Wed Mar 23 05:57:56 UTC 2022 - Fridrich Strba + +- Build with source and target levels 8 (jsc#SLE-23217) + +------------------------------------------------------------------- +Mon Mar 9 12:13:40 UTC 2020 - Fridrich Strba + +- Initial packaging of xmlstreambuffer 1.5.4 diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec new file mode 100644 index 0000000..baf951e --- /dev/null +++ b/xmlstreambuffer.spec @@ -0,0 +1,103 @@ +# +# spec file for package xmlstreambuffer +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: xmlstreambuffer +Version: 1.5.4 +Release: 0 +Summary: XML Stream Buffer +License: CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0 +Group: Development/Libraries/Java +URL: https://java.net/projects/xmlstreambuffer/ +Source0: https://github.com/kohsuke/xmlstreambuffer/archive/streambuffer-%{version}.tar.gz +Patch0: jakarta.patch +BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 +BuildRequires: maven-local +BuildRequires: mvn(net.java:jvnet-parent:pom:) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.jvnet.staxex:stax-ex) +BuildArch: noarch + +%description +A stream buffer is a stream-based representation of an XML +info-set in Java. Stream buffers are designed to: provide +very efficient stream-based memory representations of XML +info-sets; and be created and processed using any Java-based +XML API. +Conceptually a stream buffer is similar to the representation +used in the Xerces deferred DOM implementation, with the crucial +difference that a stream buffer does not store hierarchical +information like parent and sibling information. The deferred +DOM implementation reduces memory usage when large XML documents +are parsed but only a subset of the document needs to be processed. +(Note that using deferred DOM will be more expensive than +non-deferred DOM in terms of memory and processing if all +the document is traversed.) +Stream buffers may be used as an efficient alternative to DOM where: +* most or all of an XML info-set will eventually get traversed; and/or +* targeted access to certain parts of an XML info-set are required + and need to be efficiently processed using stream-based APIs like + SAX or StAX. + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML + +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q -n %{name}-streambuffer-%{version} +find ./ -name '*.class' -delete +find ./ -name '*.jar' -delete +find ./ -name '*.zip' -delete + +%patch -P 0 -p1 + +%pom_remove_plugin :maven-deploy-plugin +%pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :findbugs-maven-plugin +%pom_remove_plugin :glassfish-copyright-maven-plugin +%pom_remove_plugin :cobertura-maven-plugin +%pom_remove_plugin :buildnumber-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin + +rm -r test/com/sun/xml/stream/buffer/stax/InscopeNamespaceTest.java + +%{mvn_file} :streambuffer %{name} + +%build + +%{mvn_build} -f -- \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -Dmaven.compiler.release=8 \ +%endif + -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ + -Dsource=8 + +%install +%mvn_install +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license copyright.txt + +%files javadoc -f .mfiles-javadoc +%license copyright.txt + +%changelog From 416743e4dee093ae39bad64d82fe852e191ee1fa188f2576ccbaf01895492849 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 20 Oct 2024 05:47:54 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlstreambuffer?expand=0&rev=11 --- xmlstreambuffer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec index baf951e..e873168 100644 --- a/xmlstreambuffer.spec +++ b/xmlstreambuffer.spec @@ -67,7 +67,7 @@ find ./ -name '*.class' -delete find ./ -name '*.jar' -delete find ./ -name '*.zip' -delete -%patch -P 0 -p1 +#patch -P 0 -p1 %pom_remove_plugin :maven-deploy-plugin %pom_remove_plugin :maven-source-plugin From 46b27c0d433255261545e9963c102fbe2da86a28df94329bf2f62db631a46ca1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 20 Oct 2024 05:49:58 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlstreambuffer?expand=0&rev=12 --- xmlstreambuffer.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec index e873168..ccdad0a 100644 --- a/xmlstreambuffer.spec +++ b/xmlstreambuffer.spec @@ -28,6 +28,7 @@ Patch0: jakarta.patch BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: maven-local +BuildRequires: stax-ex BuildRequires: mvn(net.java:jvnet-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.jvnet.staxex:stax-ex) From f30eeffb52edfd7eb0e364fc86b536fccc583240ce39bc55e313751e828b3892 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 20 Oct 2024 11:03:31 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlstreambuffer?expand=0&rev=13 --- 2.1.0.a.tar.gz | 3 +++ jakarta.patch | 12 ----------- streambuffer-1.5.4.tar.gz | 3 --- xmlstreambuffer.spec | 42 ++++++++++++++++----------------------- 4 files changed, 20 insertions(+), 40 deletions(-) create mode 100644 2.1.0.a.tar.gz delete mode 100644 jakarta.patch delete mode 100644 streambuffer-1.5.4.tar.gz diff --git a/2.1.0.a.tar.gz b/2.1.0.a.tar.gz new file mode 100644 index 0000000..de6a469 --- /dev/null +++ b/2.1.0.a.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d453efb4af6ab5b5f2387449197b857f1684d59deb017414539e7a8c1c5fb334 +size 50411 diff --git a/jakarta.patch b/jakarta.patch deleted file mode 100644 index 629b10e..0000000 --- a/jakarta.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urEbwB xmlstreambuffer-streambuffer-1.5.4.orig/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java xmlstreambuffer-streambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java ---- xmlstreambuffer-streambuffer-1.5.4.orig/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java 2024-10-19 22:50:52.559472154 +0200 -+++ xmlstreambuffer-streambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java 2024-10-19 22:51:00.169524256 +0200 -@@ -45,7 +45,7 @@ - import org.jvnet.staxex.NamespaceContextEx; - import org.jvnet.staxex.XMLStreamWriterEx; - --import javax.activation.DataHandler; -+import jakarta.activation.DataHandler; - import javax.xml.namespace.NamespaceContext; - import javax.xml.stream.XMLStreamException; - import javax.xml.stream.XMLStreamWriter; diff --git a/streambuffer-1.5.4.tar.gz b/streambuffer-1.5.4.tar.gz deleted file mode 100644 index 47c6569..0000000 --- a/streambuffer-1.5.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5099506e5455bb0dc40e956afa811cf45b9fcaf9615c47a4fdcae84bac27ca8e -size 52973 diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec index ccdad0a..cd967ed 100644 --- a/xmlstreambuffer.spec +++ b/xmlstreambuffer.spec @@ -17,20 +17,19 @@ Name: xmlstreambuffer -Version: 1.5.4 +Version: 2.1.0.a Release: 0 Summary: XML Stream Buffer License: CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0 Group: Development/Libraries/Java -URL: https://java.net/projects/xmlstreambuffer/ -Source0: https://github.com/kohsuke/xmlstreambuffer/archive/streambuffer-%{version}.tar.gz -Patch0: jakarta.patch +URL: https://github.com/eclipse-ee4j/metro-xmlstreambuffer +Source0: https://github.com/eclipse-ee4j/metro-%{name}/archive/refs/tags/%{version}.tar.gz BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: maven-local -BuildRequires: stax-ex -BuildRequires: mvn(net.java:jvnet-parent:pom:) +BuildRequires: mvn(jakarta.activation:jakarta.activation-api) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.eclipse.ee4j:project:pom:) BuildRequires: mvn(org.jvnet.staxex:stax-ex) BuildArch: noarch @@ -63,42 +62,35 @@ Group: Documentation/HTML This package contains javadoc for %{name}. %prep -%setup -q -n %{name}-streambuffer-%{version} -find ./ -name '*.class' -delete -find ./ -name '*.jar' -delete -find ./ -name '*.zip' -delete - -#patch -P 0 -p1 - -%pom_remove_plugin :maven-deploy-plugin +%setup -q -n metro-%{name}-%{version} +pushd streambuffer %pom_remove_plugin :maven-source-plugin -%pom_remove_plugin :findbugs-maven-plugin %pom_remove_plugin :glassfish-copyright-maven-plugin -%pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :buildnumber-maven-plugin +%pom_remove_plugin :build-helper-maven-plugin %pom_remove_plugin :maven-enforcer-plugin -rm -r test/com/sun/xml/stream/buffer/stax/InscopeNamespaceTest.java - %{mvn_file} :streambuffer %{name} +popd %build +pushd streambuffer %{mvn_build} -f -- \ -%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -Dmaven.compiler.release=8 \ -%endif -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ -Dsource=8 +popd %install +pushd streambuffer %mvn_install %fdupes -s %{buildroot}%{_javadocdir} +popd -%files -f .mfiles -%license copyright.txt +%files -f streambuffer/.mfiles +%license LICENSE.md NOTICE.md -%files javadoc -f .mfiles-javadoc -%license copyright.txt +%files javadoc -f streambuffer/.mfiles-javadoc +%license LICENSE.md NOTICE.md %changelog From 8e157cb49bf1ba82f4e23b5d6b10d1a97d1215d011edb18638b75370dfaf8b9a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 20 Oct 2024 16:29:50 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlstreambuffer?expand=0&rev=14 --- 2.1.0.a.tar.gz | 3 --- streambuffer-1.5.4.tar.gz | 3 +++ xmlstreambuffer.spec | 40 ++++++++++++++++++++++----------------- 3 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 2.1.0.a.tar.gz create mode 100644 streambuffer-1.5.4.tar.gz diff --git a/2.1.0.a.tar.gz b/2.1.0.a.tar.gz deleted file mode 100644 index de6a469..0000000 --- a/2.1.0.a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d453efb4af6ab5b5f2387449197b857f1684d59deb017414539e7a8c1c5fb334 -size 50411 diff --git a/streambuffer-1.5.4.tar.gz b/streambuffer-1.5.4.tar.gz new file mode 100644 index 0000000..47c6569 --- /dev/null +++ b/streambuffer-1.5.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5099506e5455bb0dc40e956afa811cf45b9fcaf9615c47a4fdcae84bac27ca8e +size 52973 diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec index cd967ed..bd37f4d 100644 --- a/xmlstreambuffer.spec +++ b/xmlstreambuffer.spec @@ -17,20 +17,21 @@ Name: xmlstreambuffer -Version: 2.1.0.a +Version: 1.5.4 Release: 0 Summary: XML Stream Buffer License: CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0 Group: Development/Libraries/Java -URL: https://github.com/eclipse-ee4j/metro-xmlstreambuffer -Source0: https://github.com/eclipse-ee4j/metro-%{name}/archive/refs/tags/%{version}.tar.gz +URL: https://java.net/projects/xmlstreambuffer/ +Source0: https://github.com/kohsuke/xmlstreambuffer/archive/streambuffer-%{version}.tar.gz BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: maven-local -BuildRequires: mvn(jakarta.activation:jakarta.activation-api) +BuildRequires: stax-ex +BuildRequires: mvn(net.java:jvnet-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.eclipse.ee4j:project:pom:) BuildRequires: mvn(org.jvnet.staxex:stax-ex) +Requires: stax-ex BuildArch: noarch %description @@ -62,35 +63,40 @@ Group: Documentation/HTML This package contains javadoc for %{name}. %prep -%setup -q -n metro-%{name}-%{version} -pushd streambuffer +%setup -q -n %{name}-streambuffer-%{version} +find ./ -name '*.class' -delete +find ./ -name '*.jar' -delete +find ./ -name '*.zip' -delete + +%pom_remove_plugin :maven-deploy-plugin %pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :findbugs-maven-plugin %pom_remove_plugin :glassfish-copyright-maven-plugin +%pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :buildnumber-maven-plugin -%pom_remove_plugin :build-helper-maven-plugin %pom_remove_plugin :maven-enforcer-plugin +rm -r test/com/sun/xml/stream/buffer/stax/InscopeNamespaceTest.java + %{mvn_file} :streambuffer %{name} -popd %build -pushd streambuffer %{mvn_build} -f -- \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -Dmaven.compiler.release=8 \ +%endif -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ -Dsource=8 -popd %install -pushd streambuffer %mvn_install %fdupes -s %{buildroot}%{_javadocdir} -popd -%files -f streambuffer/.mfiles -%license LICENSE.md NOTICE.md +%files -f .mfiles +%license copyright.txt -%files javadoc -f streambuffer/.mfiles-javadoc -%license LICENSE.md NOTICE.md +%files javadoc -f .mfiles-javadoc +%license copyright.txt %changelog From 3efd9fb6fecb49f5d9ea80214d173265d4622a2f81b27b4e881f077c1ae0f0da Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 2 Nov 2024 17:51:38 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlstreambuffer?expand=0&rev=15 --- xmlstreambuffer.changes | 5 +++++ xmlstreambuffer.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xmlstreambuffer.changes b/xmlstreambuffer.changes index 97637e0..76017b6 100644 --- a/xmlstreambuffer.changes +++ b/xmlstreambuffer.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 2 17:51:20 UTC 2024 - Fridrich Strba + +- Assure we are building against the right apis + ------------------------------------------------------------------- Tue Sep 12 12:51:36 UTC 2023 - Fridrich Strba diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec index bd37f4d..7e30285 100644 --- a/xmlstreambuffer.spec +++ b/xmlstreambuffer.spec @@ -27,11 +27,10 @@ Source0: https://github.com/kohsuke/xmlstreambuffer/archive/streambuffer- BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: maven-local -BuildRequires: stax-ex BuildRequires: mvn(net.java:jvnet-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.jvnet.staxex:stax-ex) -Requires: stax-ex +#!BuildRequires: stax-ex BuildArch: noarch %description