From 092d1d07a61517ed9c460874934c9e0f3e9aef9b Mon Sep 17 00:00:00 2001 From: Marian Koncek 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. 3.3.2 1.4 1.7 - 1.10.0 + 1.11 1.3 1.3.3 1.7.25 -- 2.20.1