Repository: karaf Updated Branches: refs/heads/master 67afefaae -> 940e9f079
[KARAF-1432] Fix the way the features-validate-descriptor parses the system packages Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/940e9f07 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/940e9f07 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/940e9f07 Branch: refs/heads/master Commit: 940e9f0799b00b3d744b1f7d59550593d2b3377d Parents: 67afefa Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Apr 9 19:29:01 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Apr 9 19:30:48 2014 +0200 ---------------------------------------------------------------------- .../karaf/tooling/features/ValidateDescriptorMojo.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/940e9f07/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java index f5cb55f..bbab285 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java @@ -17,6 +17,7 @@ */ package org.apache.karaf.tooling.features; +import aQute.bnd.header.OSGiHeader; import org.apache.felix.utils.manifest.Clause; import org.apache.karaf.features.BundleInfo; import org.apache.karaf.features.Dependency; @@ -344,12 +345,7 @@ public class ValidateDescriptorMojo extends MojoSupport { } String packages = (String) properties.get(jreVersion); - for (String pkg : packages.split(";")) { - systemExports.add(pkg.trim()); - } - for (String pkg : packages.split(",")) { - systemExports.add(pkg.trim()); - } + systemExports.addAll(OSGiHeader.parseHeader(packages).keySet()); } /*
