Skip to content

CAMEL-19451 - Import grpc-bom to build and test with a single deterministic set of gRPC dependencies #10372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ppalaga merged 1 commit into from
Jun 16, 2023
Merged

CAMEL-19451 - Import grpc-bom to build and test with a single deterministic set of gRPC dependencies #10372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions camel-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,6 @@
<jcommander-version>1.72</jcommander-version>
<jcr-version>2.0</jcr-version>
<jedis-client-version>4.4.2</jedis-client-version>
<jetcd-grpc-version>1.47.0</jetcd-grpc-version>
<jetcd-guava-version>32.0.0-jre</jetcd-guava-version>
<jetcd-version>0.7.5</jetcd-version>
<jetty-version>11.0.15</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
Expand Down
19 changes: 1 addition & 18 deletions components/camel-etcd3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,23 +64,6 @@
<groupId>io.etcd</groupId>
<artifactId>jetcd-core</artifactId>
<version>${jetcd-version}</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<version>${jetcd-grpc-version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${jetcd-guava-version}</version>
</dependency>

<!-- testing -->
Expand Down Expand Up @@ -123,5 +106,5 @@
</plugin>
</plugins>
</build>

</project>
19 changes: 0 additions & 19 deletions components/camel-grpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc-version}</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
Expand All @@ -58,32 +57,20 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${grpc-version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc-version}</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf-version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc-version}</version>
</dependency>

<dependency>
Expand All @@ -92,12 +79,6 @@
<version>${javassist-version}</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${grpc-netty-tcnative-boringssl-static-version}</version>
</dependency>

<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
Expand Down
1 change: 0 additions & 1 deletion components/camel-opentelemetry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<version>${grpc-version}</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
Expand Down
7 changes: 2 additions & 5 deletions components/camel-salesforce/camel-salesforce-component/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-impl-version}</version>
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
Expand All @@ -138,17 +138,14 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${grpc-version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc-version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc-version}</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
Expand Down Expand Up @@ -332,7 +329,7 @@
</files>
<message><![CDATA[Salesforce Migration Tool required

You need to download the Salesforce Migration Tool (ZIP file) and
You need to download the Salesforce Migration Tool (ZIP file) and
extract the `ant-salesforce.jar` out of it to:

${salesforce.component.root}/it/resources/migration-tool/ant-salesforce.jar
Expand Down
10 changes: 8 additions & 2 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,6 @@
<jcommander-version>1.72</jcommander-version>
<jcr-version>2.0</jcr-version>
<jedis-client-version>4.4.2</jedis-client-version>
<jetcd-grpc-version>1.47.0</jetcd-grpc-version>
<jetcd-guava-version>32.0.0-jre</jetcd-guava-version>
<jetcd-version>0.7.5</jetcd-version>
<jetty-version>11.0.15</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
Expand Down Expand Up @@ -2721,6 +2719,14 @@
<type>pom</type>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc-version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>

<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
Expand Down