Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xmvn for openSUSE:Factory checked in at 2023-05-04 17:10:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmvn (Old) and /work/SRC/openSUSE:Factory/.xmvn.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmvn" Thu May 4 17:10:09 2023 rev:13 rq:1084306 version:4.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xmvn/xmvn-connector.changes 2022-05-25 20:35:49.844333850 +0200 +++ /work/SRC/openSUSE:Factory/.xmvn.new.1533/xmvn-connector.changes 2023-05-04 17:10:22.148292802 +0200 @@ -1,0 +2,70 @@ +Wed May 3 09:26:56 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 4.2.0 + * Changes: + + Make XMvn Resolver log to XMvn Logger + + Make XMvn Subst log to XMvn Logger + + Depend on junit-jupiter-api instead of junit-jupiter + + Suppress deprecation warnings in MavenExtensionTest + + Remove XMvn Connector dependency on Plexus Utils + + Remove XMvn MOJO dependency on Plexus Utils + + Port XMvn MOJO from Xpp3Dom to StAX + + Update Maven to version 3.9.1 + + Don't pass duplicate --patch-module to javadoc + + Make Javadoc MOJO respect ignoreJPMS configuration flag + + Propagate javadoc output througt Logger + + Remove dependency on Plexus Classworlds + + Remove unneeded managed dependency on maven-invoker + + Use ServiceLocator to find Logger + + Use parametrized logging feature + + Use XMvn Logger instead of Plexus Logger + + Get rid of Slf4jLoggerAdapter + + Drop support for Gossip logger + + Move XMvn Logger to API module + + Ignore JPMS when all modules are automatic + + Refactor Javadoc MOJO + + Make Javadoc not fail when no sources are found + + Add an integration test for javadoc generation with + module-info.java but no sources + + Add an integration test for javadoc generation with + Automatic-Module-Name + + Make Javadoc MOJO work in case one of JPMS modules has no + sources + + Prioritize certain XMvn components over Maven components + + Port XMvn MOJO to JSR-330 + + Refactor XMvnMojoExecutionConfigurator + + Make builddep MOJO compatible with Maven 4 + + Port to JSR-330 + + Get rid of ModelProcessor + + Refactor XMvnModelValidator + + Refactor XMvnToolchainManager + + Convert lambda to method reference + + Improve Javadoc MOJO JPMS support + + Add a test case for JPMS javadoc generation with remote + dependencies + + Add a test case for JPMS multimodule javadoc generation + + Exclude src/test/resources-filtered/** from RAT + + Fix scope of xmvn-mojo dependency on plexus-utils + + --module-path not allowed with release=8 + + Mimic maven-javadoc-plugin for -source and --release + + testJavadocJPMS needs a modular java + + Let modello generate source 8 + + Add a jdk9+ profile to assure that we are jdk8 compatible + + Revert "Use new Collection methods added in Java 9" + + Revert "Update compiler source/target to JDK 11" + + Restore possibility to build with Java 8 + + Simple implementation of toolchains + https://github.com/fedora-java/xmvn/issues/142 + + Port to Modello 2.0.0 +- Removed patches + * 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch + * 0001-Port-to-Maven-3.8.5.patch + * 0001-Restore-possibility-to-build-with-Java-8.patch + * 0001-Simple-implementation-of-toolchains-https-github.com.patch + * 0002-Revert-Update-compiler-source-target-to-JDK-11.patch + * 0002-module-path-not-allowed-with-release-8.patch + * 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch + * 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch + + Integrated upstream in this version + +------------------------------------------------------------------- xmvn-mojo.changes: same change xmvn-parent.changes: same change xmvn-tools.changes: same change --- /work/SRC/openSUSE:Factory/xmvn/xmvn.changes 2022-05-25 20:35:49.928333967 +0200 +++ /work/SRC/openSUSE:Factory/.xmvn.new.1533/xmvn.changes 2023-05-04 17:10:22.272293528 +0200 @@ -1,0 +2,60 @@ +Wed May 3 09:26:56 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 4.2.0 + * Changes: + + Make XMvn Resolver log to XMvn Logger + + Make XMvn Subst log to XMvn Logger + + Depend on junit-jupiter-api instead of junit-jupiter + + Suppress deprecation warnings in MavenExtensionTest + + Remove XMvn Connector dependency on Plexus Utils + + Remove XMvn MOJO dependency on Plexus Utils + + Port XMvn MOJO from Xpp3Dom to StAX + + Update Maven to version 3.9.1 + + Don't pass duplicate --patch-module to javadoc + + Make Javadoc MOJO respect ignoreJPMS configuration flag + + Propagate javadoc output througt Logger + + Remove dependency on Plexus Classworlds + + Remove unneeded managed dependency on maven-invoker + + Use ServiceLocator to find Logger + + Use parametrized logging feature + + Use XMvn Logger instead of Plexus Logger + + Get rid of Slf4jLoggerAdapter + + Drop support for Gossip logger + + Move XMvn Logger to API module + + Ignore JPMS when all modules are automatic + + Refactor Javadoc MOJO + + Make Javadoc not fail when no sources are found + + Add an integration test for javadoc generation with + module-info.java but no sources + + Add an integration test for javadoc generation with + Automatic-Module-Name + + Make Javadoc MOJO work in case one of JPMS modules has no + sources + + Prioritize certain XMvn components over Maven components + + Port XMvn MOJO to JSR-330 + + Refactor XMvnMojoExecutionConfigurator + + Make builddep MOJO compatible with Maven 4 + + Port to JSR-330 + + Get rid of ModelProcessor + + Refactor XMvnModelValidator + + Refactor XMvnToolchainManager + + Convert lambda to method reference + + Improve Javadoc MOJO JPMS support + + Add a test case for JPMS javadoc generation with remote + dependencies + + Add a test case for JPMS multimodule javadoc generation + + Exclude src/test/resources-filtered/** from RAT + + Fix scope of xmvn-mojo dependency on plexus-utils + + --module-path not allowed with release=8 + + Mimic maven-javadoc-plugin for -source and --release + + testJavadocJPMS needs a modular java + + Let modello generate source 8 + + Add a jdk9+ profile to assure that we are jdk8 compatible + + Revert "Use new Collection methods added in Java 9" + + Revert "Update compiler source/target to JDK 11" + + Restore possibility to build with Java 8 + + Simple implementation of toolchains + https://github.com/fedora-java/xmvn/issues/142 + + Port to Modello 2.0.0 + +------------------------------------------------------------------- Old: ---- 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch 0001-Port-to-Maven-3.8.5.patch 0001-Restore-possibility-to-build-with-Java-8.patch 0001-Simple-implementation-of-toolchains-https-github.com.patch 0002-Revert-Update-compiler-source-target-to-JDK-11.patch 0002-module-path-not-allowed-with-release-8.patch 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch xmvn-4.0.0.tar.xz New: ---- xmvn-4.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmvn-connector.spec ++++++ --- /var/tmp/diff_new_pack.JwBpQq/_old 2023-05-04 17:10:23.004297814 +0200 +++ /var/tmp/diff_new_pack.JwBpQq/_new 2023-05-04 17:10:23.008297838 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# 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 @@ -20,7 +20,7 @@ %global subname connector %bcond_with tests Name: %{parent}-%{subname} -Version: 4.0.0 +Version: 4.2.0 Release: 0 Summary: XMvn Connector for Maven Resolver License: Apache-2.0 @@ -28,25 +28,14 @@ URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz Source1: %{parent}-build.tar.xz -Patch1: 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch -Patch2: 0002-module-path-not-allowed-with-release-8.patch -Patch3: 0001-Simple-implementation-of-toolchains-https-github.com.patch -Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch -Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch -Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch -Patch7: 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch -Patch8: 0001-Port-to-Maven-3.8.5.patch BuildRequires: %{parent}-api = %{version} BuildRequires: %{parent}-core = %{version} BuildRequires: ant +BuildRequires: atinject BuildRequires: fdupes -BuildRequires: guava BuildRequires: javapackages-local BuildRequires: maven-lib BuildRequires: maven-resolver-api -BuildRequires: plexus-containers-component-annotations -BuildRequires: plexus-metadata-generator -BuildRequires: plexus-utils BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: xmvn-install @@ -103,26 +92,14 @@ mkdir -p lib build-jar-repository -s lib \ atinject \ - commons-cli \ - guava/guava \ - guice/google-guice-no_aop \ - jdom2/jdom2 \ maven/maven-artifact \ maven/maven-core \ maven/maven-model \ maven/maven-model-builder \ maven/maven-plugin-api \ maven-resolver/maven-resolver-api \ - objectweb-asm/asm \ org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ - plexus-classworlds \ - plexus/cli \ - plexus-containers/plexus-component-annotations \ - plexus-metadata-generator \ - plexus/utils \ - qdox \ - xbean/xbean-reflect \ %{parent}/%{parent}-api pushd %{name} ++++++ xmvn-mojo.spec ++++++ --- /var/tmp/diff_new_pack.JwBpQq/_old 2023-05-04 17:10:23.028297954 +0200 +++ /var/tmp/diff_new_pack.JwBpQq/_new 2023-05-04 17:10:23.032297978 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# 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 @@ -19,21 +19,13 @@ %global parent xmvn %global subname mojo Name: %{parent}-%{subname} -Version: 4.0.0 +Version: 4.2.0 Release: 0 Summary: XMvn MOJO License: Apache-2.0 Group: Development/Tools/Building URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz -Patch1: 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch -Patch2: 0002-module-path-not-allowed-with-release-8.patch -Patch3: 0001-Simple-implementation-of-toolchains-https-github.com.patch -Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch -Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch -Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch -Patch7: 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch -Patch8: 0001-Port-to-Maven-3.8.5.patch BuildRequires: %{parent}-api = %{version} BuildRequires: %{parent}-core = %{version} BuildRequires: fdupes @@ -53,8 +45,7 @@ BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.ow2.asm:asm) #!BuildRequires: maven-compiler-plugin-bootstrap #!BuildRequires: maven-jar-plugin-bootstrap #!BuildRequires: maven-javadoc-plugin-bootstrap ++++++ xmvn-parent.spec ++++++ --- /var/tmp/diff_new_pack.JwBpQq/_old 2023-05-04 17:10:23.052298095 +0200 +++ /var/tmp/diff_new_pack.JwBpQq/_new 2023-05-04 17:10:23.060298142 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# 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 @@ -19,21 +19,13 @@ %global parent xmvn %global subname parent Name: %{parent}-%{subname} -Version: 4.0.0 +Version: 4.2.0 Release: 0 Summary: XMvn Parent POM License: Apache-2.0 Group: Development/Tools/Building URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz -Patch1: 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch -Patch2: 0002-module-path-not-allowed-with-release-8.patch -Patch3: 0001-Simple-implementation-of-toolchains-https-github.com.patch -Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch -Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch -Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch -Patch7: 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch -Patch8: 0001-Port-to-Maven-3.8.5.patch BuildRequires: javapackages-local BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin) ++++++ xmvn-tools.spec ++++++ --- /var/tmp/diff_new_pack.JwBpQq/_old 2023-05-04 17:10:23.080298259 +0200 +++ /var/tmp/diff_new_pack.JwBpQq/_new 2023-05-04 17:10:23.084298282 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# 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 @@ -19,7 +19,7 @@ %global parent xmvn %global subname tools Name: %{parent}-%{subname} -Version: 4.0.0 +Version: 4.2.0 Release: 0 Summary: Local Extensions for Apache Maven License: Apache-2.0 @@ -27,27 +27,17 @@ URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/xmvn/releases/download/%{version}/%{parent}-%{version}.tar.xz Source1: %{parent}-build.tar.xz -Patch1: 0001-Mimic-maven-javadoc-plugin-for-source-and-release.patch -Patch2: 0002-module-path-not-allowed-with-release-8.patch -Patch3: 0001-Simple-implementation-of-toolchains-https-github.com.patch -Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch -Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch -Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.patch -Patch7: 0004-Add-a-jdk9-profile-to-assure-that-we-are-jdk8-compat.patch -Patch8: 0001-Port-to-Maven-3.8.5.patch BuildRequires: ant BuildRequires: apache-commons-compress -BuildRequires: beust-jcommander +BuildRequires: atinject +BuildRequires: beust-jcommander >= 1.82 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: maven-invoker >= 3.0 BuildRequires: modello >= 2.0.0 BuildRequires: objectweb-asm -BuildRequires: plexus-containers-component-annotations -BuildRequires: plexus-containers-container-default -BuildRequires: plexus-metadata-generator -BuildRequires: plexus-utils +BuildRequires: sisu-inject +BuildRequires: sisu-plexus BuildRequires: slf4j BuildArch: noarch @@ -81,7 +71,7 @@ Group: Development/Tools/Building Requires: %{parent}-api = %{version} Requires: %{parent}-core = %{version} -Requires: beust-jcommander +Requires: beust-jcommander >= 1.82 Requires: javapackages-tools %description -n %{parent}-resolve @@ -178,10 +168,14 @@ %build mkdir -p lib build-jar-repository -s lib \ - beust-jcommander commons-compress maven-invoker/maven-invoker \ - objectweb-asm/asm plexus-containers/plexus-component-annotations \ - plexus-containers/plexus-container-default plexus/utils slf4j/api \ - maven-shared-utils/maven-shared-utils + atinject \ + beust-jcommander \ + commons-compress \ + objectweb-asm/asm \ + org.eclipse.sisu.inject \ + org.eclipse.sisu.plexus \ + slf4j/api + %{ant} -Dtest.skip=true package javadoc %install ++++++ xmvn.spec ++++++ --- /var/tmp/diff_new_pack.JwBpQq/_old 2023-05-04 17:10:23.108298423 +0200 +++ /var/tmp/diff_new_pack.JwBpQq/_new 2023-05-04 17:10:23.112298446 +0200 @@ -1,7 +1,7 @@ # # spec file for package xmvn # -# Copyright (c) 2022 SUSE LLC +# 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 @@ -17,7 +17,7 @@ Name: xmvn -Version: 4.0.0 +Version: 4.2.0 Release: 0 Summary: Local Extensions for Apache Maven License: Apache-2.0 ++++++ xmvn-4.0.0.tar.xz -> xmvn-4.2.0.tar.xz ++++++ ++++ 17775 lines of diff (skipped) ++++++ xmvn-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2022-05-08 09:20:44.382177996 +0200 +++ new/common.xml 2023-05-01 19:04:13.055288523 +0200 @@ -3,7 +3,7 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="4.0.0"/> + <property name="project.version" value="4.2.0"/> <property name="project.groupId" value="org.fedoraproject.xmvn"/> <property name="compiler.source" value="1.8"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmvn-connector/build.xml new/xmvn-connector/build.xml --- old/xmvn-connector/build.xml 2022-05-08 09:23:01.742992451 +0200 +++ new/xmvn-connector/build.xml 2023-05-01 21:29:41.358852581 +0200 @@ -80,31 +80,25 @@ </target> <!-- ====================================================================== --> - <!-- Target to generate Plexus component.xml --> + <!-- Sisu javax.inject.Named generation target --> <!-- ====================================================================== --> - <target name="plexus" + <target name="sisu" depends="compile" - description="Generate Plexus component.xml"> - <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <property name="exec_classpath" refid="build.classpath"/> - <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" - failonerror="true" - fork="true"> - <classpath> - <path refid="build.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - <arg value="-X"/> - <arg value="-s"/> - <arg value="${build.srcDir}"/> - <arg value="-c"/> - <arg value="${build.outputDir}"/> - <arg value="-m"/> - <arg value="${build.outputDir}/META-INF/plexus"/> - <arg value="-o"/> - <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </java> + description="Generate javax.inject.Name index"> + <sequential> + <java classname="org.eclipse.sisu.space.SisuIndex" + failonerror="true" + fork="true"> + <classpath> + <path refid="build.classpath"/> + </classpath> + <arg value="${build.outputDir}"/> + </java> + <move todir="${build.outputDir}/META-INF"> + <fileset dir="META-INF"/> + </move> + </sequential> </target> <!-- ====================================================================== --> @@ -112,7 +106,7 @@ <!-- ====================================================================== --> <target name="compile-tests" - depends="plexus" + depends="sisu" description="Compile the test code" unless="test.skip"> <mkdir dir="${build.testOutputDir}"/> @@ -234,7 +228,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="plexus,test" description="Package the application"> + <target name="package" depends="sisu,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmvn-core/build.xml new/xmvn-core/build.xml --- old/xmvn-core/build.xml 2019-03-22 08:21:01.617383094 +0100 +++ new/xmvn-core/build.xml 2023-05-01 21:29:00.110801663 +0200 @@ -89,25 +89,25 @@ </target> <!-- ====================================================================== --> - <!-- Target to generate Plexus component.xml --> + <!-- Sisu javax.inject.Named generation target --> <!-- ====================================================================== --> - <target name="plexus" + <target name="sisu" depends="compile" - description="Generate Plexus component.xml"> - <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <property name="exec_classpath" refid="build.classpath"/> - <exec executable="plexus-metadata-generator" failonerror="true"> - <env key="CLASSPATH" value="${build.outputDir}:${exec_classpath}"/> - <arg value="-s"/> - <arg value="${build.srcDir}"/> - <arg value="-c"/> - <arg value="${build.outputDir}"/> - <arg value="-m"/> - <arg value="${build.outputDir}/META-INF/plexus"/> - <arg value="-o"/> - <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </exec> + description="Generate javax.inject.Name index"> + <sequential> + <java classname="org.eclipse.sisu.space.SisuIndex" + failonerror="true" + fork="true"> + <classpath> + <path refid="build.classpath"/> + </classpath> + <arg value="${build.outputDir}"/> + </java> + <move todir="${build.outputDir}/META-INF"> + <fileset dir="META-INF"/> + </move> + </sequential> </target> <!-- ====================================================================== --> @@ -115,7 +115,7 @@ <!-- ====================================================================== --> <target name="compile-tests" - depends="plexus" + depends="sisu" description="Compile the test code" unless="test.skip"> <mkdir dir="${build.testOutputDir}"/> @@ -239,7 +239,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="plexus,test" description="Package the application"> + <target name="package" depends="sisu,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false"
