You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/03/28 22:15:47 UTC
[maven] branch MNG-6819 updated (6b622f8 -> f1fe5a6)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6819
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 6b622f8 [MNG-6819] Fix NullPointerException
add d9bf929 [MNG-6562] added WARNING on default bindings plugins unlocked versions
add 9ae008a use https://repository.a.o/ for Apache SNAPSHOT plugins
add f2e9afd Refactor getLocalRepository() in tests by using the repositorySystem
add d204f02 [MNG-6874] - Upgrade Maven Parent to 34
add 9e92a93 [MNG-6872] - Found CVEs in your dependencies - plexus-utils (tests)
add 5cdb833 [MNG-5669] Fix infinitive loop in case pom.xml is being updated during the process (e.g. maven-shade-plugin writing reduced-pom with excluded dependencies)
add c548ce5 Adjust JDKs in Jenkinsfile
new f1fe5a6 [MNG-6819] Fix NullPointerException
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6b622f8)
\
N -- N -- N refs/heads/MNG-6819 (f1fe5a6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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.
Summary of changes:
Jenkinsfile | 2 +-
apache-maven/pom.xml | 2 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 36 +++++++++++++++++---
.../project/AbstractMavenProjectTestCase.java | 7 +---
.../project/DefaultMavenProjectBuilderTest.java | 6 +---
.../test/projects/project-builder/MNG-6723/pom.xml | 38 ++++++++++++++++++++++
.../resources-project-builder/micromailer/pom.xml | 2 +-
.../maven/model/building/DefaultModelBuilder.java | 27 ++++++++-------
pom.xml | 2 +-
9 files changed, 91 insertions(+), 31 deletions(-)
[maven] 01/01: [MNG-6819] Fix NullPointerException
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6819
in repository https://gitbox.apache.org/repos/asf/maven.git
commit f1fe5a6a6c868fb3967eacca6b117cf7f36634c2
Author: 碎镜 <sh...@alibaba-inc.com>
AuthorDate: Fri Dec 13 20:07:20 2019 +0800
[MNG-6819] Fix NullPointerException
---
.../maven/model/interpolation/StringVisitorModelInterpolator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
index 98e36f6..313c4f7 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
@@ -1420,7 +1420,7 @@ public class StringVisitorModelInterpolator
{
String value = (String) v;
String inter = interpolate( value );
- if ( value != inter )
+ if ( value != inter && inter != null )
{
entry.setValue( inter );
}