We need to use the jsch 0.1.44 version as it got some bug fixes in relation to security when using it by the SFTP component. In this commit the version was downgraded to 0.1.42
On Sat, Dec 4, 2010 at 3:54 AM, <hadr...@apache.org> wrote: > Author: hadrian > Date: Sat Dec 4 02:54:39 2010 > New Revision: 1042087 > > URL: http://svn.apache.org/viewvc?rev=1042087&view=rev > Log: > CAMEL-3385. Patch applied with thanks to Dan Kulp > > Modified: > camel/trunk/components/camel-atom/pom.xml > camel/trunk/components/camel-blueprint/pom.xml > camel/trunk/components/camel-csv/pom.xml > camel/trunk/components/camel-ftp/pom.xml > camel/trunk/components/camel-quartz/pom.xml > camel/trunk/components/camel-script/pom.xml > camel/trunk/components/camel-spring-integration/pom.xml > camel/trunk/components/camel-spring-javaconfig/pom.xml > camel/trunk/components/camel-spring-ws/pom.xml > camel/trunk/components/camel-spring/pom.xml > camel/trunk/components/camel-web/pom.xml > camel/trunk/examples/camel-example-spring-javaconfig/pom.xml > camel/trunk/examples/camel-example-spring-xquery/pom.xml > camel/trunk/examples/pom.xml > camel/trunk/parent/pom.xml > camel/trunk/platforms/karaf/features/pom.xml > camel/trunk/platforms/karaf/pom.xml > camel/trunk/tests/camel-itest-karaf/pom.xml > camel/trunk/tests/camel-itest-osgi/pom.xml > > Modified: camel/trunk/components/camel-atom/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/components/camel-atom/pom.xml (original) > +++ camel/trunk/components/camel-atom/pom.xml Sat Dec 4 02:54:39 2010 > @@ -45,14 +45,6 @@ > </camel.osgi.import.pkg> > </properties> > > - <repositories> > - <repository> > - <id>apache.incubating.releases</id> > - <name>Apache Incubating Release Distribution Repository</name> > - <url>http://people.apache.org/repo/m2-incubating-repository</url> > - </repository> > - </repositories> > - > <dependencies> > <dependency> > <groupId>org.apache.camel</groupId> > > Modified: camel/trunk/components/camel-blueprint/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/components/camel-blueprint/pom.xml (original) > +++ camel/trunk/components/camel-blueprint/pom.xml Sat Dec 4 02:54:39 2010 > @@ -99,31 +99,8 @@ > <artifactId>log4j</artifactId> > <scope>test</scope> > </dependency> > - > </dependencies> > > - <repositories> > - <!-- for maven jaxb plugin --> > - <repository> > - <id>java.net</id> > - <name>java.net Maven Repository</name> > - <url>http://download.java.net/maven/1</url> > - > <!--<url>https://maven-repository.dev.java.net/nonav/repository</url>--> > - <layout>legacy</layout> > - </repository> > - </repositories> > - > - <pluginRepositories> > - <pluginRepository> > - <id>fusesource.m2</id> > - <name>Fusesource Release Repository</name> > - <url>http://repo.fusesource.com/maven2</url> > - <releases> > - <enabled>true</enabled> > - </releases> > - </pluginRepository> > - </pluginRepositories> > - > <build> > <resources> > <resource> > > Modified: camel/trunk/components/camel-csv/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-csv/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/components/camel-csv/pom.xml (original) > +++ camel/trunk/components/camel-csv/pom.xml Sat Dec 4 02:54:39 2010 > @@ -35,15 +35,6 @@ > > <camel.osgi.export.pkg>org.apache.camel.dataformat.csv.*</camel.osgi.export.pkg> > </properties> > > - <repositories> > - <!-- TODO we can remove this when the commons-csv release syncs to the > main repo --> > - <repository> > - <id>servicemix</id> > - <name>Apache ServiceMix Repository</name> > - <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url> > - </repository> > - </repositories> > - > <dependencies> > <dependency> > <groupId>org.apache.camel</groupId> > > Modified: camel/trunk/components/camel-ftp/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/components/camel-ftp/pom.xml (original) > +++ camel/trunk/components/camel-ftp/pom.xml Sat Dec 4 02:54:39 2010 > @@ -36,19 +36,6 @@ > > <camel.osgi.export.pkg>org.apache.camel.component.file.remote.*</camel.osgi.export.pkg> > </properties> > > - <repositories> > - <repository> > - <id>servicemix</id> > - <name>Apache ServiceMix Repository</name> > - <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url> > - </repository> > - <repository> > - <id>fusesource.m2</id> > - <name>Fusesource maven2 Repository</name> > - <url>http://repo.fusesource.com/maven2-all</url> > - </repository> > - </repositories> > - > <dependencies> > > <dependency> > > Modified: camel/trunk/components/camel-quartz/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/components/camel-quartz/pom.xml (original) > +++ camel/trunk/components/camel-quartz/pom.xml Sat Dec 4 02:54:39 2010 > @@ -38,16 +38,7 @@ > </camel.osgi.export.pkg> > </properties> > > - <repositories> > - <repository> > - <id>fusesource.m2</id> > - <name>Fusesource Dependency Repository</name> > - <url>http://repo.fusesource.com/maven2-all</url> > - </repository> > - </repositories> > - > <dependencies> > - > <dependency> > <groupId>org.apache.camel</groupId> > <artifactId>camel-core</artifactId> > > Modified: camel/trunk/components/camel-script/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-script/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/components/camel-script/pom.xml (original) > +++ camel/trunk/components/camel-script/pom.xml Sat Dec 4 02:54:39 2010 > @@ -42,11 +42,6 @@ > <name>ServiceMix Repository</name> > <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url> > </repository> > - <repository> > - <id>codehause.mule-deps</id> > - <name>Codehause Mule Dependencies Repository</name> > - <url>http://dist.codehaus.org/mule/dependencies/maven2</url> > - </repository> > </repositories> > > <dependencies> > > Modified: camel/trunk/components/camel-spring-integration/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/components/camel-spring-integration/pom.xml (original) > +++ camel/trunk/components/camel-spring-integration/pom.xml Sat Dec 4 > 02:54:39 2010 > @@ -36,21 +36,6 @@ > > <camel.osgi.import.before.defaults>org.springframework.integration.*;version="[1,2)"</camel.osgi.import.before.defaults> > </properties> > > - <repositories> > - <repository> > - <id>spring.maven.release</id> > - <name>Spring Release Maven Repo</name> > - <url>http://repository.springsource.com/maven/bundles/release</url> > - </repository> > - > - <repository> > - <id>com.springsource.repository.bundles.external</id> > - <name>SpringSource Enterprise Bundle Repository - External Bundle > Releases</name> > - <url>http://repository.springsource.com/maven/bundles/external</url> > - </repository> > - </repositories> > - > - > <build> > <defaultGoal>install</defaultGoal> > <resources> > @@ -97,7 +82,7 @@ > </dependency> > <dependency> > <groupId>org.springframework.integration</groupId> > - <artifactId>org.springframework.integration</artifactId> > + <artifactId>spring-integration-core</artifactId> > <version>${spring-integration-version}</version> > <exclusions> > <exclusion> > > Modified: camel/trunk/components/camel-spring-javaconfig/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/components/camel-spring-javaconfig/pom.xml (original) > +++ camel/trunk/components/camel-spring-javaconfig/pom.xml Sat Dec 4 > 02:54:39 2010 > @@ -43,14 +43,6 @@ > <junit-version>4.8.1</junit-version> > </properties> > > - <repositories> > - <repository> > - <id>com.springsource.repository.bundles.external</id> > - <name>SpringSource Enterprise Bundle Repository - External Bundle > Releases</name> > - <url>http://repository.springsource.com/maven/bundles/external</url> > - </repository> > - </repositories> > - > <dependencies> > <dependency> > <groupId>org.apache.camel</groupId> > @@ -103,9 +95,9 @@ > <version>${spring-version}</version> > </dependency> > <dependency> > - <groupId>net.sourceforge.cglib</groupId> > - <artifactId>com.springsource.net.sf.cglib</artifactId> > - <version>2.1.3</version> > + <groupId>org.apache.servicemix.bundles</groupId> > + <artifactId>org.apache.servicemix.bundles.cglib</artifactId> > + <version>2.1_3_6</version> > </dependency> > <dependency> > <groupId>junit</groupId> > > Modified: camel/trunk/components/camel-spring-ws/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/components/camel-spring-ws/pom.xml (original) > +++ camel/trunk/components/camel-spring-ws/pom.xml Sat Dec 4 02:54:39 2010 > @@ -36,14 +36,6 @@ > > <camel.osgi.export.pkg>org.apache.camel.component.spring.ws.*</camel.osgi.export.pkg> > </properties> > > - <repositories> > - <repository> > - <id>spring.maven.release</id> > - <name>Spring Release Maven Repo</name> > - > <url>http://repository.springsource.com/maven/bundles/release</url> > - </repository> > - </repositories> > - > <dependencies> > > <dependency> > > Modified: camel/trunk/components/camel-spring/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/components/camel-spring/pom.xml (original) > +++ camel/trunk/components/camel-spring/pom.xml Sat Dec 4 02:54:39 2010 > @@ -207,17 +207,6 @@ > > </dependencies> > > - <pluginRepositories> > - <pluginRepository> > - <id>fusesource.m2</id> > - <name>Fusesource Release Repository</name> > - <url>http://repo.fusesource.com/maven2</url> > - <releases> > - <enabled>true</enabled> > - </releases> > - </pluginRepository> > - </pluginRepositories> > - > <build> > <resources> > <resource> > > Modified: camel/trunk/components/camel-web/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/components/camel-web/pom.xml (original) > +++ camel/trunk/components/camel-web/pom.xml Sat Dec 4 02:54:39 2010 > @@ -53,50 +53,40 @@ > <layout>default</layout> > </repository> > <repository> > - <id>release.openqa.org</id> > - <name>OpenQA Releases</name> > - <url>http://archiva.openqa.org/repository/releases</url> > - <releases> > - <enabled>true</enabled> > - </releases> > + <id>guiceyfruit.release</id> > + <name>GuiceyFruit Release Repository</name> > + <url>http://guiceyfruit.googlecode.com/svn/repo/releases/</url> > <snapshots> > <enabled>false</enabled> > </snapshots> > - </repository> > - > - <!-- scalate SNAPSHOT repo --> > -<!-- <repository> > - <id>fusesource.snapshots</id> > - <name>FuseSource Snapshot Repository</name> > - > <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url> > - <snapshots> > - <enabled>true</enabled> > - </snapshots> > <releases> > - <enabled>false</enabled> > + <enabled>true</enabled> > </releases> > - </repository> --> > + </repository> > + > </repositories> > > <pluginRepositories> > <pluginRepository> > + <id>fusesource.m2</id> > + <url>http://repo.fusesource.com/maven2-all</url> > + <name>Fusesource Dependency Repository</name> > + <layout>default</layout> > + </pluginRepository> > + <pluginRepository> > <id>java.net.m2</id> > <name>Java.net Repository for Maven</name> > <url>http://download.java.net/maven/2/</url> > <layout>default</layout> > </pluginRepository> > - <pluginRepository> > - <id>glassfish-repo-archive</id> > - <name>Nexus repository collection for Glassfish</name> > - <url>http://maven.glassfish.org/content/groups/glassfish</url> > - <snapshots> > - <updatePolicy>never</updatePolicy> > - </snapshots> > - </pluginRepository> > </pluginRepositories> > > <dependencies> > <dependency> > + <groupId>commons-logging</groupId> > + <artifactId>commons-logging</artifactId> > + </dependency> > + <dependency> > <groupId>org.apache.camel</groupId> > <artifactId>camel-core</artifactId> > </dependency> > @@ -835,6 +825,7 @@ > <version>${jersey-version}</version> > <scope>provided</scope> > </dependency> > + > <dependency> > <groupId>javax.annotation</groupId> > <artifactId>jsr250-api</artifactId> > > Modified: camel/trunk/examples/camel-example-spring-javaconfig/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-javaconfig/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/examples/camel-example-spring-javaconfig/pom.xml (original) > +++ camel/trunk/examples/camel-example-spring-javaconfig/pom.xml Sat Dec 4 > 02:54:39 2010 > @@ -82,9 +82,9 @@ > <version>${spring-version}</version> > </dependency> > <dependency> > - <groupId>net.sourceforge.cglib</groupId> > - <artifactId>com.springsource.net.sf.cglib</artifactId> > - <version>2.1.3</version> > + <groupId>org.apache.servicemix.bundles</groupId> > + <artifactId>org.apache.servicemix.bundles.cglib</artifactId> > + <version>2.1_3_6</version> > </dependency> > > <dependency> > > Modified: camel/trunk/examples/camel-example-spring-xquery/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-xquery/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/examples/camel-example-spring-xquery/pom.xml (original) > +++ camel/trunk/examples/camel-example-spring-xquery/pom.xml Sat Dec 4 > 02:54:39 2010 > @@ -34,6 +34,7 @@ > > <properties> > > <camel.osgi.import.additional>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool</camel.osgi.import.additional> > + <camel.osgi.export.pkg/> > </properties> > > <dependencies> > > Modified: camel/trunk/examples/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/examples/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/examples/pom.xml (original) > +++ camel/trunk/examples/pom.xml Sat Dec 4 02:54:39 2010 > @@ -30,24 +30,6 @@ > <description>Camel Examples</description> > <packaging>pom</packaging> > > - <repositories> > - <!-- this should not be required as its syncd to ibiblio --> > - <repository> > - <id>apache.m2.repo</id> > - <name>Apache Maven2 Repository</name> > - <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url> > - </repository> > - </repositories> > - > - <pluginRepositories> > - <!-- this should not be required as its syncd to ibiblio --> > - <pluginRepository> > - <id>apache.m2.repo</id> > - <name>Apache Maven2 Repository</name> > - <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url> > - </pluginRepository> > - </pluginRepositories> > - > <modules> > <module>camel-example-aggregate</module> > <module>camel-example-axis</module> > > Modified: camel/trunk/parent/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/parent/pom.xml (original) > +++ camel/trunk/parent/pom.xml Sat Dec 4 02:54:39 2010 > @@ -97,7 +97,7 @@ > <jexcelapi-version>2.4.2</jexcelapi-version> > <jibx-version>1.2.2</jibx-version> > <jruby-version>1.5.2</jruby-version> > - <jsch-version>0.1.44</jsch-version> > + <jsch-version>0.1.42</jsch-version> > <juel-version>2.1.2</juel-version> > <junit-version>4.8.1</junit-version> > <log4j-version>1.2.16</log4j-version> > @@ -195,25 +195,6 @@ > <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> > </properties> > > - <pluginRepositories> > - <pluginRepository> > - <id>fusesource.m2</id> > - <name>Fusesource Release Repository</name> > - <url>http://repo.fusesource.com/maven2</url> > - <releases> > - <enabled>true</enabled> > - </releases> > - </pluginRepository> > - <pluginRepository> > - <id>apache.snapshots</id> > - <name>Apache Snapshots Repository</name> > - <url>http://repository.apache.org/snapshots/</url> > - <snapshots> > - <enabled>true</enabled> > - </snapshots> > - </pluginRepository> > - </pluginRepositories> > - > <dependencyManagement> > <dependencies> > > > Modified: camel/trunk/platforms/karaf/features/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/platforms/karaf/features/pom.xml (original) > +++ camel/trunk/platforms/karaf/features/pom.xml Sat Dec 4 02:54:39 2010 > @@ -136,21 +136,6 @@ > <wss4j-version>1.5.8</wss4j-version> > </properties> > > - <repositories> > - <!-- ServiceMix repo (for org.osgi:org.osgi.impl.bundle.jmx) --> > - <repository> > - <id>servicemix</id> > - <name>Apache ServiceMix Repository</name> > - <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url> > - <releases> > - <enabled>true</enabled> > - </releases> > - <snapshots> > - <enabled>false</enabled> > - </snapshots> > - </repository> > - </repositories> > - > <!-- The validate plugin will export these provided dependencies bundles' > export packages first --> > <dependencies> > <dependency> > > Modified: camel/trunk/platforms/karaf/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/platforms/karaf/pom.xml (original) > +++ camel/trunk/platforms/karaf/pom.xml Sat Dec 4 02:54:39 2010 > @@ -47,81 +47,13 @@ > <snapshots> > <enabled>true</enabled> > </snapshots> > + <releases> > + <enabled>false</enabled> > + </releases> > <id>apache.snapshots</id> > <name>Apache Snapshot Repository</name> > <url>http://repository.apache.org/snapshots</url> > </pluginRepository> > </pluginRepositories> > - > - <repositories> > - <!--ServiceMix OSGi bundle repo --> > - <repository> > - <id>servicemix</id> > - <name>ServiceMix OSGi bundle Repository</name> > - <url>http://repo2.maven.org/maven2</url> > - <releases> > - <enabled>true</enabled> > - </releases> > - <snapshots> > - <enabled>false</enabled> > - </snapshots> > - </repository> > - <!--ServiceMix OSGi bundle snapshot repo --> > - <repository> > - <id>servicemix.snapshot</id> > - <name>ServiceMix OSGi bundle snapshot Repository</name> > - > <url>http://repository.apache.org/content/groups/snapshots-group</url> > - <releases> > - <enabled>false</enabled> > - </releases> > - <snapshots> > - <enabled>true</enabled> > - </snapshots> > - </repository> > - <!-- OPS4J repo --> > - <repository> > - <id>ops4j</id> > - <name>OPS4j Repository</name> > - <url>http://repository.ops4j.org/maven2</url> > - <releases> > - <enabled>true</enabled> > - </releases> > - <snapshots> > - <enabled>false</enabled> > - </snapshots> > - </repository> > - <!-- Jboss maven repo --> > - <repository> > - <id>jboss</id> > - <name>Jboss Repository</name> > - <url>http://repository.jboss.org/nexus/content/groups/public/</url> > - <releases> > - <enabled>true</enabled> > - </releases> > - <snapshots> > - <enabled>false</enabled> > - </snapshots> > - </repository> > - <!-- Spring milestone repo --> > - <repository> > - <id>spring-milestone</id> > - <name>Spring Portfolio Milestone Repository</name> > - > <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url> > - <releases> > - <enabled>true</enabled> > - </releases> > - <snapshots> > - <enabled>false</enabled> > - </snapshots> > - </repository> > - > - <!-- Java.net Repository for javax mail --> > - <repository> > - <id>java.net.m2</id> > - <name>Java.net Repository for Maven</name> > - <url>http://download.java.net/maven/2/</url> > - <layout>default</layout> > - </repository> > - </repositories> > > </project> > > Modified: camel/trunk/tests/camel-itest-karaf/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/tests/camel-itest-karaf/pom.xml (original) > +++ camel/trunk/tests/camel-itest-karaf/pom.xml Sat Dec 4 02:54:39 2010 > @@ -31,13 +31,6 @@ > <name>Camel :: Karaf Integration Tests</name> > <description>Performs Karaf compliance integration tests</description> > > - <repositories> > - <repository> > - <id>biz.aQute</id> > - <url>http://www.aqute.biz/repo</url> > - </repository> > - </repositories> > - > <dependencies> > <dependency> > <groupId>org.ops4j.pax.exam</groupId> > > Modified: camel/trunk/tests/camel-itest-osgi/pom.xml > URL: > http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1042087&r1=1042086&r2=1042087&view=diff > ============================================================================== > --- camel/trunk/tests/camel-itest-osgi/pom.xml (original) > +++ camel/trunk/tests/camel-itest-osgi/pom.xml Sat Dec 4 02:54:39 2010 > @@ -34,10 +34,6 @@ > > <repositories> > <repository> > - <id>biz.aQute</id> > - <url>http://www.aqute.biz/repo</url> > - </repository> > - <repository> > <id>hapi</id> > <name>HAPI Maven Repository</name> > <url>http://hl7api.sourceforge.net/m2/</url> > > > -- Claus Ibsen ----------------- FuseSource Email: cib...@fusesource.com Web: http://fusesource.com Twitter: davsclaus Blog: http://davsclaus.blogspot.com/ Author of Camel in Action: http://www.manning.com/ibsen/
