You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/07/05 14:05:02 UTC
[1/2] karaf git commit: [KARAF-5235] remove null values from
AssemblyMojo configuration
Repository: karaf
Updated Branches:
refs/heads/master 4992c1bec -> ef3ac79c9
[KARAF-5235] remove null values from AssemblyMojo configuration
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/37e752c4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/37e752c4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/37e752c4
Branch: refs/heads/master
Commit: 37e752c4b769f5b9c6cb8cd8e9f9fdd71aa8ae73
Parents: 4992c1b
Author: jpoth <po...@gmail.com>
Authored: Mon Jul 3 12:53:09 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jul 5 14:12:41 2017 +0200
----------------------------------------------------------------------
.../karaf-maven-plugin/src/it/test-assembly/pom.xml | 14 ++++++++++++++
.../java/org/apache/karaf/tooling/AssemblyMojo.java | 5 ++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/37e752c4/tooling/karaf-maven-plugin/src/it/test-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-assembly/pom.xml b/tooling/karaf-maven-plugin/src/it/test-assembly/pom.xml
index 3444f41..4f89883 100644
--- a/tooling/karaf-maven-plugin/src/it/test-assembly/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-assembly/pom.xml
@@ -29,6 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <additional.bundle/>
</properties>
<dependencies>
<dependency>
@@ -55,6 +56,9 @@
<extensions>true</extensions>
<configuration>
<finalName>${project.artifactId}</finalName>
+ <installedBundles>
+ <installedBundle>${additional.bundle}</installedBundle>
+ </installedBundles>
<bootFeatures>
<feature>bundle</feature>
<feature>config</feature>
@@ -75,4 +79,14 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>add-bundle</id>
+ <properties>
+ <additional.bundle>additional-bundle-name</additional.bundle>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/37e752c4/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
index 9d285d4..4c5a5d0 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
@@ -29,7 +29,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
+import java.util.stream.Collectors;
import org.apache.karaf.profile.assembly.Builder;
import org.apache.karaf.tooling.utils.IoUtils;
@@ -574,7 +576,8 @@ public class AssemblyMojo extends MojoSupport {
}
private List<String> nonNullList(List<String> list) {
- return list == null ? new ArrayList<>() : list;
+ final List<String> nonNullList = list == null ? new ArrayList<>() : list;
+ return nonNullList.stream().filter(Objects::nonNull).collect(Collectors.toList());
}
}
[2/2] karaf git commit: [KARAF-5235] This closes #326
Posted by jb...@apache.org.
[KARAF-5235] This closes #326
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ef3ac79c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ef3ac79c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ef3ac79c
Branch: refs/heads/master
Commit: ef3ac79c9b156d8d43d177084ed2dfe9d8607009
Parents: 4992c1b 37e752c
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jul 5 16:04:57 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jul 5 16:04:57 2017 +0200
----------------------------------------------------------------------
.../karaf-maven-plugin/src/it/test-assembly/pom.xml | 14 ++++++++++++++
.../java/org/apache/karaf/tooling/AssemblyMojo.java | 5 ++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------