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 2014/09/09 18:34:37 UTC
[1/2] git commit: [KARAF-3213] Upgrade to Felix FileInstall
3.4.1-SNAPSHOT in order to fix ConcurrentModificationException while polling
the etc folder
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 96247872d -> a5c293eb0
[KARAF-3213] Upgrade to Felix FileInstall 3.4.1-SNAPSHOT in order to fix ConcurrentModificationException while polling the etc folder
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9728ce59
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9728ce59
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9728ce59
Branch: refs/heads/karaf-2.x
Commit: 9728ce596aef06cdee3af60e80d93f3cf614da35
Parents: c3fb619
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Sep 9 18:33:33 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Sep 9 18:33:33 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/9728ce59/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d8fd72a..1d4edca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
<equinox.version>3.9.1-v20140110-1610</equinox.version>
<felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
<felix.configadmin.version>1.8.0</felix.configadmin.version>
- <felix.fileinstall.version>3.4.0</felix.fileinstall.version>
+ <felix.fileinstall.version>3.4.1-SNAPSHOT</felix.fileinstall.version>
<felix.framework.version>4.4.1</felix.framework.version>
<felix.framework.security.version>2.4.0</felix.framework.security.version>
<felix.gogo.version>0.12.1</felix.gogo.version>
[2/2] git commit: Merge branch 'karaf-2.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Posted by jb...@apache.org.
Merge branch 'karaf-2.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a5c293eb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a5c293eb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a5c293eb
Branch: refs/heads/karaf-2.x
Commit: a5c293eb0500b191c1cb734fdf6b9f3eaa72e3de
Parents: 9728ce5 9624787
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Sep 9 18:34:27 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Sep 9 18:34:27 2014 +0200
----------------------------------------------------------------------
assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf | 2 +-
.../apache-karaf/src/main/distribution/windows-text/bin/karaf.bat | 2 +-
assemblies/apache-karaf/src/main/filtered-resources/bin/admin | 2 +-
assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat | 2 +-
assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat | 2 +-
assemblies/apache-karaf/src/main/filtered-resources/bin/shell | 2 +-
assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------