Sync from SUSE:SLFO:Main plexus-utils revision cb35c7e46cf13660fc655dd46acac0b2

LICENSE-2.0.txt

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

plexus-utils-build.xml

@@ -11,13 +11,10 @@
   <property name="project.groupId" value="org.codehaus.plexus"/>
   <property name="project.fragment" value="utils"/>
   <property name="project.artifactId" value="plexus-${project.fragment}"/>
-  <property name="project.version" value="3.5.1"/>
+  <property name="project.version" value="4.0.1"/>
-  <property name="project.name" value="Plexus Common Utilities"/>
-  <property name="project.description" value="A collection of various utility classes to ease working with strings, files, command lines, XML and more."/>
-  <property name="project.organization.name" value="Codehaus Plexus"/>
-  <property name="project.organization.url" value="http://codehaus-plexus.github.io"/>
   
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -28,6 +25,16 @@
 
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <fileset dir="lib">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+
   <!-- ====================================================================== -->
   <!-- Cleaning up target                                                     -->
   <!-- ====================================================================== -->
@@ -47,6 +54,7 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
+           release="${compiler.release}" 
            target="${compiler.target}" 
            verbose="false" 
            fork="false" 
@@ -54,6 +62,7 @@
       <src>
         <pathelement location="${build.srcDir}"/>
       </src>
+      <classpath refid="build.classpath"/>
     </javac>
     <copy todir="${build.outputDir}">
       <fileset dir="${build.resourceDir}"/>
@@ -84,7 +93,9 @@
              serialwarn="false" 
              charset="ISO-8859-1" 
              linksource="false" 
-             breakiterator="false"/>
+             breakiterator="false">
+      <classpath refid="build.classpath"/>
+    </javadoc>
   </target>
 
   <!-- ====================================================================== -->
@@ -97,22 +108,6 @@
          index="false" 
          basedir="${build.outputDir}" 
          excludes="**/package.html">
-      <manifest>
-        <attribute name="Bundle-Description" value="${project.description}"/>
-        <attribute name="Bundle-DocURL" value="${project.organization.url}"/>
-        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-        <attribute name="Bundle-ManifestVersion" value="2"/>
-        <attribute name="Bundle-Name" value="${project.name}"/>
-        <attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.fragment}"/>
-        <attribute name="Bundle-Vendor" value="${project.organization.name}"/>
-        <attribute name="Bundle-Version" value="${project.version}"/>
-        <attribute name="Export-Package" value="org.codehaus.plexus.util;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.cli;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.cli.shell;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.dag;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.introspection;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.io;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.reflection;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.xml;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.xml.pull;version=&quot;${project.version}&quot;"/>
-        <attribute name="Import-Package" value="org.codehaus.plexus.util,org.codehaus.plexus.util.cli.shell,org.codehaus.plexus.util.io,org.codehaus.plexus.util.reflection,org.codehaus.plexus.util.xml,org.codehaus.plexus.util.xml.pull"/>
-        <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
-        <attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
-        <attribute name="JavaPackages-Version" value="${project.version}"/>
-        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
-      </manifest>
      </jar>
   </target>
 

plexus-utils.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Tue Apr 30 14:09:54 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 4.0.1
+  * New features and improvements
+    + Add .gitignore to default excludes
+    + downgrade plexus-xml from 4 to 3: keep Maven 3 compatibility
+
+-------------------------------------------------------------------
+Fri Apr  5 08:16:44 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 4.0.0
+  * Starting with version 4, XML classes (in
+    org.codehaus.plexus.util.xml and
+    org.codehaus.plexus.util.xml.pull) have been extracted to a
+    separate plexus-xml: if you need them, just use this new
+    artifact.
+  * Other changes:
+    + Fix false difference detected with
+      CachingOutputStream/CachingWriter when streams are flushed
+    + Dependency updates
+    + Switch to junit 5
+
 -------------------------------------------------------------------
 Wed May  3 11:08:12 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

plexus-utils.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-utils
 #
-# Copyright (c) 2023 SUSE LLC
+# 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
@@ -17,7 +17,7 @@
 
 
 Name:           plexus-utils
-Version:        3.5.1
+Version:        4.0.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
@@ -25,10 +25,10 @@ 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
+BuildRequires:  javapackages-local >= 6
+BuildRequires:  plexus-xml
 BuildArch:      noarch
 
 %description
@@ -49,10 +49,8 @@ Javadoc for %{name}.
 %setup -q -n %{name}-%{name}-%{version}
 
 cp %{SOURCE1} build.xml
-cp %{SOURCE2} .
+mkdir -p lib
-
+build-jar-repository -s lib plexus/xml
-%pom_remove_parent .
-%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId>" .
 
 %build
 %{ant} jar javadoc
@@ -63,7 +61,7 @@ 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
+%{mvn_install_pom} 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}
@@ -71,10 +69,11 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
-%%license NOTICE.txt LICENSE-2.0.txt
+%doc README.md
+%license NOTICE.txt LICENSE.txt
 
 %files javadoc
 %{_javadocdir}/%{name}
-%license NOTICE.txt LICENSE-2.0.txt
+%license NOTICE.txt LICENSE.txt
 
 %changelog