From 4cd9dc3f0e3beadafce0da532ce49a5405ba320fe29e141320ecf9e3e7b1fa35 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 29 Sep 2024 11:48:38 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-velocity?expand=0&rev=18 --- .gitattributes | 23 ++++ .gitignore | 1 + LICENSE-2.0.txt | 202 +++++++++++++++++++++++++++++++++++ plexus-velocity-1.2.tar.gz | 3 + plexus-velocity-2.1.0.tar.gz | 3 + plexus-velocity-build.xml | 148 +++++++++++++++++++++++++ plexus-velocity.changes | 34 ++++++ plexus-velocity.spec | 85 +++++++++++++++ 8 files changed, 499 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 LICENSE-2.0.txt create mode 100644 plexus-velocity-1.2.tar.gz create mode 100644 plexus-velocity-2.1.0.tar.gz create mode 100644 plexus-velocity-build.xml create mode 100644 plexus-velocity.changes create mode 100644 plexus-velocity.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/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-velocity-1.2.tar.gz b/plexus-velocity-1.2.tar.gz new file mode 100644 index 0000000..c4a19ca --- /dev/null +++ b/plexus-velocity-1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4611542126bfdfbc5458fa0dce2edacadcfcc8ab3df81e32fbc40ce36d24a311 +size 5720 diff --git a/plexus-velocity-2.1.0.tar.gz b/plexus-velocity-2.1.0.tar.gz new file mode 100644 index 0000000..92477fe --- /dev/null +++ b/plexus-velocity-2.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12de601acf3bba9dcc2d0810005dccadff427e97b8ca474c948affd08bf2cbb0 +size 5031 diff --git a/plexus-velocity-build.xml b/plexus-velocity-build.xml new file mode 100644 index 0000000..aed406c --- /dev/null +++ b/plexus-velocity-build.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plexus-velocity.changes b/plexus-velocity.changes new file mode 100644 index 0000000..f4d67f9 --- /dev/null +++ b/plexus-velocity.changes @@ -0,0 +1,34 @@ +------------------------------------------------------------------- +Sun May 26 19:41:56 UTC 2024 - Fridrich Strba + +- Use the org.eclipse.sisu:org.eclipse.sisu.plexus artifact to + avoid conflict/choise of providers + +------------------------------------------------------------------- +Thu May 16 05:07:02 UTC 2024 - Fridrich Strba + +- Use sisu-plexus instead of plexus-containers-container-default +- Clean up the spec file + +------------------------------------------------------------------- +Tue Mar 29 14:22:10 UTC 2022 - Fridrich Strba + +- Simplify the build file and remove tests which depend on + apache-commons-lang + +------------------------------------------------------------------- +Tue Mar 22 15:14:41 UTC 2022 - Fridrich Strba + +- Build with java source and target levels 8 + +------------------------------------------------------------------- +Tue May 11 14:53:03 UTC 2021 - Fridrich Strba + +- Do not compiler/run the test build against legacy guava20 any + more + +------------------------------------------------------------------- +Fri Mar 22 21:32:25 UTC 2019 - Fridrich Strba + +- Initial packaging of plexus-velocity 1.2 +- Generate and customize the ant build.xml file diff --git a/plexus-velocity.spec b/plexus-velocity.spec new file mode 100644 index 0000000..de3b8c2 --- /dev/null +++ b/plexus-velocity.spec @@ -0,0 +1,85 @@ +# +# spec file for package plexus-velocity +# +# 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: plexus-velocity +Version: 2.1.0 +Release: 0 +Summary: Plexus Velocity Component +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://codehaus-plexus.github.io/plexus-velocity/ +Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz +Source1: %{name}-build.xml +Source2: http://www.apache.org/licenses/LICENSE-2.0.txt +BuildRequires: ant +BuildRequires: apache-commons-collections +BuildRequires: atinject +BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local >= 6 +BuildRequires: sisu-inject +BuildRequires: velocity-engine-core +BuildArch: noarch + +%description +This package provides Plexus Velocity component - a wrapper for +Apache Velocity template engine, which allows easy use of Velocity +by applications built on top of Plexus container. + +%package javadoc +Summary: API documentation for %{name} +Group: Documentation/HTML + +%description javadoc +This package provides %{summary}. + +%prep +%setup -q -n %{name}-%{name}-%{version} + +find -name '*.jar' -delete + +cp -p %{SOURCE1} build.xml +cp -p %{SOURCE2} LICENSE + +mkdir -p lib +build-jar-repository -s lib atinject commons-collections org.eclipse.sisu.inject velocity-engine/velocity-engine-core + +%build +ant jar javadoc + +%install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE + +%files javadoc +%license LICENSE +%{_javadocdir}/%{name} + +%changelog From 5992f65c68c3a71bacb6d64184558492a423ff0afc6c82ffbb675d22caad36e5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 29 Sep 2024 13:06:46 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-velocity?expand=0&rev=19 --- plexus-velocity-build.xml | 43 +++++++++++---------------------------- plexus-velocity.spec | 11 +++++----- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/plexus-velocity-build.xml b/plexus-velocity-build.xml index aed406c..3a06f44 100644 --- a/plexus-velocity-build.xml +++ b/plexus-velocity-build.xml @@ -10,10 +10,9 @@ - + - - + @@ -30,12 +29,18 @@ + + @@ -60,7 +65,6 @@ debug="true" optimize="false" deprecation="true" - release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" @@ -70,34 +74,11 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - + = 1.8 BuildRequires: javapackages-local >= 6 -BuildRequires: sisu-inject -BuildRequires: velocity-engine-core +BuildRequires: sisu-plexus +BuildRequires: velocity BuildArch: noarch %description @@ -56,8 +55,10 @@ find -name '*.jar' -delete cp -p %{SOURCE1} build.xml cp -p %{SOURCE2} LICENSE +%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2 + mkdir -p lib -build-jar-repository -s lib atinject commons-collections org.eclipse.sisu.inject velocity-engine/velocity-engine-core +build-jar-repository -s lib commons-collections org.eclipse.sisu.plexus velocity %build ant jar javadoc From 62a9748654ed881c4d333a486d0cbe916a08217cd31f2f3e091e874a646a6b1f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 29 Sep 2024 13:08:32 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-velocity?expand=0&rev=20 --- plexus-velocity-2.1.0.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 plexus-velocity-2.1.0.tar.gz diff --git a/plexus-velocity-2.1.0.tar.gz b/plexus-velocity-2.1.0.tar.gz deleted file mode 100644 index 92477fe..0000000 --- a/plexus-velocity-2.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12de601acf3bba9dcc2d0810005dccadff427e97b8ca474c948affd08bf2cbb0 -size 5031 From 96a9a16a84e71f09db96c3d3835f6a9405ad61436ada60ae7cb84984169e5b08 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 29 Sep 2024 18:27:45 +0000 Subject: [PATCH 4/5] try again OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-velocity?expand=0&rev=21 --- plexus-velocity-1.2.tar.gz | 3 --- plexus-velocity-2.1.0.tar.gz | 3 +++ plexus-velocity-build.xml | 43 ++++++++++++++++++++++++++---------- plexus-velocity.spec | 11 +++++---- 4 files changed, 39 insertions(+), 21 deletions(-) delete mode 100644 plexus-velocity-1.2.tar.gz create mode 100644 plexus-velocity-2.1.0.tar.gz diff --git a/plexus-velocity-1.2.tar.gz b/plexus-velocity-1.2.tar.gz deleted file mode 100644 index c4a19ca..0000000 --- a/plexus-velocity-1.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4611542126bfdfbc5458fa0dce2edacadcfcc8ab3df81e32fbc40ce36d24a311 -size 5720 diff --git a/plexus-velocity-2.1.0.tar.gz b/plexus-velocity-2.1.0.tar.gz new file mode 100644 index 0000000..92477fe --- /dev/null +++ b/plexus-velocity-2.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12de601acf3bba9dcc2d0810005dccadff427e97b8ca474c948affd08bf2cbb0 +size 5031 diff --git a/plexus-velocity-build.xml b/plexus-velocity-build.xml index 3a06f44..aed406c 100644 --- a/plexus-velocity-build.xml +++ b/plexus-velocity-build.xml @@ -10,9 +10,10 @@ - + - + + @@ -29,18 +30,12 @@ - - @@ -65,6 +60,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" @@ -74,11 +70,34 @@ - - - + + + + + + + + + + + + + + + + + + + + + + - + = 1.8 BuildRequires: javapackages-local >= 6 -BuildRequires: sisu-plexus -BuildRequires: velocity +BuildRequires: sisu-inject +BuildRequires: velocity-engine-core BuildArch: noarch %description @@ -55,10 +56,8 @@ find -name '*.jar' -delete cp -p %{SOURCE1} build.xml cp -p %{SOURCE2} LICENSE -%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2 - mkdir -p lib -build-jar-repository -s lib commons-collections org.eclipse.sisu.plexus velocity +build-jar-repository -s lib atinject commons-collections org.eclipse.sisu.inject velocity-engine/velocity-engine-core %build ant jar javadoc From 0f00e84643f6aac8a86758031b72189cfafe18a9f10fcd455f204438d4ed25ab Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 3 Oct 2024 13:59:11 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-velocity?expand=0&rev=22 --- plexus-velocity.changes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plexus-velocity.changes b/plexus-velocity.changes index f4d67f9..4d2f1d5 100644 --- a/plexus-velocity.changes +++ b/plexus-velocity.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Oct 3 13:56:35 UTC 2024 - Fridrich Strba + +- Upgrade to version 2.1.0 + * Changes: + + Upgrade to Velocity Engine 2.0 + + Upgrade Velocity Engine from 2.0 to 2.3 + + Move to JUnit5 + ------------------------------------------------------------------- Sun May 26 19:41:56 UTC 2024 - Fridrich Strba