Skip to content

Commit

Permalink
remove duplicate libraries, make assembly simpler. apache#3676
Browse files Browse the repository at this point in the history
  • Loading branch information
@hansva
hansva committed Aug 26, 2024
1 parent 75dcccf commit 6fdd077
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 70 deletions.
2 changes: 1 addition & 1 deletion docker/integration-tests/integration-tests-azure.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
azurite-blob:
ports:
- "10000"
image: mcr.microsoft.com/azure-storage/azurite:3.29.0
image: mcr.microsoft.com/azure-storage/azurite:3.31.0
command: azurite-blob --blobHost 0.0.0.0
healthcheck:
test: nc 127.0.0.1 10000 -z
Expand Down
30 changes: 19 additions & 11 deletions plugins/tech/azure/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,20 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -104,7 +118,7 @@
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>commons-lang3</artifactId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.gson</groupId>
Expand All @@ -114,18 +128,12 @@
<groupId>com.google.guava</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
58 changes: 0 additions & 58 deletions plugins/tech/azure/src/assembly/assembly.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,63 +52,5 @@
</excludes>
<outputDirectory>plugins/tech/azure/lib</outputDirectory>
</dependencySet>
<dependencySet>
<scope>provided</scope>
<includes>
<!-- <include>com.microsoft.azure:azure-storage</include>-->
<include>com.azure:azure-storage-common</include>
<include>com.azure:azure-storage-blob</include>
<include>com.azure:azure-storage-file-datalake</include>
<include>com.azure:azure-core</include>
<include>com.azure:azure-core-http-netty</include>
<include>org.reactivestreams:reactive-streams</include>
<include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310</include>
<include>io.projectreactor.netty:reactor-netty-core</include>
<include>io.projectreactor:reactor-core</include>
<include>io.projectreactor.netty:reactor-netty-http</include>

<include>com.azure:azure-json</include>
<include>io.netty:netty-handler:jar</include>
<include>io.netty:netty-handler-proxy:jar</include>
<include>io.netty:netty-buffer:jar</include>
<include>io.netty:netty-codec:jar</include>
<include>io.netty:netty-codec-http:jar</include>
<include>io.netty:netty-codec-http2:jar</include>
<include>io.netty:netty-transport</include>
<include>io.netty:netty-common</include>
<include>io.netty:netty-transport-native-unix-common:jar</include>
<include>io.netty:netty-transport-native-epoll:jar</include>
<include>io.netty:netty-transport-native-kqueue:jar</include>
<include>io.netty:netty-transport-tcnative-boringssl-static:jar</include>
<include>io.netty:netty-resolver:jar</include>
<include>io.netty:netty-resolver-dns:jar</include>
<!-- <include>com.microsoft.azure:azure-keyvault-core</include>-->
<!-- <include>com.microsoft.azure:azure-eventhubs:jar</include>-->
<!-- <include>org.apache.qpid:proton-j:jar</include>-->
<!-- <include>com.microsoft.azure:qpid-proton-j-extensions:jar</include>-->
<!-- <include>com.microsoft.azure:azure-client-authentication:jar</include>-->
<!-- <include>com.microsoft.azure:azure-client-runtime:jar</include>-->
<!-- <include>com.microsoft.rest:client-runtime:jar</include>-->
<!-- <include>com.squareup.retrofit2:retrofit:jar</include>-->
<!-- <include>com.squareup.okhttp3:logging-interceptor:jar</include>-->
<!-- <include>com.squareup.okhttp3:okhttp-urlconnection:jar</include>-->
<!-- <include>com.squareup.retrofit2:converter-jackson:jar</include>-->
<!-- <include>com.fasterxml.jackson.datatype:jackson-datatype-joda:jar</include>-->
<!-- <include>joda-time:joda-time:jar</include>-->
<!-- <include>io.reactivex:rxjava:jar</include>-->
<!-- <include>com.squareup.retrofit2:adapter-rxjava:jar</include>-->
<!-- <include>com.microsoft.azure:adal4j:jar</include>-->
<!-- <include>com.nimbusds:oauth2-oidc-sdk:jar</include>-->
<!-- <include>com.nimbusds:lang-tag:jar</include>-->
<!-- <include>com.microsoft.azure:azure-annotations:jar</include>-->
<!-- <include>com.nimbusds:nimbus-jose-jwt:jar</include>-->
<!-- <include>com.github.stephenc.jcip:jcip-annotations:jar</include>-->
<!-- <include>net.minidev:json-smart:jar</include>-->
<!-- <include>net.minidev:accessors-smart:jar</include>-->
<!-- <include>org.ow2.asm:asm:jar</include>-->
<!-- <include>com.microsoft.azure:azure-eventhubs-eph:jar</include>-->
</includes>
<outputDirectory>lib/core</outputDirectory>
</dependencySet>
</dependencySets>
</assembly>

0 comments on commit 6fdd077

Please sign in to comment.