From 3be5f75838870cabde73a9feb2fa314cea8f1f580811974ac7eb2f19043bd490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 19:28:14 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main plexus-utils revision bab22d6d6b8710539fe6bb51827a3222 --- .gitattributes | 23 +++++ LICENSE-2.0.txt | 202 ++++++++++++++++++++++++++++++++++++++ plexus-utils-3.5.1.tar.gz | 3 + plexus-utils-build.xml | 125 +++++++++++++++++++++++ plexus-utils.changes | 75 ++++++++++++++ plexus-utils.spec | 80 +++++++++++++++ 6 files changed, 508 insertions(+) create mode 100644 .gitattributes create mode 100644 LICENSE-2.0.txt create mode 100644 plexus-utils-3.5.1.tar.gz create mode 100644 plexus-utils-build.xml create mode 100644 plexus-utils.changes create mode 100644 plexus-utils.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/LICENSE-2.0.txt b/LICENSE-2.0.txt new file mode 100644 index 0000000..81fbaf6 --- /dev/null +++ b/LICENSE-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/plexus-utils-3.5.1.tar.gz b/plexus-utils-3.5.1.tar.gz new file mode 100644 index 0000000..1dc66bf --- /dev/null +++ b/plexus-utils-3.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb2b59f6c9c97ec39aec5d117dd480da34a5521978d9589e2098877dda940119 +size 475916 diff --git a/plexus-utils-build.xml b/plexus-utils-build.xml new file mode 100644 index 0000000..66d1a3b --- /dev/null +++ b/plexus-utils-build.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plexus-utils.changes b/plexus-utils.changes new file mode 100644 index 0000000..e34e48e --- /dev/null +++ b/plexus-utils.changes @@ -0,0 +1,75 @@ +------------------------------------------------------------------- +Wed May 3 11:08:12 UTC 2023 - Fridrich Strba + +- Upgrade to upstream vesion 3.5.1 + * Changes + + Reading and writing files using Java NIO (#232) + + Partial revert of "Support combine.self='remove'" to fix + MNG-7709 (#241) + + Fix reading comments with UTF chars (fixes #238) (#240) + +------------------------------------------------------------------- +Tue Oct 25 11:01:11 UTC 2022 - Fridrich Strba + +- Upgrade to upstream version 3.5.0 + * Changes of 3.5.0 + + Don't throw IOException when none is required + + Always preserve dominant node value (even if empty) + + Don't overwrite blank (but non-empty) dominant values during + mergeXpp3Dom + + Deprecate isEmpty(String) and isNotEmpty(String) in favour of + same named + + isEmpty(String) must not return false for whitespace-only + values + + Get rid maven-plugin-testing-harness from dependency + * Changes of 3.4.2 + + Provides a CachingOuptutStream and a CachingWriter + + Use (already) precalculated value + + use github shared actions + + MXParser fixes + + Fix last modified time not being updated on linux + + Fix regression and deprecate: FileUtils.fileAppend should + create file + + Fix some testing XML files checkout with incorrect eol + + Fixed regressions: #163 and #194 + + Don't ignore valid SCM files + * Change of 3.4.1 + + Fixes #163: Regression: encoding error when parsing a + ISO-8859-1 xml + +------------------------------------------------------------------- +Wed May 11 14:05:52 UTC 2022 - Fridrich Strba + +- Upgrade to upstream version 3.3.1 + * Fix: Don't ignore valid SCM files + * the latest version supporting Java 8 still + +------------------------------------------------------------------- +Wed Mar 23 23:53:16 UTC 2022 - Fridrich Strba + +- Build with java source and target levels 8 + +------------------------------------------------------------------- +Thu Nov 21 15:05:50 UTC 2019 - Fridrich Strba + +- Upgrade to upstream version 3.3.0 +- Removed patch: + * 0001-Follow-symlinks-in-NioFiles.copy.patch + + not needed with this version + +------------------------------------------------------------------- +Tue Apr 9 16:52:48 UTC 2019 - Fridrich Strba + +- Remove reference to the parent pom since we are not building + using Maven. + +------------------------------------------------------------------- +Sun Mar 3 18:20:04 UTC 2019 - Jan Engelhardt + +- Describe package, not project. + +------------------------------------------------------------------- +Sat Mar 2 13:21:35 UTC 2019 - Fridrich Strba + +- Initial package for plexus-utils 3.1.1 +- Generate and customize ant build file diff --git a/plexus-utils.spec b/plexus-utils.spec new file mode 100644 index 0000000..f23628a --- /dev/null +++ b/plexus-utils.spec @@ -0,0 +1,80 @@ +# +# spec file for package plexus-utils +# +# Copyright (c) 2023 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: plexus-utils +Version: 3.5.1 +Release: 0 +Summary: Plexus Common Utilities +License: Apache-1.1 AND Apache-2.0 AND xpp AND BSD-3-Clause AND SUSE-Public-Domain +Group: Development/Libraries/Java +URL: https://codehaus-plexus.github.io/plexus-utils/ +Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz +Source1: %{name}-build.xml +Source2: http://apache.org/licenses/LICENSE-2.0.txt +BuildRequires: ant +BuildRequires: fdupes +BuildRequires: javapackages-local +BuildArch: noarch + +%description +Plexus contains end-to-end developer tools for writing applications. +At the core is the container, which can be embedded or for an +application server. There are many reusable components for hibernate, +form processing, jndi, i18n, velocity, etc. Plexus also includes an +application server which is like a J2EE application server. + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML + +%description javadoc +Javadoc for %{name}. + +%prep +%setup -q -n %{name}-%{name}-%{version} + +cp %{SOURCE1} build.xml +cp %{SOURCE2} . + +%pom_remove_parent . +%pom_xpath_inject "pom:project" "org.codehaus.plexus" . + +%build +%{ant} jar javadoc + +%install +# jar +install -dm 0755 %{buildroot}%{_javadir}/plexus +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/utils.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/plexus/utils.pom +%add_maven_depmap plexus/utils.pom plexus/utils.jar -a plexus:plexus-utils +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%%license NOTICE.txt LICENSE-2.0.txt + +%files javadoc +%{_javadocdir}/%{name} +%license NOTICE.txt LICENSE-2.0.txt + +%changelog