From 7271986ea94b01f8ec69d6af4a860286a47ac621 Mon Sep 17 00:00:00 2001 From: Stefan Oehme Date: Wed, 10 Apr 2019 15:21:26 +0200 Subject: [PATCH] [MNG-6581] - Update to latest Modello plugin version --- .../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 25982cd6d84..afd3b0a50bf 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 @@ * 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 @@ private boolean isQualifiedForInterpolation( Field field, Class fieldType ) { return false; } + if ( InputLocation.class.equals( fieldType ) ) + { + return false; + } //noinspection SimplifiableIfStatement if ( fieldType.isPrimitive() ) diff --git a/pom.xml b/pom.xml index cb9dae5b664..23148921a04 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ under the License. 3.3.2 1.4 1.7 - 1.10.0 + 1.10.1-SNAPSHOT 1.3 1.3.3 1.7.25