Sync from SUSE:SLFO:Main maven-shared-utils revision 926f98837194c892f3e1ba84f268526c

0001-Restore-compatibility-with-current-maven.patch

@@ -1,20 +1,20 @@
-From e3d2a29743e1b36beaf1063567da9dfd2e5a8aa8 Mon Sep 17 00:00:00 2001
+From 9b56e978de98c6927e8c88456154cfaf6dfeb7c9 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Mon, 26 Feb 2018 16:21:04 +0100
 Subject: [PATCH] Restore compatibility with current maven
 
 ---
- .../maven/shared/utils/logging/AnsiMessageBuilder.java | 18 ++++++++++++++++++
+ .../utils/logging/AnsiMessageBuilder.java      | 18 ++++++++++++++++++
- .../maven/shared/utils/logging/MessageBuilder.java     |  3 +++
+ .../shared/utils/logging/MessageBuilder.java   |  3 +++
- .../shared/utils/logging/PlainMessageBuilder.java      | 18 ++++++++++++++++++
+ .../utils/logging/PlainMessageBuilder.java     | 18 ++++++++++++++++++
  3 files changed, 39 insertions(+)
 
 diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
-index 0103a6b..23b6d14 100644
+index ddb9ab7..6fc9012 100644
 --- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
 +++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
-@@ -153,4 +153,22 @@ class AnsiMessageBuilder
+@@ -133,4 +133,22 @@ class AnsiMessageBuilder implements MessageBuilder, LoggerLevelRenderer {
-     {
+     public String build() {
          return ansi.toString();
      }
 +
@@ -37,25 +37,25 @@ index 0103a6b..23b6d14 100644
 +    }
  }
 diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
-index b60bb4e..1dc2624 100644
+index fa1c07b..5cc49cc 100644
 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
 +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
-@@ -26,6 +26,9 @@ package org.apache.maven.shared.utils.logging;
+@@ -30,6 +30,9 @@ import java.util.Formatter;
+  * @since 3.1.0
   */
