You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/06/10 13:19:11 UTC
[maven] branch master updated: [MNG-6671] Upgrade Modello to 1.11
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 8f1cac0 [MNG-6671] Upgrade Modello to 1.11
8f1cac0 is described below
commit 8f1cac0b1c58c5b1ad26d38cbfd963d10f66d92a
Author: Stefan Oehme <st...@gmail.com>
AuthorDate: Wed Apr 10 15:21:26 2019 +0200
[MNG-6671] Upgrade Modello to 1.11
---
.../maven/model/interpolation/StringSearchModelInterpolator.java | 5 +++++
pom.xml | 2 +-
2 files changed, 6 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..afd3b0a 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;
@@ -219,6 +220,10 @@ 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 e734a1d..0d8a11a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,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>