You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:26:48 UTC
[sling-slingstart-maven-plugin] 07/16: SLING-4880 Fix potential
NPEs when resolving artifacts
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.3.0
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit ce4b2b5a71f1b33583df4726db729806b262359c
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Jul 13 23:01:47 2015 +0000
SLING-4880 Fix potential NPEs when resolving artifacts
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1690839 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/slingstart/DependencyLifecycleParticipant.java | 4 ++--
.../maven/slingstart/PomArtifactVersionResolver.java | 16 ++++++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
index 0e58a18..91840ae 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
@@ -148,10 +148,10 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
// prepare resolver options
ResolverOptions resolverOptions = new ResolverOptions();
- if (nodeBooleanValue(info.plugin, "usePomVariables", false)) {
+ if (nodeBooleanValue(info.plugin, "usePomVariables", false) && info.project != null) {
resolverOptions.variableResolver(new PomVariableResolver(info.project));
}
- if (nodeBooleanValue(info.plugin, "usePomDependencies", false)) {
+ if (nodeBooleanValue(info.plugin, "usePomDependencies", false) && info.project != null) {
resolverOptions.artifactVersionResolver(new PomArtifactVersionResolver(info.project));
}
diff --git a/src/main/java/org/apache/sling/maven/slingstart/PomArtifactVersionResolver.java b/src/main/java/org/apache/sling/maven/slingstart/PomArtifactVersionResolver.java
index 0208310..3c0a6d5 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/PomArtifactVersionResolver.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/PomArtifactVersionResolver.java
@@ -47,17 +47,21 @@ public class PomArtifactVersionResolver implements ArtifactVersionResolver {
if (version != null) {
return version;
}
- version = findVersion(project.getDependencyManagement().getDependencies(), artifact);
- if (version != null) {
- return version;
+ if (project.getDependencyManagement() != null) {
+ version = findVersion(project.getDependencyManagement().getDependencies(), artifact);
+ if (version != null) {
+ return version;
+ }
}
return null;
}
private String findVersion(List<Dependency> dependencies, Artifact artifact) {
- for (Dependency dependency : project.getDependencyManagement().getDependencies()) {
- if (artifactEquals(dependency, artifact)) {
- return dependency.getVersion();
+ if (dependencies != null) {
+ for (Dependency dependency : dependencies) {
+ if (artifactEquals(dependency, artifact)) {
+ return dependency.getVersion();
+ }
}
}
return null;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.