This is an automated email from the ASF dual-hosted git repository. dmvolod pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 78c83ad CAMEL-12564: Fix spring-boot gRPC example 78c83ad is described below commit 78c83ad641e70173301d59d60650c5c37c7b0a25 Author: Dmitry Volodin <dmvo...@gmail.com> AuthorDate: Tue Jun 12 11:11:17 2018 +0300 CAMEL-12564: Fix spring-boot gRPC example --- components/readme.adoc | 2 +- .../hello-camel-grpc-client/pom.xml | 223 +++++++++++---------- .../hello-camel-grpc-server/pom.xml | 175 ++++++++-------- platforms/spring-boot/spring-boot-dm/pom.xml | 1 + 4 files changed, 208 insertions(+), 193 deletions(-) diff --git a/components/readme.adoc b/components/readme.adoc index 93064af..6029ff8 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -27,7 +27,7 @@ Number of Components: 297 in 203 JAR artifacts (20 deprecated) `apns:name` | 2.8 | For sending notifications to Apple iOS devices. | link:camel-as2/camel-as2-component/src/main/docs/as2-component.adoc[AS2] (camel-as2) + -`as2:name` | 2.20 | Component used for transferring data secure and reliable over the internet using the AS2 protocol. +`as2:name` | 2.22 | Component used for transferring data secure and reliable over the internet using the AS2 protocol. | link:camel-asterisk/src/main/docs/asterisk-component.adoc[Asterisk] (camel-asterisk) + `asterisk:name` | 2.18 | The asterisk component is used to interact with Asterisk PBX Server. diff --git a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml index 8ee6fd6..78b1eda 100644 --- a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml +++ b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml @@ -1,118 +1,127 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - You under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<!-- - <parent> - <groupId>org.apache.camel.example</groupId> - <artifactId>camel-example-spring-boot-grpc</artifactId> - <version>2.22.0-SNAPSHOT</version> - </parent> + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at - <artifactId>camel-example-hello-grpc-client</artifactId> - <name>Camel :: Example :: gRPC :: Hello Camel Client</name> - <description>An example showing the Camel Grpc component with Spring Boot</description> + http://www.apache.org/licenses/LICENSE-2.0 - <properties> - <category>Cloud</category> - <spring.boot-version>${spring-boot-version}</spring.boot-version> - </properties> + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. - <!-- Spring-Boot and Camel BOM --> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>${spring.boot-version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-dependencies</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <dependencies> + <parent> + <groupId>org.apache.camel.example</groupId> + <artifactId>camel-example-spring-boot-grpc</artifactId> + <version>2.22.0-SNAPSHOT</version> + </parent> - <!-- Camel --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-grpc-starter</artifactId> - </dependency> + <artifactId>camel-example-hello-grpc-client</artifactId> + <name>Camel :: Example :: gRPC :: Hello Camel Client</name> + <description>An example showing the Camel Grpc component with Spring Boot</description> - <!-- Test --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <properties> + <category>Cloud</category> + <spring.boot-version>${spring-boot-version}</spring.boot-version> + </properties> - <build> - <extensions> - <extension> - <groupId>kr.motd.maven</groupId> - <artifactId>os-maven-plugin</artifactId> - <version>1.5.0.Final</version> - </extension> - </extensions> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot-version}</version> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.xolstice.maven.plugins</groupId> - <artifactId>protobuf-maven-plugin</artifactId> - <version>${protobuf-maven-plugin-version}</version> - <configuration> - <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact> - <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc-version}:exe:${os.detected.classifier}</pluginArtifact> - </configuration> - <executions> - <execution> - <goals> - <goal>compile</goal> - <goal>compile-custom</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <!-- Spring-Boot and Camel BOM --> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>${spring.boot-version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-boot-dependencies</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + + <!-- Camel --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-boot-starter</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-grpc-starter</artifactId> + </dependency> + + <!-- Test --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <extensions> + <extension> + <groupId>kr.motd.maven</groupId> + <artifactId>os-maven-plugin</artifactId> + <version>${os-maven-plugin-version}</version> + </extension> + </extensions> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot-version}</version> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.xolstice.maven.plugins</groupId> + <artifactId>protobuf-maven-plugin</artifactId> + <version>${protobuf-maven-plugin-version}</version> + <configuration> + <protocArtifact>com.google.protobuf:protoc:${protobuf-version}:exe:${os.detected.classifier}</protocArtifact> + <pluginId>grpc-java</pluginId> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc-version}:exe:${os.detected.classifier}</pluginArtifact> + </configuration> + <executions> + <execution> + <goals> + <goal>compile</goal> + <goal>compile-custom</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml index 477fc70..79345ef 100644 --- a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml +++ b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml @@ -17,91 +17,96 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.example</groupId> - <artifactId>camel-example-spring-boot-grpc</artifactId> - <version>2.22.0-SNAPSHOT</version> - </parent> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.example</groupId> + <artifactId>camel-example-spring-boot-grpc</artifactId> + <version>2.22.0-SNAPSHOT</version> + </parent> - <artifactId>camel-example-hello-grpc-server</artifactId> - <name>Camel :: Example :: gRPC :: Hello Camel Server</name> - <description>An example showing a simple gRPC server</description> + <artifactId>camel-example-hello-grpc-server</artifactId> + <name>Camel :: Example :: gRPC :: Hello Camel Server</name> + <description>An example showing a simple gRPC server</description> - <dependencies> - <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> - </dependencies> - <build> - <extensions> - <extension> - <groupId>kr.motd.maven</groupId> - <artifactId>os-maven-plugin</artifactId> - <version>1.5.0.Final</version> - </extension> - </extensions> - <plugins> - <plugin> - <groupId>org.xolstice.maven.plugins</groupId> - <artifactId>protobuf-maven-plugin</artifactId> - <version>${protobuf-maven-plugin-version}</version> - <configuration> - <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact> - <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc-version}:exe:${os.detected.classifier}</pluginArtifact> - </configuration> - <executions> - <execution> - <goals> - <goal>compile</goal> - <goal>compile-custom</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> - <executions> - <execution> - <id>enforce</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireUpperBoundDeps /> - </rules> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>${exec-maven-plugin-version}</version> - <configuration> - <mainClass>org.apache.camel.examples.grpc.HelloCamelServer</mainClass> - <includePluginDependencies>false</includePluginDependencies> - </configuration> - </plugin> - - </plugins> - </build> + <dependencies> + <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>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${grpc-guava-version}</version> + </dependency> + </dependencies> + <build> + <extensions> + <extension> + <groupId>kr.motd.maven</groupId> + <artifactId>os-maven-plugin</artifactId> + <version>${os-maven-plugin-version}</version> + </extension> + </extensions> + <plugins> + <plugin> + <groupId>org.xolstice.maven.plugins</groupId> + <artifactId>protobuf-maven-plugin</artifactId> + <version>${protobuf-maven-plugin-version}</version> + <configuration> + <protocArtifact>com.google.protobuf:protoc:${protobuf-version}:exe:${os.detected.classifier}</protocArtifact> + <pluginId>grpc-java</pluginId> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc-version}:exe:${os.detected.classifier}</pluginArtifact> + </configuration> + <executions> + <execution> + <goals> + <goal>compile</goal> + <goal>compile-custom</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireUpperBoundDeps /> + </rules> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <configuration> + <mainClass>org.apache.camel.examples.grpc.HelloCamelServer</mainClass> + <includePluginDependencies>false</includePluginDependencies> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml b/platforms/spring-boot/spring-boot-dm/pom.xml index 73ab6c2..2c03911 100644 --- a/platforms/spring-boot/spring-boot-dm/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/pom.xml @@ -57,6 +57,7 @@ <infinispan-spring-boot-version>2.0.0.Beta1</infinispan-spring-boot-version> <cassandra-driver-guava-version>18.0</cassandra-driver-guava-version> <groovy-version>2.4.15</groovy-version> + <grpc-guava-version>20.0</grpc-guava-version> <!-- Plugin versions --> <maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version> -- To stop receiving notification emails like this one, please contact dmvo...@apache.org.