Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plexus-utils for openSUSE:Factory checked in at 2024-04-08 17:38:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plexus-utils (Old) and /work/SRC/openSUSE:Factory/.plexus-utils.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-utils" Mon Apr 8 17:38:28 2024 rev:9 rq:1165669 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plexus-utils/plexus-utils.changes 2023-05-04 17:10:20.596283715 +0200 +++ /work/SRC/openSUSE:Factory/.plexus-utils.new.1905/plexus-utils.changes 2024-04-08 17:50:25.985613306 +0200 @@ -1,0 +2,15 @@ +Fri Apr 5 08:16:44 UTC 2024 - Fridrich Strba <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- LICENSE-2.0.txt plexus-utils-3.5.1.tar.gz New: ---- plexus-utils-4.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plexus-utils.spec ++++++ --- /var/tmp/diff_new_pack.lC6teC/_old 2024-04-08 17:50:26.761641946 +0200 +++ /var/tmp/diff_new_pack.lC6teC/_new 2024-04-08 17:50:26.765642093 +0200 @@ -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.0 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 @@ 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 @@ %setup -q -n %{name}-%{name}-%{version} cp %{SOURCE1} build.xml -cp %{SOURCE2} . - -%pom_remove_parent . -%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId>" . +mkdir -p lib +build-jar-repository -s lib plexus/xml %build %{ant} jar javadoc @@ -63,7 +61,7 @@ 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,9 +69,10 @@ %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 ++++++ plexus-utils-3.5.1.tar.gz -> plexus-utils-4.0.0.tar.gz ++++++ ++++ 55296 lines of diff (skipped) ++++++ plexus-utils-build.xml ++++++ --- /var/tmp/diff_new_pack.lC6teC/_old 2024-04-08 17:50:27.101654494 +0200 +++ /var/tmp/diff_new_pack.lC6teC/_new 2024-04-08 17:50:27.105654641 +0200 @@ -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.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="project.version" value="4.0.0"/> - <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}"/> @@ -29,6 +26,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="${project.version}",org.codehaus.plexus.util.cli;version="${project.version}",org.codehaus.plexus.util.cli.shell;version="${project.version}",org.codehaus.plexus.util.dag;version="${project.version}",org.codehaus.plexus.util.introspection;version="${project.version}",org.codehaus.plexus.util.io;version="${project.version}",org.codehaus.plexus.util.reflection;version="${project.version}",org.codehaus.plexus.util.xml;version="${project.version}",org.codehaus.plexus.util.xml.pull;version="${project.version}""/> - <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:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> - </manifest> </jar> </target>
