Commit Graph

280 Commits

Author SHA1 Message Date
gurkerl83 57f6bbc43a Remove explicit OSGi import range of okio dep
All OkHttp components get shipped with any OSGi metadata. Tracking the progress of that issue from version 5 onwards, OkHttp finally provides OSGi support. Because JClouds OkHttp dependencies got renewed from 2.2.0 to the latest 3 (3.14.9), the respective bundles from Apache Servicemix got used in a deployment scenario. On the other hand, the problem with Servicemix is that there is no full match of published OkHttp dependencies to the respective bundle equivalent.

https://mvnrepository.com/artifact/org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp

My test shows that none of the version 3 bundles work because of a missing package dependency "javax.annotation.meta". Sure higher version of 9 strips the javax.annotation module entirely, but the meta package is not there in JDK 8 either. As you can see from the link above, only two versions of 3.14 got published in the service mix; it is not clear to which version the bundle equivalents relate. From my understanding, it is much more important to use identical versions of OkHttp dependencies used in JClouds.

To utilize the original OKHttp libraries, consumer projects have to ensure those libraries get loaded using OSGi helper tools such as the wrap protocol provided by Apache Karaf or similar.

To reduce OSGi noise, I removed the OSGi import range of okio dependency entirely. A declaration like that does not make sense; otherwise, a set of Okhttp ranges must also be defined.

