From 27414eac72a2f85427e4412325607b84341c09ffbaf38c7ff9ca539e165b4fed Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 16 May 2022 16:02:48 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=55 --- 0001-Port-to-Maven-3.8.5.patch | 50 ++++++++++++++++++++++++++++++++++ xmvn-connector.changes | 7 +++++ xmvn-connector.spec | 1 + xmvn-mojo.changes | 7 +++++ xmvn-mojo.spec | 1 + xmvn-parent.changes | 7 +++++ xmvn-parent.spec | 1 + xmvn-tools.changes | 7 +++++ xmvn-tools.spec | 1 + 9 files changed, 82 insertions(+) create mode 100644 0001-Port-to-Maven-3.8.5.patch diff --git a/0001-Port-to-Maven-3.8.5.patch b/0001-Port-to-Maven-3.8.5.patch new file mode 100644 index 0000000..1e7b3af --- /dev/null +++ b/0001-Port-to-Maven-3.8.5.patch @@ -0,0 +1,50 @@ +From 2be4a625a254d0f9ac888ca47bbaac0c02977bc7 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 @@ + 1.81 + 3.1.0 + 1.7.1 +- 3.8.1 ++ 3.8.5 + 2.6.0 + 3.3.0 + 3.6.1 +-- +2.36.1 + diff --git a/xmvn-connector.changes b/xmvn-connector.changes index 27909f8..fe587c2 100644 --- a/xmvn-connector.changes +++ b/xmvn-connector.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 16 15:56:00 UTC 2022 - Fridrich Strba + +- 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 diff --git a/xmvn-connector.spec b/xmvn-connector.spec index aec4dd9..97aa436 100644 --- a/xmvn-connector.spec +++ b/xmvn-connector.spec @@ -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 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 diff --git a/xmvn-mojo.changes b/xmvn-mojo.changes index f5517e3..b524754 100644 --- a/xmvn-mojo.changes +++ b/xmvn-mojo.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 16 15:56:00 UTC 2022 - Fridrich Strba + +- 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 diff --git a/xmvn-mojo.spec b/xmvn-mojo.spec index f18c08b..38b9fef 100644 --- a/xmvn-mojo.spec +++ b/xmvn-mojo.spec @@ -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 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 diff --git a/xmvn-parent.changes b/xmvn-parent.changes index 443ce05..35b4953 100644 --- a/xmvn-parent.changes +++ b/xmvn-parent.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 16 15:56:00 UTC 2022 - Fridrich Strba + +- 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 diff --git a/xmvn-parent.spec b/xmvn-parent.spec index 6ed5cc9..56ed616 100644 --- a/xmvn-parent.spec +++ b/xmvn-parent.spec @@ -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 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) diff --git a/xmvn-tools.changes b/xmvn-tools.changes index 131a981..4f17984 100644 --- a/xmvn-tools.changes +++ b/xmvn-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 16 15:56:00 UTC 2022 - Fridrich Strba + +- 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 diff --git a/xmvn-tools.spec b/xmvn-tools.spec index 83c7ab1..0d12c47 100644 --- a/xmvn-tools.spec +++ b/xmvn-tools.spec @@ -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 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