Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xmvn for openSUSE:Factory checked in
at 2022-05-17 17:24:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmvn (Old)
and /work/SRC/openSUSE:Factory/.xmvn.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmvn"
Tue May 17 17:24:17 2022 rev:10 rq:977576 version:4.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmvn/xmvn-connector.changes 2022-05-11
09:20:14.660622482 +0200
+++ /work/SRC/openSUSE:Factory/.xmvn.new.1538/xmvn-connector.changes
2022-05-17 17:24:35.295179399 +0200
@@ -1,0 +2,7 @@
+Mon May 16 15:56:00 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * 0001-Port-to-Maven-3.8.5.patch
+ + Allow buiding against unpatched maven 3.8.5
+
+-------------------------------------------------------------------
xmvn-mojo.changes: same change
xmvn-parent.changes: same change
xmvn-tools.changes: same change
New:
----
0001-Port-to-Maven-3.8.5.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmvn-connector.spec ++++++
--- /var/tmp/diff_new_pack.zmiw4c/_old 2022-05-17 17:24:36.779180745 +0200
+++ /var/tmp/diff_new_pack.zmiw4c/_new 2022-05-17 17:24:36.783180748 +0200
@@ -35,6 +35,7 @@
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
xmvn-mojo.spec: same change
xmvn-parent.spec: same change
xmvn-tools.spec: same change
++++++ 0001-Port-to-Maven-3.8.5.patch ++++++
>From 2be4a625a254d0f9ac888ca47bbaac0c02977bc7 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizde...@redhat.com>
Date: Fri, 22 Apr 2022 10:59:32 +0200
Subject: [PATCH] Port to Maven 3.8.5
---
.../xmvn/connector/maven/XMvnModelValidator.java | 6 ++++++
xmvn-parent/pom.xml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git
a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java
b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java
index a3fe4712..d340b91f 100644
---
a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java
+++
b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java
@@ -27,6 +27,7 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblemCollector;
+import org.apache.maven.model.interpolation.DefaultModelVersionProcessor;
import org.apache.maven.model.validation.DefaultModelValidator;
import org.apache.maven.model.validation.ModelValidator;
import org.codehaus.plexus.component.annotations.Component;
@@ -52,6 +53,11 @@ public class XMvnModelValidator
@Requirement
private Configurator configurator;
+ public XMvnModelValidator()
+ {
+ super( new DefaultModelVersionProcessor() );
+ }
+
@Override
public void validateEffectiveModel( Model model, ModelBuildingRequest
request, ModelProblemCollector problems )
{
diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml
index 58ca7dc4..7640ab28 100644
--- a/xmvn-parent/pom.xml
+++ b/xmvn-parent/pom.xml
@@ -81,7 +81,7 @@
<jcommanderVersion>1.81</jcommanderVersion>
<mavenInvokerVersion>3.1.0</mavenInvokerVersion>
<mavenResolverVersion>1.7.1</mavenResolverVersion>
- <mavenVersion>3.8.1</mavenVersion>
+ <mavenVersion>3.8.5</mavenVersion>
<plexusClassworldsVersion>2.6.0</plexusClassworldsVersion>
<plexusUtilsVersion>3.3.0</plexusUtilsVersion>
<pluginToolsVersion>3.6.1</pluginToolsVersion>
--
2.36.1