- public interface MessageBuilder
+ public interface MessageBuilder {
- {
++    MessageBuilder debug(Object message);
-+    MessageBuilder debug( Object message );
++    MessageBuilder info(Object message);
-+    MessageBuilder info( Object message );
++    MessageBuilder error(Object message);
-+    MessageBuilder error( Object message );
      /**
       * Append message content in success style.
       * By default, bold green
 diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
-index 2eec001..5236e99 100644
+index 86b3e2a..a3f9685 100644
 --- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
 +++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
-@@ -139,4 +139,22 @@ class PlainMessageBuilder
+@@ -120,4 +120,22 @@ class PlainMessageBuilder implements MessageBuilder, LoggerLevelRenderer {
-     {
+     public String build() {
          return buffer.toString();
      }
 +
@@ -78,5 +78,5 @@ index 2eec001..5236e99 100644
 +    }
  }
 -- 
-2.14.3
+2.45.2
 

maven-shared-utils-build.xml

@@ -10,13 +10,14 @@
 
   <property name="project.groupId" value="org.apache.maven.shared"/>
   <property name="project.artifactId" value="maven-shared-utils"/>
-  <property name="project.version" value="3.3.4"/>
+  <property name="project.version" value="3.4.2"/>
   <property name="project.name" value="Apache Maven Shared Utils"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="spec.version" value="3.3"/>
+  <property name="spec.version" value="3.4"/>
 
-  <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}"/>
@@ -24,10 +25,7 @@
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
   <property name="build.resourceDir" value="src/main/resources"/>
-  <property name="build.testOutputDir" value="${build.dir}/test-classes"/>
+
-  <property name="build.testDir" value="src/test/java"/>
-  <property name="build.testResourceDir" value="src/test/resources"/>
-  <property name="test.reports" value="${build.dir}/test-reports"/>
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
   <!-- ====================================================================== -->
@@ -36,18 +34,6 @@
 
   <path id="build.classpath">
     <fileset dir="lib">
-      <!-- jansi commons-io jsr305 plexus-utils plexus-classworlds
-           plexus-container-default -->
-      <include name="**/*.jar"/>
-    </fileset>
-  </path>
-  <path id="build.test.classpath">
-    <fileset dir="lib">
-      <!-- jansi commons-io jsr305 plexus-utils plexus-classworlds
-           plexus-container-default -->
-      <!-- junit hamcrest-core commons-lang3
-           maven-artifact maven-core maven-model
-           maven -plugin-testing-harness maven-resolver-api -->
       <include name="**/*.jar"/>
     </fileset>
   </path>
@@ -72,6 +58,7 @@
            encoding="utf-8"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
@@ -86,103 +73,6 @@
     </copy>
   </target>
 
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests"
-          depends="compile"
-          description="Compile the test code"
-          unless="test.skip">
-    <mkdir dir="${build.testOutputDir}"/>
-    <javac destdir="${build.testOutputDir}"
-           nowarn="false"
-           debug="true"
-           encoding="utf-8"
-           optimize="false"
-           deprecation="true"
-           target="${compiler.target}"
-           verbose="false"
-           fork="false"
-           source="${compiler.source}">
-      <src>
-        <pathelement location="${build.testDir}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${build.testOutputDir}">
-      <fileset dir="${build.testResourceDir}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test"
-          depends="compile-tests, junit-missing"
-          unless="junit.skipped"
-          description="Run the test cases">
-    <mkdir dir="${test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${build.outputDir}"/>
-        <pathelement location="${build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${test.reports}" unless="test">
-        <fileset dir="${build.testDir}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-          <exclude name="**/TestException*.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${test.reports}" if="test">
-        <fileset dir="${build.testDir}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-          <exclude name="**/TestException*.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status"
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing"
-          depends="test-junit-status"
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
   <!-- ====================================================================== -->
   <!-- Javadoc target                                                         -->
   <!-- ====================================================================== -->
@@ -216,7 +106,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="compile,test" description="Package the application">
+  <target name="package" depends="compile" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"

maven-shared-utils.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Tue Jun 18 08:48:53 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 3.4.2
+  * New features and improvements
+    + [MNG-7729] - deprecate questionable IsEmpty/IsNotEmpty methods
+    + [MSHARED-1014] - Make Commandline.addSystemEnvironment public
+      and deprecated
+    + Deprecate newXmlWriter
+    + [MSHARED-1172] - Deprecate redundant isEmptyString method
+    + [MSHARED-1169] - deprecate join methods now available in
+      Java 8 String class
+    + [MSHARED-1122] - FileUtils: avoid getCanonicalPath()
+    + [MSHARED-1079] - add build() method and document toString()
+      method
+    + [MSHARED-1014] - Optionally inherit system environment
+      variables by Commandline
+    + [MSHARED-983] - Drop plexus container default
+  * Bug Fixes
+    + [MSHARED-953] - don't trim
+    + [MSHARED-1072] - fix blocking in StreamFeeder
+    + [MSHARED-1109] - Ignore MessageUtilsTest methods on
+      unsupported platforms
+    + [MSHARED-1107] - Make copyFile succeed with source file
+      having lastModified() = 0
+    + [MSHARED-985] - XmlWriterUtil platform independent and
+      consistent
+    + [MSHARED-1072] - Poll data from input stream
+- Modified patch:
+  * 0001-Restore-compatibility-with-current-maven.patch
+    + rediff to changed context
+
 -------------------------------------------------------------------
 Sun May 26 22:42:50 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

maven-shared-utils.spec

@@ -16,9 +16,8 @@
 #
 
 
-%bcond_with tests
 Name:           maven-shared-utils
-Version:        3.3.4
+Version:        3.4.2
 Release:        0
 Summary:        Maven shared utility classes
 License:        Apache-2.0
@@ -34,18 +33,9 @@ BuildRequires:  fdupes
 BuildRequires:  jansi
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  jsr-305
-BuildRequires:  plexus-classworlds
+BuildRequires:  slf4j
-BuildRequires:  plexus-utils
-BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 BuildArch:      noarch
-%if %{with tests}
-BuildRequires:  ant-junit
-BuildRequires:  apache-commons-lang3
-BuildRequires:  maven-lib
-BuildRequires:  maven-plugin-testing-harness
-BuildRequires:  maven-resolver-api
-%endif
 
 %description
 This project aims to be a functional replacement for plexus-utils in Maven.
@@ -63,26 +53,14 @@ API documentation for %{name}.
 
 %prep
 %setup -q
-cp %{SOURCE1} build.xml
-
 %patch -P 0 -p1
-
+cp %{SOURCE1} build.xml
-%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
 
 %build
 mkdir -p lib
-build-jar-repository -s lib commons-io jansi/jansi jsr305 \
+build-jar-repository -s lib commons-io jansi/jansi slf4j/api jsr305
-  org.eclipse.sisu.plexus plexus/classworlds plexus/utils
-%if %{with tests}
-  build-jar-repository -s lib commons-lang3 maven/maven-artifact maven/maven-core \
-    maven/maven-model maven-plugin-testing/maven-plugin-testing-harness \
-    maven-resolver/maven-resolver-api
-%endif
 
 %{ant} \
-%if %{without tests}
-  -Dtest.skip=true \
-%endif
   jar javadoc
 
 %install