Repository: karaf Updated Branches: refs/heads/karaf-4.0.x 52c4c4b84 -> deca12754
[KARAF-3974] Impossible to connect through SSH after reboot clean Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/deca1275 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/deca1275 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/deca1275 Branch: refs/heads/karaf-4.0.x Commit: deca12754a0bd0c0342a50396be1a7d73a45eefb Parents: 52c4c4b Author: Guillaume Nodet <[email protected]> Authored: Tue Mar 8 13:15:11 2016 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Fri Jul 22 09:59:32 2016 +0200 ---------------------------------------------------------------------- .../src/main/filtered-resources/resources/etc/config.properties | 4 ++++ assemblies/features/framework/src/main/feature/feature.xml | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/deca1275/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties index 1153359..5869113 100644 --- a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties +++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties @@ -170,6 +170,10 @@ felix.fileinstall.noInitialDelay = true felix.fileinstall.log.level = 3 felix.fileinstall.log.default = jul +# Use cached urls for bundle CodeSource to avoid +# problems with JCE cached informations, see KARAF-3974 +felix.bundlecodesource.usecachedurls = true + # # Delay for writing the framework state to disk in equinox # must be >= 1000 and <= 1800000 http://git-wip-us.apache.org/repos/asf/karaf/blob/deca1275/assemblies/features/framework/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml index 29a11c7..16c44c7 100644 --- a/assemblies/features/framework/src/main/feature/feature.xml +++ b/assemblies/features/framework/src/main/feature/feature.xml @@ -33,9 +33,6 @@ <bundle start="true" start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle> <!-- features service --> <bundle start="true" start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle> - <!-- sshd --> - <bundle start="true" start-level="20">mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle> - </feature> </features>
