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 09:11:22 UTC

[maven] branch MNG-6671 created (now 50acb61)

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch MNG-6671
in repository https://gitbox.apache.org/repos/asf/maven.git.


      at 50acb61  [MNG-6671] Upgrade Modello to 1.10.1

This branch includes the following new commits:

     new 8aaeb8a  [MNG-6581] - Update to latest Modello plugin version
     new 50acb61  [MNG-6671] Upgrade Modello to 1.10.1

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[maven] 02/02: [MNG-6671] Upgrade Modello to 1.10.1

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MNG-6671
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 50acb61447b62ff2fdce414c7b1ac7fed8007db0
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jun 10 11:08:43 2019 +0200

    [MNG-6671] Upgrade Modello to 1.10.1
    
    This closes #252
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 398939e..4ba0b92 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.1-SNAPSHOT</modelloVersion>
+    <modelloVersion>1.10.1</modelloVersion>
     <jxpathVersion>1.3</jxpathVersion>
     <resolverVersion>1.3.3</resolverVersion>
     <slf4jVersion>1.7.25</slf4jVersion>


[maven] 01/02: [MNG-6581] - Update to latest Modello plugin version

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MNG-6671
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 8aaeb8adf570e88bf38298a8a9349372d7d53161
Author: Stefan Oehme <st...@gmail.com>
AuthorDate: Wed Apr 10 15:21:26 2019 +0200

    [MNG-6581] - Update to latest Modello plugin version
---
 .../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..398939e 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.10.1-SNAPSHOT</modelloVersion>
     <jxpathVersion>1.3</jxpathVersion>
     <resolverVersion>1.3.3</resolverVersion>
     <slf4jVersion>1.7.25</slf4jVersion>