Note: The wildcard (*) declaration provides a way out, which allows any version of a package used in JClouds but itself does not give any OSGi metadata. Hopefully, I do not confuse you too much.
2021-02-12 18:57:46 +09:00
korlov42 d7897b3d25 fix failed testSSLConnectionFailsIfOnlyHttpConfigured 2021-02-12 18:57:46 +09:00
korlov42 d74dcca6dd fix UnsupportedOperationException during setting socketFactory 2021-02-12 18:57:46 +09:00
korlov42 44ff69d144 JCLOUDS-1551: Update version of OkHttp 3.14.9 2021-02-12 18:57:46 +09:00
gurkerl83 32f6c4d50f Remove the OSGi configuration from each module. The approach of defining OSGi configuration through common properties and serving them to the bundle plugin gets no longer used; instead, OSGi configuration gets defined in each module's dedicated bnd file. 2020-10-26 19:58:41 +09:00
gurkerl83 7a9cd345a6 Onboard bnd-configuration files, one per module 2020-10-26 19:58:41 +09:00
Andrew Gaul 62767a1461 JCLOUDS-1333: JCLOUDS-1334: JCLOUDS-1470: Require Java 8 and Guava 22
This allows compatibility with Guava 29.  Also unwind some older
workarounds.
2020-06-25 08:11:30 +09:00
Xavier BOURGOUIN d6702e5ee0 Fix BlobMetadata null size when using ApacheHCHttp module
JClouds is apparently exclusively using the Payload object from the HTTP
response to fill in the size of the BlobMetadata (when calling
blobStore.blobMetadata(...) ) - adapt this driver accordingly otherwise
we systematically get null size BlobMetadata out of it.
2020-03-08 22:15:43 +09:00
Colm O hEigeartaigh b96158e6ed JCLOUDS-1532 - Update SSHJ + JSCH (#57) 2019-12-03 17:17:06 +01:00
Colm O hEigeartaigh 18da28af9f Downgrade BouncyCastle to 1.60, which works with Oracle JDK 1.7 (#54) 2019-11-18 14:54:30 +01:00
Colm O hEigeartaigh 30830bfa4e JCLOUDS-1526 - Update BouncyCastle dependency (#53) 2019-11-15 16:03:40 +01:00
Xavier BOURGOUIN 316b74db94 Fix infinite socket timeout when using ApacheHCHttpCommandExecutorServiceModule (#51)
Because the Java type BasicHttpParams wasn't matching the one returned
by provider "newBasicHttpParams" (which is returning a HttpParams type), it was configuring the Apache HTTP client with default settings (including connection and socket timeout), ignoring the ones of JClouds which were must safer in this regard (JCloudsones are currently 60sec for both, while Apache HC ones are -1, so infinite). It also prevented to override those default/infinite timeout settings with JClouds ones.
2019-10-23 11:44:58 +02:00
Ignasi Barrera f5b29c7028 Next development version 2.3.0-SNAPSHOT 2019-10-21 10:32:43 +02:00
Ignasi Barrera 7221844fac Apache jclouds 2.2.0-rc1 release 2019-10-21 10:32:43 +02:00
Xavier BOURGOUIN c445547ea8 Fix null content-length header on HEAD requests
https://issues.apache.org/jira/projects/JCLOUDS/issues/JCLOUDS-1505
2019-10-10 09:59:38 -07:00
Ignasi Barrera 767240f360 JCLOUDS-1462: Upgrade Apache Http driver to 4.3.6
In response to https://nvd.nist.gov/vuln/detail/CVE-2015-5262
2018-10-18 16:50:18 -04:00
Andrew Gaul 46a9f574e2 Fix some orphaned format strings
These lack values to format with.  Found via error-prone 2.3.0.
2018-04-19 08:43:46 -07:00
andreaturli d17487b223 fix typo in project.version
- from 2.2.0-SNAPSHOST to 2.2.0-SNAPSHOT
2018-02-21 16:45:43 +01:00
andreaturli a5db565581 Next development version 2.2.0-SNAPSHOST 2018-02-16 11:23:12 +01:00
andreaturli 9273bd56ad Apache jclouds 2.1.0-rc3 release 2018-02-16 11:20:21 +01:00
khopade c468c60d51 Utilizing MD5 hash present in payload metadata, instead of generating it again from payload 2017-11-10 10:04:06 +01:00
Andrew Gaul 46759f8bda Fix a few Coverity defects 2017-11-05 20:12:47 -08:00
Andrew Gaul b424a6c164 Alphabetize modules 2017-09-07 07:27:56 -07:00
Andrew Gaul 517323fbd5 JCLOUDS-1225: Address Guava 18 MoreExecutors changes
Fixed with:

find -name \*.java | xargs sed -i 's/sameThreadExecutor/newDirectExecutorService/g'
2017-08-22 17:14:22 -07:00
Andrew Gaul a493e2ca2f JCLOUDS-1225: Address Guava 18 Objects changes
Fixed with:

find -name \*.java | xargs sed -i 's/Objects.[Tt]oStringHelper/More&/g'
find -name \*.java | xargs sed -i 's/Objects.firstNonNull/More&/g'
find -name \*.java | xargs sed -i 's/^\(import com.google.common.base.\)\(Objects.*\)/\1More\2\n\1\2/g'
find -name \*.java | xargs java -jar google-java-format-1.3-all-deps.jar -i --fix-imports-only --skip-sorting-imports
2017-08-22 17:12:53 -07:00
Andrea Turli 014f7a4fb9 bump sshj version to 0.20.0
- this version contains some bux fixes especially useful for OSGi
2017-03-06 17:03:53 +01:00
Mike Cowan 6688b57cf4 Update JSCH to version 0.1.54 2017-03-03 16:33:50 +01:00
Ignasi Barrera 2f70f85c2b Remove all sonatype snapshot repositories 2017-03-03 10:49:48 +01:00
Andrea Turli 4ae2d208e4 update netty driver
- use a fix version to avoid package renaming issues
2017-02-06 17:09:46 +01:00
Vijay Panghal f3c3f3b306 Make user agent header configurable
Jclouds sends default user agent string with each request to cloud
services. But some of the application would like to overide this and
send custom user agent instead.

This commit define a string property to overide this default user agent
string. This property will be applied to all outgoing http request to
cloud services

JCLOUDS-819
2016-12-20 11:02:19 +01:00
Guglielmo Nigri 5a3cfe5dbe Fix okio version range for jclouds-okhttp
OSGi bundle for jclouds-okhttp should import okio package with correct
version range.
Currently, there is no version range specified, causing it to be wired
to a higher version than intended in complex environments that have more
than one bundle for okio installed.
2016-11-18 16:05:52 +01:00
Ignasi Barrera d290705419 Next development version 2.1.0-SNAPSHOT 2016-11-15 01:12:59 +01:00
Ignasi Barrera 6a3a37f4e0 Apache jclouds 2.0.0-rc3 release 2016-11-09 22:30:45 +01:00
Andrew Gaul 3c9f66b8e9 Avoid lower-case l literal suffix
Readers can confuse this with 1.  Found via error-prone.  Fixed via:

find -name \*.java | xargs sed -i 's/\( [0-9][0-9]*\)l/\1L/g'
find -name \*.java | xargs sed -i 's/\(([0-9][0-9]*\)l/\1L/g'
2016-10-23 14:24:35 -07:00
Ignasi Barrera edbb2c0e6f Log information according to the auth precedence 2016-10-19 10:45:50 +02:00
Ignasi Barrera 7dc73ee0bf Do not try to connect to ssh if already connected 2016-08-12 00:39:28 +02:00
Andrew Gaul 5fec2346a6 JCLOUDS-1028: Configure idempotent methods
Enable POST for Atmos, S3, and Swift.
2016-06-15 16:35:22 -07:00
Andrew Gaul cdbf856900 Address error-prone AssertFalse warnings 2016-04-27 18:54:09 -07:00
Andrew Gaul 66cda12b50 Avoid eager evaluation of Preconditions messages
Found via error-prone.
2016-04-24 23:28:55 -07:00
Ignasi Barrera b9322c583d JCLOUDS-1091: Populate the Content-Length header in the OkHttp driver 2016-03-14 12:42:44 +01:00
Reijhanniel Jearl Campos a4b8a73790 JCLOUDS-1053: Fallback to -1 when sshj exit status returns null 2016-01-22 12:40:35 +01:00
Nikolay Sokolov 060b66a4f7 Close connection during ExecChannel 2015-10-25 23:02:33 +01:00
Oliver Gondža edde721937 JCLOUDS-962: Make all @Provider methods final 2015-09-02 23:54:44 +02:00
Stuart Hendren 4f649b43f4 JCLOUDS-827: Upgrading sshj to 0.12.0 (new group ID too)
Also upgraded jsch.agentproxy.* to 0.0.9 and bouncycastle
to 1.51 - required for the sshj change.
2015-08-12 13:47:41 -04:00
Ignasi Barrera 8859eaeb68 JCLOUDS-921 prioritise key over password in SessionConnection 2015-06-11 13:48:25 +02:00
Stuart Hendren f6a97139c9 JCLOUDS-921 prioritise key over password in SSHClientConnection
From ticket:
If keyboard interactive login is not allowed on the box but the user also requires a sudo password the ssh fails as it prioritises the password.
If you remove the password then the sudo fails in the SudoAwareInitManager.
It would seem better to prioritise the key over the password in SSHClientConnection or possibly try both if they are both present, and the first fails.

This commit swaps the order of the if else check to use the ssh key if present.
2015-06-11 13:48:19 +02:00
Huy TA f646b84c9e Use ssh agent if privatekey and password are not set 2015-06-11 12:37:06 +02:00
Andrew Phillips 7f38520314 JCLOUDS-884: Only try netcat over ssh-agent as an agentproxy
See http://markmail.org/thread/oto47qk2kzcdtebb
2015-04-09 09:48:40 -04:00
Ignasi Barrera f469cf8b51 Next development version 2.0.0-SNAPSHOT 2015-03-24 10:52:01 +01:00
Ignasi Barrera bb41ed4341 Apache jclouds 1.9.0 release 2015-03-24 10:35:42 +01:00