This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-maven-launchpad-plugin.git
commit 7bcfa0113ac30d7f813544441a8c01ea8c586569 Author: Carsten Ziegeler <[email protected]> AuthorDate: Fri Oct 4 05:56:14 2013 +0000 SLING-3142 : NullPointerException with Java8 in AbstractUsingBundleList git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1529083 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java | 2 +- .../sling/maven/projectsupport/AbstractUsingBundleListMojo.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java index bb27287..2b45cc6 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java @@ -300,7 +300,7 @@ public abstract class AbstractLaunchpadStartingMojo extends AbstractUsingBundleL File tmp = null; try { tmp = File.createTempFile("sling", "props"); - mavenFileFilter.copyFile(propertiesFile, tmp, true, project, null, true, + mavenFileFilter.copyFile(propertiesFile, tmp, true, project, Collections.EMPTY_LIST, true, System.getProperty("file.encoding"), mavenSession); Properties loadedProps = PropertyUtils.loadPropertyFile(tmp, null); for (Object key : loadedProps.keySet()) { diff --git a/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java index 41e45a4..146a134 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.Reader; +import java.util.Collections; import java.util.Enumeration; import java.util.Properties; import java.util.Set; @@ -408,7 +409,7 @@ public abstract class AbstractUsingBundleListMojo extends AbstractBundleListMojo File tmp = null; try { tmp = File.createTempFile("sling", "props"); - mavenFileFilter.copyFile(propsFile, tmp, true, project, null, true, + mavenFileFilter.copyFile(propsFile, tmp, true, project, Collections.EMPTY_LIST, true, System.getProperty("file.encoding"), mavenSession); final Properties loadedProps = PropertyUtils.loadPropertyFile(tmp, null); if ( mode == 0 ) { @@ -482,7 +483,7 @@ public abstract class AbstractUsingBundleListMojo extends AbstractBundleListMojo Reader reader = null; try { tmp = File.createTempFile("sling", "bootstrap"); - mavenFileFilter.copyFile(bootstrapFile, tmp, true, project, null, true, + mavenFileFilter.copyFile(bootstrapFile, tmp, true, project, Collections.EMPTY_LIST, true, System.getProperty("file.encoding"), mavenSession); reader = new FileReader(tmp); final StringBuilder sb = new StringBuilder(); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
