This is an automated email from the ASF dual-hosted git repository. gaul pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 3d753a48d268562ed0dc61b46e73e0d44bb0009d Author: gurkerl83 <[email protected]> AuthorDate: Wed Feb 3 21:56:53 2021 +0100 Clear rule for bouncycastle exclusion - Mock-Webserver v2.2.0 - Vendor, defined dependency bcprov-jdk15on > Previously, the dependency got excluded; otherwise, it conflicted with the existing bouncy castle version used in JClouds. - Mock-Webserver v3.14.9 - The vendor does not define a bouncy castle dependency anymore; instead, it moved to the okhttp-tls module. - Introduce the okhttp-tls module for tests in the core module. The following APIs (Docker, Elastic-Stack) and providers Softlayer extend their respective MockTest from BaseMockWebServerTest. The mock base test is located in the test jar of JClouds core module. - Due to conflicting bouncy castle classes in the classpath, those which get loaded from the okhttp-tls module, and those defined in JClouds bouncy castle module, the bouncy castle dependency of okhttp-tls has to get skipped for the two APIs and providers mentioned. Side note: The JClouds GAE driver module also requires the new okhttp-tls dependency because of the following chain of inheritance. Different from the situation above, the bouncy castle classes of the okhttp-tls got not excluded. GaeHttpCommandExecutorServiceIntegrationTest -> BaseHttpCommandExecutorServiceIntegrationTest -> BaseMockWebServerTest The reason for this is unknown to me. --- apis/docker/pom.xml | 8 -------- apis/ec2/pom.xml | 7 ------- apis/elasticstack/pom.xml | 8 -------- apis/openstack-nova/pom.xml | 7 ------- providers/aws-ec2/pom.xml | 7 ------- providers/aws-s3/pom.xml | 6 ------ providers/azurecompute-arm/pom.xml | 7 ------- providers/digitalocean2/pom.xml | 7 ------- providers/google-cloud-storage/pom.xml | 7 ------- providers/google-compute-engine/pom.xml | 7 ------- providers/packet/pom.xml | 7 ------- providers/profitbricks/pom.xml | 7 ------- providers/softlayer/pom.xml | 8 -------- 13 files changed, 93 deletions(-) diff --git a/apis/docker/pom.xml b/apis/docker/pom.xml index fd54a2a..4038de4 100644 --- a/apis/docker/pom.xml +++ b/apis/docker/pom.xml @@ -107,20 +107,12 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.squareup.okhttp3</groupId> <artifactId>okhttp-tls</artifactId> <scope>test</scope> <exclusions> - <!-- Already provided by jclouds-sshj --> <exclusion> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml index fa702a1..dad04a4 100644 --- a/apis/ec2/pom.xml +++ b/apis/ec2/pom.xml @@ -87,13 +87,6 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.google.auto.service</groupId> diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml index 183e731..f24daf3 100644 --- a/apis/elasticstack/pom.xml +++ b/apis/elasticstack/pom.xml @@ -75,20 +75,12 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.squareup.okhttp3</groupId> <artifactId>okhttp-tls</artifactId> <scope>test</scope> <exclusions> - <!-- Already provided by jclouds-sshj --> <exclusion> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> diff --git a/apis/openstack-nova/pom.xml b/apis/openstack-nova/pom.xml index bdc7b3b..cfcdd50 100644 --- a/apis/openstack-nova/pom.xml +++ b/apis/openstack-nova/pom.xml @@ -107,13 +107,6 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- provided by the jclouds-bouncycastle driver --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.google.auto.service</groupId> diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml index 8f24e91..a9362ea 100644 --- a/providers/aws-ec2/pom.xml +++ b/providers/aws-ec2/pom.xml @@ -100,13 +100,6 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.google.auto.service</groupId> diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml index bd4fbed..28d4a09 100644 --- a/providers/aws-s3/pom.xml +++ b/providers/aws-s3/pom.xml @@ -93,12 +93,6 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.google.auto.service</groupId> diff --git a/providers/azurecompute-arm/pom.xml b/providers/azurecompute-arm/pom.xml index 5632468..2e4c3a6 100644 --- a/providers/azurecompute-arm/pom.xml +++ b/providers/azurecompute-arm/pom.xml @@ -116,13 +116,6 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.github.spotbugs</groupId> diff --git a/providers/digitalocean2/pom.xml b/providers/digitalocean2/pom.xml index 0254f30..5bb4bca 100644 --- a/providers/digitalocean2/pom.xml +++ b/providers/digitalocean2/pom.xml @@ -99,13 +99,6 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.google.auto.value</groupId> diff --git a/providers/google-cloud-storage/pom.xml b/providers/google-cloud-storage/pom.xml index 7c0b4da..5b32d86 100644 --- a/providers/google-cloud-storage/pom.xml +++ b/providers/google-cloud-storage/pom.xml @@ -119,13 +119,6 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> <profiles> diff --git a/providers/google-compute-engine/pom.xml b/providers/google-compute-engine/pom.xml index ee79fe0..8898bda 100644 --- a/providers/google-compute-engine/pom.xml +++ b/providers/google-compute-engine/pom.xml @@ -131,13 +131,6 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> <profiles> diff --git a/providers/packet/pom.xml b/providers/packet/pom.xml index 2fb2294..d832177 100644 --- a/providers/packet/pom.xml +++ b/providers/packet/pom.xml @@ -97,13 +97,6 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> diff --git a/providers/profitbricks/pom.xml b/providers/profitbricks/pom.xml index e3cf54c..bc9a467 100644 --- a/providers/profitbricks/pom.xml +++ b/providers/profitbricks/pom.xml @@ -85,13 +85,6 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.jclouds.driver</groupId> diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml index 3e139bc..e64074f 100644 --- a/providers/softlayer/pom.xml +++ b/providers/softlayer/pom.xml @@ -84,20 +84,12 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.squareup.okhttp3</groupId> <artifactId>okhttp-tls</artifactId> <scope>test</scope> <exclusions> - <!-- Already provided by jclouds-sshj --> <exclusion> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId>
