Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Modello changes" 

They weren't properly squashed and worded.

This reverts commit 5035837094.
This reverts commit 8aaeb8adf5.
This commit is contained in:
Michael Osipov 2019-06-10 13:54:20 +02:00
parent 5035837094
commit 92b5191726
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
View File

@ -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() )

2
pom.xml
View File

@ -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>