This is an automated email from the ASF dual-hosted git repository. ggrzybek pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push: new f3ea14b [CAMEL-17835] Review camel-git and camel-ftp features - use new com.github.mwiede/jsch fork of org.jcraft/jsch (#128) f3ea14b is described below commit f3ea14b3526e954e6f11951865aac4d6acdfb93c Author: Grzegorz Grzybek <gr.grzy...@gmail.com> AuthorDate: Tue Mar 22 15:31:50 2022 +0100 [CAMEL-17835] Review camel-git and camel-ftp features - use new com.github.mwiede/jsch fork of org.jcraft/jsch (#128) --- platforms/karaf/features/src/main/resources/bundles.properties | 1 - platforms/karaf/features/src/main/resources/features.xml | 4 ++-- pom.xml | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/platforms/karaf/features/src/main/resources/bundles.properties b/platforms/karaf/features/src/main/resources/bundles.properties index 5898381..73af4ed 100644 --- a/platforms/karaf/features/src/main/resources/bundles.properties +++ b/platforms/karaf/features/src/main/resources/bundles.properties @@ -51,7 +51,6 @@ org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison- org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-bundle-version}/jar -org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib-bundle-version}/jar diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 547a53f..5d5f94f 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -889,7 +889,7 @@ <feature name='camel-ftp' version='${project.version}' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:commons-net/commons-net/${commons-net-version}</bundle> - <bundle dependency='true'>wrap:mvn:com.github.mwiede/jsch/${jsch-version}$overwrite=merge&Bundle-SymbolicName=org.apache.servicemix.bundles.jsch&Export-Package=com.jcraft.jsch;version=0.1.55,com.jcraft.jsch.bc;version=0.1.55,com.jcraft.jsch.jbcrypt;version=0.1.55,com.jcraft.jsch.jce;version=0.1.55,com.jcraft.jsch.jgss;version=0.1.55,com.jcraft.jsch.juz;version=0.1.55,com.jcraft.jsch.jzlib;version=0.1.55,com.jcraft.jsch;version=${jsch-version},com.jcraft.jsch.bc;version=${jsch [...] + <bundle dependency='true'>wrap:mvn:com.github.mwiede/jsch/${jsch-version}$overwrite=merge&Bundle-SymbolicName=org.apache.servicemix.bundles.jsch&Export-Package=com.jcraft.jsch;version=0.1.55,com.jcraft.jsch.bc;version=0.1.55,com.jcraft.jsch.jbcrypt;version=0.1.55,com.jcraft.jsch.jce;version=0.1.55,com.jcraft.jsch.jgss;version=0.1.55,com.jcraft.jsch.juz;version=0.1.55,com.jcraft.jsch.jzlib;version=0.1.55,com.jcraft.jsch;version=${jsch-version},com.jcraft.jsch.bc;version=${jsch [...] <bundle>mvn:org.apache.camel/camel-ftp/${project.version}</bundle> </feature> <feature name='camel-ganglia' version='${project.version}' start-level='50'> @@ -902,7 +902,7 @@ <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.eclipse.jgit/org.eclipse.jgit/${jgit-version}</bundle> <bundle dependency='true'>mvn:com.googlecode.javaewah/JavaEWAH/${java-ewah-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.github.mwiede/jsch/${jsch-version}$overwrite=merge&Bundle-SymbolicName=org.apache.servicemix.bundles.jsch&Export-Package=com.jcraft.jsch;version=0.1.55,com.jcraft.jsch.bc;version=0.1.55,com.jcraft.jsch.jbcrypt;version=0.1.55,com.jcraft.jsch.jce;version=0.1.55,com.jcraft.jsch.jgss;version=0.1.55,com.jcraft.jsch.juz;version=0.1.55,com.jcraft.jsch.jzlib;version=0.1.55,com.jcraft.jsch;version=${jsch-version},com.jcraft.jsch.bc;version=${jsch [...] <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle> <bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}</bundle> <bundle dependency='true'>mvn:org.bouncycastle/bcpg-jdk15on/${bouncycastle-version}</bundle> diff --git a/pom.xml b/pom.xml index 84264a1..f8d0f9a 100644 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,6 @@ <jcodings-version>1.0.46</jcodings-version> <joni-version>2.1.31</joni-version> <josql-bundle-version>1.5_5</josql-bundle-version> - <jsch-bundle-version>0.1.55_1</jsch-bundle-version> <json-flattener-version>0.9.0</json-flattener-version> <json-smart-version>2.4.7</json-smart-version> <jt400-bundle-version>10.7_1</jt400-bundle-version>