You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dm...@apache.org on 2018/06/18 15:47:49 UTC
[camel] branch master updated (79f74bf -> ff66e7b)
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 79f74bf Upgrade Chronicle Bytes to version 1.16.13
new 8adb1d1 CAMEL-12564: Add guava version property to the samples and fix doc
new ff66e7b Regen examples readme
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-grpc/pom.xml | 12 ++++--------
.../camel-grpc/src/main/docs/grpc-component.adoc | 10 ++++++++++
examples/README.adoc | 18 +++++++++++-------
.../hello-camel-grpc-client-kubernetes/pom.xml | 4 +++-
.../camel/example/springboot/grpc/CamelGrpcRoute.java | 2 +-
.../hello-camel-grpc-server-kubernetes/pom.xml | 8 ++------
examples/camel-example-grpc-kubernetes/pom.xml | 3 +++
examples/camel-example-rest-swagger/pom.xml | 1 +
.../hello-camel-grpc-client/pom.xml | 4 +++-
.../camel/example/springboot/grpc/CamelGrpcRoute.java | 4 ++--
.../hello-camel-grpc-server/pom.xml | 11 +++++------
examples/camel-example-spring-boot-grpc/pom.xml | 1 +
examples/camel-example-spring-boot-servicecall/pom.xml | 1 +
examples/camel-example-spring-boot-xml/pom.xml | 1 +
.../camel-example-spring-cloud-serviceregistry/pom.xml | 1 +
15 files changed, 49 insertions(+), 32 deletions(-)
--
To stop receiving notification emails like this one, please contact
dmvolod@apache.org.
[camel] 01/02: CAMEL-12564: Add guava version property to the
samples and fix doc
Posted by dm...@apache.org.
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
commit 8adb1d185efa13aa3e76c206c56bd252ec393e9b
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Mon Jun 18 17:25:54 2018 +0300
CAMEL-12564: Add guava version property to the samples and fix doc
---
components/camel-grpc/pom.xml | 12 ++++--------
components/camel-grpc/src/main/docs/grpc-component.adoc | 10 ++++++++++
.../hello-camel-grpc-client-kubernetes/pom.xml | 4 +++-
.../apache/camel/example/springboot/grpc/CamelGrpcRoute.java | 2 +-
.../hello-camel-grpc-server-kubernetes/pom.xml | 8 ++------
examples/camel-example-grpc-kubernetes/pom.xml | 2 ++
.../hello-camel-grpc-client/pom.xml | 4 +++-
.../apache/camel/example/springboot/grpc/CamelGrpcRoute.java | 4 ++--
.../hello-camel-grpc-server/pom.xml | 11 +++++------
9 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 22f03e2..7e9d113 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -36,6 +36,8 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.grpc.*;${camel.osgi.version}</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=grpc</camel.osgi.export.service>
+ <!-- gRPC requires strong own of the Google Guava version -->
+ <google-guava-version>${grpc-guava-version}</google-guava-version>
</properties>
<dependencies>
@@ -43,12 +45,12 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
+
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc-version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
@@ -70,12 +72,6 @@
<artifactId>javassist</artifactId>
<version>${javassist-version}</version>
</dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${grpc-guava-version}</version>
- </dependency>
<dependency>
<groupId>io.netty</groupId>
diff --git a/components/camel-grpc/src/main/docs/grpc-component.adoc b/components/camel-grpc/src/main/docs/grpc-component.adoc
index ef8e6b7..122ed9c 100644
--- a/components/camel-grpc/src/main/docs/grpc-component.adoc
+++ b/components/camel-grpc/src/main/docs/grpc-component.adoc
@@ -20,6 +20,16 @@ for this component:
</dependency>
------------------------------------------------------------
+Starting with Camel *2.22* gRCP requires strong own of the Google Guava version. It's necessary to
+add following configuration property to the maven file
+
+[source,xml]
+------------------------------------------------------------
+<properties>
+ <google-guava-version>${grpc-guava-version}</google-guava-version>
+<properties>
+------------------------------------------------------------
+
### URI format
[source,java]
diff --git a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
index 10eefb4..8e0d8c0 100644
--- a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
+++ b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
@@ -30,11 +30,13 @@
<artifactId>camel-example-hello-grpc-client-kubernetes</artifactId>
<name>Camel :: Example :: gRPC :: Hello Camel Client Kubernetes</name>
- <description>An example showing the Camel Grpc component with Spring Boot runnning on Kubernetes</description>
+ <description>An example showing the Camel gRPC component with Spring Boot runnning on Kubernetes</description>
<properties>
<category>Cloud</category>
<spring.boot-version>${spring-boot-version}</spring.boot-version>
+ <!-- gRPC requires strong own of the Google Guava version -->
+ <google-guava-version>${grpc-guava-version}</google-guava-version>
</properties>
<!-- Spring-Boot and Camel BOM -->
diff --git a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
index 19a55ec..03b0e62 100644
--- a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
+++ b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
@@ -23,7 +23,7 @@ import org.apache.camel.examples.CamelHelloRequest;
import org.springframework.stereotype.Component;
/**
- * A simple Camel Grpc route example using Spring-boot
+ * A simple Camel gRPC route example using Spring-boot
*/
@Component
public class CamelGrpcRoute extends RouteBuilder {
diff --git a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
index 5b1f83e..af16c7d 100644
--- a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
+++ b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
@@ -33,6 +33,8 @@
<properties>
<main.class>org.apache.camel.examples.grpc.HelloCamelServer</main.class>
+ <!-- gRPC requires strong own of the Google Guava version -->
+ <google-guava-version>${grpc-guava-version}</google-guava-version>
</properties>
<dependencies>
@@ -51,12 +53,6 @@
<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>
diff --git a/examples/camel-example-grpc-kubernetes/pom.xml b/examples/camel-example-grpc-kubernetes/pom.xml
index 1dc6ced..1fde567 100644
--- a/examples/camel-example-grpc-kubernetes/pom.xml
+++ b/examples/camel-example-grpc-kubernetes/pom.xml
@@ -35,6 +35,8 @@
<properties>
<category>Cloud</category>
+ <!-- gRPC requires strong own of the Google Guava version -->
+ <google-guava-version>${grpc-guava-version}</google-guava-version>
</properties>
<modules>
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 78b1eda..dc44ed9 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
@@ -30,11 +30,13 @@
<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>
+ <description>An example showing the Camel gRPC component with Spring Boot</description>
<properties>
<category>Cloud</category>
<spring.boot-version>${spring-boot-version}</spring.boot-version>
+ <!-- gRPC requires strong own of the Google Guava version -->
+ <google-guava-version>${grpc-guava-version}</google-guava-version>
</properties>
<!-- Spring-Boot and Camel BOM -->
diff --git a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
index 784391a..e4d8454 100644
--- a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
+++ b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
@@ -23,7 +23,7 @@ import org.apache.camel.examples.CamelHelloRequest;
import org.springframework.stereotype.Component;
/**
- * A simple Camel Grpc route example using Spring-boot
+ * A simple Camel gRPC route example using Spring-boot
*/
@Component
public class CamelGrpcRoute extends RouteBuilder {
@@ -32,7 +32,7 @@ public class CamelGrpcRoute extends RouteBuilder {
public void configure() throws Exception {
CamelHelloRequest request = CamelHelloRequest.newBuilder().setName("Camel").build();
- from("timer://foo?period=10000&repeatCount=1").process(new Processor() {
+ from("timer://foo?period=10000&repeatCount=5").process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
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 79345ef..3671a5b 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
@@ -30,6 +30,11 @@
<artifactId>camel-example-hello-grpc-server</artifactId>
<name>Camel :: Example :: gRPC :: Hello Camel Server</name>
<description>An example showing a simple gRPC server</description>
+
+ <properties>
+ <!-- gRPC requires strong own of the Google Guava version -->
+ <google-guava-version>${grpc-guava-version}</google-guava-version>
+ </properties>
<dependencies>
<dependency>
@@ -47,12 +52,6 @@
<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>
--
To stop receiving notification emails like this one, please contact
dmvolod@apache.org.
[camel] 02/02: Regen examples readme
Posted by dm...@apache.org.
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
commit ff66e7b4bac6df49cc06fac7192b0ecd58c0befd
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Mon Jun 18 18:46:29 2018 +0300
Regen examples readme
---
examples/README.adoc | 18 +++++++++++-------
examples/camel-example-grpc-kubernetes/pom.xml | 1 +
examples/camel-example-rest-swagger/pom.xml | 1 +
examples/camel-example-spring-boot-grpc/pom.xml | 1 +
examples/camel-example-spring-boot-servicecall/pom.xml | 1 +
examples/camel-example-spring-boot-xml/pom.xml | 1 +
.../camel-example-spring-cloud-serviceregistry/pom.xml | 1 +
7 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/examples/README.adoc b/examples/README.adoc
index 5e45c4c..ab04acf 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -11,12 +11,14 @@ View the individual example READMEs for details.
### Examples
// examples: START
-Number of Examples: 102 (8 deprecated)
+Number of Examples: 105 (8 deprecated)
[width="100%",cols="4,2,4",options="header"]
|===
| Example | Category | Description
+| link:camel-example-micrometer/README.md[Micrometer] (camel-example-micrometer) | Advanced | An example showing how to work with Camel, Spring Java Config and Micrometer monitoring
+
| link:camel-example-cdi/README.md[CDI] (camel-example-cdi) | Beginner | An example showing how to work with Camel and CDI for dependency injection
| link:camel-example-cdi-properties/README.md[CDI Properties] (camel-example-cdi-properties) | Beginner | DeltaSpike configuration properties CDI example
@@ -34,7 +36,7 @@ Number of Examples: 102 (8 deprecated)
| link:camel-example-reload/Readme.md[Reload] (camel-example-reload) | Beginner | An example that live reloads routes when the XML file is updated
-| link:camel-example-rest-swagger/README.md[Rest Swagger] (camel-example-rest-swagger) | Beginner | This example shows how to call a REST service defined using Swagger specification
+| link:camel-example-rest-swagger/README.md[REST Swagger] (camel-example-rest-swagger) | Beginner | This example shows how to call a REST service defined using Swagger specification
| link:camel-example-servlet-tomcat/README.md[Servlet Tomcat] (camel-example-servlet-tomcat) | Beginner | An example using Camel Servlet with Apache Tomcat
@@ -48,7 +50,7 @@ Number of Examples: 102 (8 deprecated)
| link:camel-example-spring-boot-pojo/README.adoc[Spring Boot Pojo] (camel-example-spring-boot-pojo) | Beginner | An example showing how to work with Camel POJO routing with Spring Boot
-| link:camel-example-spring-boot-xml/readme.adoc[Spring Boot Xml] (camel-example-spring-boot-xml) | Beginner | An example showing how to work with Camel routes in XML files and Spring Boot
+| link:camel-example-spring-boot-xml/readme.adoc[Spring Boot XML] (camel-example-spring-boot-xml) | Beginner | An example showing how to work with Camel routes in XML files and Spring Boot
| link:camel-example-spring-javaconfig/README.md[Spring Java Config] (camel-example-spring-javaconfig) | Beginner | An example showing how to work with Camel and Spring Java Config
@@ -66,19 +68,19 @@ Number of Examples: 102 (8 deprecated)
| link:camel-example-cdi-kubernetes/README.md[CDI Kubernetes] (camel-example-cdi-kubernetes) | Cloud | An example running Camel CDI on Kubernetes
-| link:camel-example-grpc-kubernetes/README.adoc[Grpc Kubernetes] (camel-example-grpc-kubernetes) | Cloud | An example showing the Camel gRPC component with Spring Boot running on Kubernetes
+| link:camel-example-grpc-kubernetes/README.adoc[gRPC Kubernetes] (camel-example-grpc-kubernetes) | Cloud | An example showing the Camel gRPC component with Spring Boot running on Kubernetes
| link:camel-example-hazelcast-kubernetes/ReadMe.md[Hazelcast Kubernetes] (camel-example-hazelcast-kubernetes) | Cloud | An example with Camel and Hazelcast running on Kubernetes
-| link:camel-example-spring-boot-grpc/README.adoc[Spring Boot Grpc] (camel-example-spring-boot-grpc) | Cloud | An example showing the Camel gRPC component with Spring Boot
+| link:camel-example-spring-boot-grpc/README.adoc[gRPC Spring Boot] (camel-example-spring-boot-grpc) | Cloud | An example showing the Camel gRPC component with Spring Boot
| link:camel-example-spring-boot-infinispan/README.adoc[Spring Boot Infinispan] (camel-example-spring-boot-infinispan) | Cloud | An example showing the Camel Infinispan component with Spring Boot
-| link:camel-example-spring-boot-servicecall/README.adoc[Spring Boot Servicecall] (camel-example-spring-boot-servicecall) | Cloud | An example showing how to work with Camel ServiceCall EIP and Spring Boot
+| link:camel-example-spring-boot-servicecall/README.adoc[Spring Boot ServiceCall] (camel-example-spring-boot-servicecall) | Cloud | An example showing how to work with Camel ServiceCall EIP and Spring Boot
| link:camel-example-spring-cloud-servicecall/README.adoc[Spring Cloud Servicecall] (camel-example-spring-cloud-servicecall) | Cloud | An example showing how to work with Camel ServiceCall EIP and Spring Cloud
-| link:camel-example-spring-cloud-serviceregistry/README.adoc[Spring Cloud Service registry] (camel-example-spring-cloud-serviceregistry) | Cloud | An example showing how to work with Camel Service Registry and Spring Cloud
+| link:camel-example-spring-cloud-serviceregistry/README.adoc[Spring Cloud ServiceRegistry] (camel-example-spring-cloud-serviceregistry) | Cloud | An example showing how to work with Camel Service registry and Spring Cloud
| link:camel-example-spring-boot-clustered-route-controller/readme.adoc[Spring Boot Clustered Route Controller] (camel-example-spring-boot-clustered-route-controller) | Clustering | An example showing how to work with Camel's Clustered Route Controller and Spring Boot
@@ -180,6 +182,8 @@ Number of Examples: 102 (8 deprecated)
| link:camel-example-swagger-osgi/README.md[Swagger OSGi] (camel-example-swagger-osgi) | OSGi | An example using REST DSL in XML and Swagger API
+| link:camel-example-ceylon/ReadMe.md[Ceylon] (camel-example-ceylon) | Other Languages | A Camel route using Ceylon
+
| link:camel-example-groovy/ReadMe.md[Groovy] (camel-example-groovy) | Other Languages | *deprecated* A Camel route using Groovy DSL
| link:camel-example-kotlin/ReadMe.md[Kotlin] (camel-example-kotlin) | Other Languages | A Camel route using Kotlin
diff --git a/examples/camel-example-grpc-kubernetes/pom.xml b/examples/camel-example-grpc-kubernetes/pom.xml
index 1fde567..79e104b 100644
--- a/examples/camel-example-grpc-kubernetes/pom.xml
+++ b/examples/camel-example-grpc-kubernetes/pom.xml
@@ -35,6 +35,7 @@
<properties>
<category>Cloud</category>
+ <title>gRPC Kubernetes</title>
<!-- gRPC requires strong own of the Google Guava version -->
<google-guava-version>${grpc-guava-version}</google-guava-version>
</properties>
diff --git a/examples/camel-example-rest-swagger/pom.xml b/examples/camel-example-rest-swagger/pom.xml
index 5cb1c8f..8eca63e 100644
--- a/examples/camel-example-rest-swagger/pom.xml
+++ b/examples/camel-example-rest-swagger/pom.xml
@@ -33,6 +33,7 @@
<properties>
<category>Beginner</category>
+ <title>REST Swagger</title>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/examples/camel-example-spring-boot-grpc/pom.xml b/examples/camel-example-spring-boot-grpc/pom.xml
index 20d9798..d5d5998 100644
--- a/examples/camel-example-spring-boot-grpc/pom.xml
+++ b/examples/camel-example-spring-boot-grpc/pom.xml
@@ -35,6 +35,7 @@
<properties>
<category>Cloud</category>
+ <title>gRPC Spring Boot</title>
</properties>
<modules>
diff --git a/examples/camel-example-spring-boot-servicecall/pom.xml b/examples/camel-example-spring-boot-servicecall/pom.xml
index 13dfb37..a45f171 100644
--- a/examples/camel-example-spring-boot-servicecall/pom.xml
+++ b/examples/camel-example-spring-boot-servicecall/pom.xml
@@ -36,6 +36,7 @@
<properties>
<category>Cloud</category>
+ <title>Spring Boot ServiceCall</title>
</properties>
<modules>
diff --git a/examples/camel-example-spring-boot-xml/pom.xml b/examples/camel-example-spring-boot-xml/pom.xml
index 871b2d0..625f234 100644
--- a/examples/camel-example-spring-boot-xml/pom.xml
+++ b/examples/camel-example-spring-boot-xml/pom.xml
@@ -34,6 +34,7 @@
<properties>
<category>Beginner</category>
+ <title>Spring Boot XML</title>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/examples/camel-example-spring-cloud-serviceregistry/pom.xml b/examples/camel-example-spring-cloud-serviceregistry/pom.xml
index c207de1..75c09eb 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/pom.xml
+++ b/examples/camel-example-spring-cloud-serviceregistry/pom.xml
@@ -36,6 +36,7 @@
<properties>
<category>Cloud</category>
+ <title>Spring Cloud ServiceRegistry</title>
</properties>
<!-- spring-cloud with support for spring boot 2 is not in maven central yet -->
--
To stop receiving notification emails like this one, please contact
dmvolod@apache.org.