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 11:56:09 UTC
[maven] branch master updated: Revert "Modello changes"
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 92b5191 Revert "Modello changes"
92b5191 is described below
commit 92b51917267d2bdce3ef0e61f8ec259b97456cc7
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jun 10 13:54:20 2019 +0200
Revert "Modello changes"
They weren't properly squashed and worded.
This reverts commit 5035837094115f31f86d8ddf0a8dace7b1fa52bc.
This reverts commit 8aaeb8adf570e88bf38298a8a9349372d7d53161.
---
.../maven/model/interpolation/StringSearchModelInterpolator.java | 5 -----
pom.xml | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
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 afd3b0a..25982cd 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,7 +19,6 @@ 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,10 +219,6 @@ 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 0d8a11a..e734a1d 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.11</modelloVersion>
+ <modelloVersion>1.10.0</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.3.3</resolverVersion>
<slf4jVersion>1.7.25</slf4jVersion>