Accepting request 977576 from Java:packages
maven 3.8.5 / jansi 2.4.0 and fixes for building with them OBS-URL: https://build.opensuse.org/request/show/977576 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmvn?expand=0&rev=10
This commit is contained in:
commit
9f25b43edf
50
0001-Port-to-Maven-3.8.5.patch
Normal file
50
0001-Port-to-Maven-3.8.5.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
From 2be4a625a254d0f9ac888ca47bbaac0c02977bc7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mikolaj Izdebski <mizdebsk@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
|
||||||
|
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 16 15:56:00 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* 0001-Port-to-Maven-3.8.5.patch
|
||||||
|
+ Allow buiding against unpatched maven 3.8.5
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 10 12:36:15 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Tue May 10 12:36:15 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -35,6 +35,7 @@ Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch
|
|||||||
Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch
|
Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch
|
||||||
Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.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
|
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}-api = %{version}
|
||||||
BuildRequires: %{parent}-core = %{version}
|
BuildRequires: %{parent}-core = %{version}
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 16 15:56:00 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* 0001-Port-to-Maven-3.8.5.patch
|
||||||
|
+ Allow buiding against unpatched maven 3.8.5
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 10 12:36:15 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Tue May 10 12:36:15 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@ Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch
|
|||||||
Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch
|
Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch
|
||||||
Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.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
|
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}-api = %{version}
|
||||||
BuildRequires: %{parent}-core = %{version}
|
BuildRequires: %{parent}-core = %{version}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 16 15:56:00 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* 0001-Port-to-Maven-3.8.5.patch
|
||||||
|
+ Allow buiding against unpatched maven 3.8.5
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 10 12:36:15 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Tue May 10 12:36:15 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@ Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch
|
|||||||
Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch
|
Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch
|
||||||
Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.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
|
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: javapackages-local
|
||||||
BuildRequires: xmvn-resolve
|
BuildRequires: xmvn-resolve
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
|
BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 16 15:56:00 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* 0001-Port-to-Maven-3.8.5.patch
|
||||||
|
+ Allow buiding against unpatched maven 3.8.5
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 13 08:59:24 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Fri May 13 08:59:24 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -34,6 +34,7 @@ Patch4: 0001-Restore-possibility-to-build-with-Java-8.patch
|
|||||||
Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch
|
Patch5: 0002-Revert-Update-compiler-source-target-to-JDK-11.patch
|
||||||
Patch6: 0003-Revert-Use-new-Collection-methods-added-in-Java-9.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
|
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: ant
|
||||||
BuildRequires: apache-commons-compress
|
BuildRequires: apache-commons-compress
|
||||||
BuildRequires: beust-jcommander
|
BuildRequires: beust-jcommander
|
||||||
|
Loading…
Reference in New Issue
Block a user