[KARAF-2318] Exclude service.factoryPid property from the Cellar sync git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.2.x@1483680 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/7ec15503 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/7ec15503 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/7ec15503 Branch: refs/heads/cellar-2.2.x Commit: 7ec15503424f09638b51ee3ba31eb2e63aaf06da Parents: eceb960 Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Fri May 17 07:57:05 2013 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Fri May 17 07:57:05 2013 +0000 ---------------------------------------------------------------------- .../java/org/apache/karaf/cellar/config/ConfigurationSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/7ec15503/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java ---------------------------------------------------------------------- diff --git a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java index 9748f5b..8ac5edb 100644 --- a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java +++ b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java @@ -28,7 +28,7 @@ import java.util.*; */ public class ConfigurationSupport extends CellarSupport { - private static String[] EXCLUDED_PROPERTIES = {"felix.fileinstall.filename", "felix.fileinstall.dir", "felix.fileinstall.tmpdir", "org.ops4j.pax.url.mvn.defaultRepositories"}; + private static String[] EXCLUDED_PROPERTIES = {"service.factoryPid", "felix.fileinstall.filename", "felix.fileinstall.dir", "felix.fileinstall.tmpdir", "org.ops4j.pax.url.mvn.defaultRepositories"}; private static final String FELIX_FILEINSTALL_FILENAME = "felix.fileinstall.filename";
