KARAF-3882: add the not-commons-ssl to the mixture to avoid BC.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bd843682 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bd843682 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bd843682 Branch: refs/heads/master Commit: bd8436821d38a47dac6ab39e30c98cacfe1b02b3 Parents: e5d5a40 Author: Benson Margulies <[email protected]> Authored: Mon Jul 27 13:43:05 2015 -0400 Committer: Benson Margulies <[email protected]> Committed: Mon Jul 27 13:43:05 2015 -0400 ---------------------------------------------------------------------- assemblies/features/standard/pom.xml | 6 ++++++ .../standard/src/main/feature/feature.xml | 1 + .../karaf/features/internal/service/f01.xml | 1 + .../karaf/features/internal/service/f02.xml | 1 + .../ssh/OpenSSHGeneratorKeyFileProviderTest.java | 18 ++++++++++++++++++ 5 files changed, 27 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/bd843682/assemblies/features/standard/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index 7eb4089..d888da1 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -317,6 +317,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.not-yet-commons-ssl</artifactId> + <version>0.3.11_1</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.ssh</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/karaf/blob/bd843682/assemblies/features/standard/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index f816224..f3dae22 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -410,6 +410,7 @@ <feature>shell</feature> <feature>jaas</feature> <bundle start="true" start-level="30">mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle> + <bundle start="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.not-yet-commons-ssl/0.3.11_1</bundle> <bundle start="true" start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle> </feature> http://git-wip-us.apache.org/repos/asf/karaf/blob/bd843682/features/core/src/test/resources/org/apache/karaf/features/internal/service/f01.xml ---------------------------------------------------------------------- diff --git a/features/core/src/test/resources/org/apache/karaf/features/internal/service/f01.xml b/features/core/src/test/resources/org/apache/karaf/features/internal/service/f01.xml index 814c722..63747c6 100644 --- a/features/core/src/test/resources/org/apache/karaf/features/internal/service/f01.xml +++ b/features/core/src/test/resources/org/apache/karaf/features/internal/service/f01.xml @@ -83,6 +83,7 @@ <bundle>mvn:org.apache.mina/mina-core/2.0.0-RC1</bundle> <bundle>mvn:org.apache.sshd/sshd-core/0.4.0</bundle> <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/2.0.0</bundle> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.not-yet-commons-ssl/0.3.11_1</bundle> </feature> <feature name="management" version="2.0.0"> <bundle>mvn:org.apache.karaf/org.apache.karaf.management/2.0.0</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/bd843682/features/core/src/test/resources/org/apache/karaf/features/internal/service/f02.xml ---------------------------------------------------------------------- diff --git a/features/core/src/test/resources/org/apache/karaf/features/internal/service/f02.xml b/features/core/src/test/resources/org/apache/karaf/features/internal/service/f02.xml index 1578faa..b8fb77c 100644 --- a/features/core/src/test/resources/org/apache/karaf/features/internal/service/f02.xml +++ b/features/core/src/test/resources/org/apache/karaf/features/internal/service/f02.xml @@ -145,6 +145,7 @@ </config> <bundle dependency='true'>mvn:org.apache.mina/mina-core/2.0.1</bundle> <bundle dependency='true'>mvn:org.apache.sshd/sshd-core/0.5.0</bundle> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.not-yet-commons-ssl/0.3.11_1</bundle> <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/2.2.0</bundle> </feature> <feature name="management" version="2.2.0"> http://git-wip-us.apache.org/repos/asf/karaf/blob/bd843682/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/OpenSSHGeneratorKeyFileProviderTest.java ---------------------------------------------------------------------- diff --git a/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/OpenSSHGeneratorKeyFileProviderTest.java b/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/OpenSSHGeneratorKeyFileProviderTest.java index b977191..2ba97cf 100644 --- a/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/OpenSSHGeneratorKeyFileProviderTest.java +++ b/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/OpenSSHGeneratorKeyFileProviderTest.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.karaf.shell.ssh; import org.junit.Test;
