Sync from SUSE:SLFO:Main maven-shared-utils revision 82dc9c0357ba2944654d74f64c880aab

2024-05-03 16:42:38 +02:00 · 2024-05-03 16:42:38 +02:00 · 3934c1b5c6
commit 3934c1b5c6
6 changed files with 519 additions and 0 deletions
--- a/.gitattributes
+++ 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
--- a/0001-Restore-compatibility-with-current-maven.patch
+++ b/0001-Restore-compatibility-with-current-maven.patch
@ -0,0 +1,82 @@
+From e3d2a29743e1b36beaf1063567da9dfd2e5a8aa8 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 ++++++++++++++++++
+ .../maven/shared/utils/logging/MessageBuilder.java     |  3 +++
+ .../shared/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
+--- 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
+     {
+         return ansi.toString();
+     }
+
+    @Override
+    public MessageBuilder debug(Object message) {
+        a(message);
+        return this;
+    }
+
+    @Override
+    public MessageBuilder info(Object message) {
+        a(message);
+        return this;
+    }
+
+    @Override
+    public MessageBuilder error(Object message) {
+        a(message);
+        return this;
+    }
+ }
+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
+--- 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;
+  */
+ public interface MessageBuilder
+ {
+    MessageBuilder debug( Object message );
+    MessageBuilder info( 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
+--- 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
+     {
+         return buffer.toString();
+     }
+
+    @Override
+    public MessageBuilder debug(Object message) {
+        a(message);
+        return this;
+    }
+
+    @Override
+    public MessageBuilder info(Object message) {
+        a(message);
+        return this;
+    }
+
+    @Override
+    public MessageBuilder error(Object message) {
+        a(message);
+        return this;
+    }
+ }
+-- 
+2.14.3
+
--- a/maven-shared-utils-3.3.4-source-release.zip
+++ b/maven-shared-utils-3.3.4-source-release.zip
--- a/maven-shared-utils-build.xml
+++ b/maven-shared-utils-build.xml
@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="maven-shared-utils" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="build.properties"/>
+
+  <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.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="compiler.source" value="1.8"/>
+  <property name="compiler.target" value="${compiler.source}"/>
+
+  <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
+  <property name="build.dir" value="target"/>
+  <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"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <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>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${build.outputDir}"/>
+    <javac destdir="${build.outputDir}"
+           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.srcDir}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${build.outputDir}">
+      <fileset dir="${build.resourceDir}"/>
+    </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                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${build.srcDir}"
+             packagenames="*"
+             destdir="${reporting.outputDirectory}/apidocs"
+             access="protected"
+             source="${compiler.source}"
+             encoding="utf-8"
+             verbose="false"
+             version="true"
+             use="true"
+             author="true"
+             splitindex="false"
+             nodeprecated="false"
+             nodeprecatedlist="false"
+             notree="false"
+             noindex="false"
+             nohelp="false"
+             nonavbar="false"
+             serialwarn="false"
+             linksource="false"
+             breakiterator="false">
+      <classpath refid="build.classpath"/>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${build.dir}/${build.finalName}.jar"
+         compress="true"
+         index="false"
+         basedir="${build.outputDir}"
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Implementation-Title" value="${project.name}"/>
+        <attribute name="Implementation-URL" value="http://maven.apache.org/shared/${project.artifactId}/"/>
+        <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
+        <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
+        <attribute name="Implementation-Version" value="${project.version}"/>
+        <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
+        <attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
+        <attribute name="JavaPackages-Version" value="${project.version}"/>
+        <attribute name="Specification-Title" value="${project.name}"/>
+        <attribute name="Specification-Vendor" value="${project.organization.name}"/>
+        <attribute name="Specification-Version" value="${spec.version}"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+</project>
--- a/maven-shared-utils.changes
+++ b/maven-shared-utils.changes
@ -0,0 +1,52 @@
+-------------------------------------------------------------------
+Wed May  3 11:24:22 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 3.3.4
+  * Bug
+    + [MSHARED-951] - Checked exception converted to raw runtime
+      exception
+    + [MSHARED-952] - PrettyPrintXmlWriter output is platform
+      dependent
+    + [MSHARED-954] - Deprecate StringUtils.unifyLineSeparator
+    + [MSHARED-969] - Environment variable with null value
+  * Dependency upgrade
+    + [MSHARED-962] - Upgrade Jansi to 2.0.1
+    + [MSHARED-973] - Upgrade Jansi to 2.2.0
+- Changed patch:
+  * 0001-Restore-compatibility-with-current-maven.patch
+    + rediff to changed context/line-ends
+
+-------------------------------------------------------------------
+Mon Apr 25 15:44:47 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 3.3.3
+  * Bug
+    + [MSHARED-297] - Commandline class shell injection
+      vulnerabilities (bsc#1198833, CVE-2022-29599)
+    + [MSHARED-416] - Odd number of quotes in command-line fails
+    + [MSHARED-431] - # (Hash-Sign) should trigger quoting in
+      BourneShell.java
+    + [MSHARED-681] - Maven-Shared: Java7Support silently fails
+      overwriting symlinks
+    + [MSHARED-749] - Commandline does not thrown
+      CommandLineException when uneven number of quotation marks
+      used
+    + [MSHARED-750] - Unbalanced quotes in command with escaped
+      double quotation mark
+  * Improvement
+    + [MSHARED-684] - Upgrade parent to 31
+    + [MSHARED-748] - Upgrade maven-shared-parent to 32
+    + [MSHARED-826] - Require Java 7
+    + [MSHARED-879] - make build Reproducible
+    + [MSHARED-881] - try with resources in FileUtils
+
+-------------------------------------------------------------------
+Sun Mar 20 17:58:48 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source and target levels 8
+
+-------------------------------------------------------------------
+Thu Mar 14 09:37:53 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Initial packaging of maven-shared-utils 3.2.1
+- Generate and customize ant build.xml
--- a/maven-shared-utils.spec
+++ b/maven-shared-utils.spec
@ -0,0 +1,112 @@
+#
+# spec file for package maven-shared-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/
+#
+
+
+%bcond_with tests
+Name:           maven-shared-utils
+Version:        3.3.4
+Release:        0
+Summary:        Maven shared utility classes
+License:        Apache-2.0
+Group:          Development/Libraries/Java
+URL:            https://maven.apache.org/shared/maven-shared-utils
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source1:        %{name}-build.xml
+# XXX temporary for maven upgrade
+Patch0:         0001-Restore-compatibility-with-current-maven.patch
+BuildRequires:  ant
+BuildRequires:  apache-commons-io
+BuildRequires:  fdupes
+BuildRequires:  jansi
+BuildRequires:  javapackages-local
+BuildRequires:  jsr-305
+BuildRequires:  plexus-classworlds
+BuildRequires:  plexus-containers-container-default
+BuildRequires:  plexus-utils
+BuildRequires:  unzip
+Requires:       mvn(commons-io:commons-io)
+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.
+
+It is not a 100% API compatible replacement though but a replacement with
+improvements: lots of methods got cleaned up, generics got added and we dropped
+a lot of unused code.
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Documentation/HTML
+
+%description javadoc
+API documentation for %{name}.
+
+%prep
+%setup -q
+cp %{SOURCE1} build.xml
+
+%patch0 -p1
+
+%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
+
+%pom_remove_parent .
+%pom_xpath_inject pom:project "<groupId>org.apache.maven.shared</groupId>" .
+
+%build
+mkdir -p lib
+build-jar-repository -s lib commons-io jansi/jansi jsr305 \
+  plexus/classworlds plexus-containers/plexus-container-default 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
+# 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}
+install -pm 0644 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 NOTICE
+
+%files javadoc
+%license LICENSE NOTICE
+%{_javadocdir}/%{name}
+
+%changelog