rpms/maven
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Port to modello 1.11

Browse Source
This commit is contained in:
Marian Koncek 2019-07-22 13:59:02 +02:00
parent 5c6c03b4f2
commit ecd4aaccd1
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
0005-Port-to-modello-version-1.11.patch Normal file
View File

@ -0,0 +1,50 @@
From 092d1d07a61517ed9c460874934c9e0f3e9aef9b Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 3 Jul 2019 09:54:14 +0200
Subject: [PATCH] Port to modello version 1.11
---
.../model/interpolation/StringSearchModelInterpolator.java | 6 ++++++
pom.xml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
index 25982cd..e0a575f 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
@@ -19,6 +19,7 @@ package org.apache.maven.model.interpolation;
* under the License.
*/
+import org.apache.maven.model.InputLocation;
import org.apache.maven.model.Model;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblem.Severity;
@@ -220,6 +221,11 @@ public class StringSearchModelInterpolator
return false;
}
+ if ( InputLocation.class.equals( fieldType ) )
+ {
+ return false;
+ }
+
//noinspection SimplifiableIfStatement
if ( fieldType.isPrimitive() )
{
diff --git a/pom.xml b/pom.xml
index 90c236d..49f3e76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@ under the License.
<wagonVersion>3.3.2</wagonVersion>
<securityDispatcherVersion>1.4</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion>
- <modelloVersion>1.10.0</modelloVersion>
+ <modelloVersion>1.11</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.3.3</resolverVersion>
<slf4jVersion>1.7.25</slf4jVersion>
--
2.20.1

8
maven.spec
View File

@ -5,7 +5,7 @@
Name: maven
Epoch: 1
Version: 3.6.1
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Java project management and project comprehension tool
# maven itself is ASL 2.0
# bundled slf4j is MIT
@ -23,6 +23,8 @@ Patch1: 0001-Adapt-mvn-script.patch
Patch2: 0002-Invoke-logback-via-reflection.patch
Patch3: 0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch
Patch4: 0004-Use-non-shaded-HTTP-wagon.patch
# TODO Should not be needed after 3.6.1
Patch5: 0005-Port-to-modello-version-1.11.patch
BuildRequires: maven-local
BuildRequires: %{?module_prefix}mvn(com.google.inject:guice::no_aop:)
@ -119,6 +121,7 @@ Core part of Apache Maven that can be used as a library.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# not really used during build, but a precaution
find -name '*.jar' -not -path '*/test/*' -delete
@ -232,6 +235,9 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
%changelog
* Wed Jul 03 2019 Marian Koncek <mkoncek@redhat.com> - 1:3.6.1-5
- Port to modello version 1.11
* Thu May 30 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.1-4
- Backport upstream fix for Tycho P2 integarion