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 2015/11/27 11:00:46 UTC
[1/2] karaf git commit: [KARAF-4134] karaf-maven-plugin mixes up
prerequisities
Repository: karaf
Updated Branches:
refs/heads/master dbde45bb9 -> 7ccf06c01
[KARAF-4134] karaf-maven-plugin mixes up prerequisities
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bb7b8035
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bb7b8035
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bb7b8035
Branch: refs/heads/master
Commit: bb7b80350055e35b92c01f703e81857da81a6ae5
Parents: 9ebb25a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Nov 23 17:50:53 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Nov 23 18:34:28 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/profile/assembly/Builder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bb7b8035/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index 624820a..c791757 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -596,7 +596,7 @@ public class Builder {
if (val != null && !val.isEmpty()) {
List<String> comments = config.getComments(key);
Clause[] clauses = org.apache.felix.utils.manifest.Parser.parseHeader(val);
- Set<String> strings = new TreeSet<>();
+ Set<String> strings = new LinkedHashSet<>();
for (Clause clause : clauses) {
strings.add(clause.toString());
}
[2/2] karaf git commit: Merge branch 'KARAF-4134' of
https://github.com/oscerd/karaf
Posted by jb...@apache.org.
Merge branch 'KARAF-4134' of https://github.com/oscerd/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7ccf06c0
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7ccf06c0
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7ccf06c0
Branch: refs/heads/master
Commit: 7ccf06c01d9a456091a900e61315111a4483c7ea
Parents: dbde45b bb7b803
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Nov 27 10:41:40 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Nov 27 10:41:40 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/profile/assembly/Builder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/7ccf06c0/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------