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 1e24cc0 CAMEL-12564: Fixed examples build
1e24cc0 is described below
commit 1e24cc0eb1a4cc235860a05ef1c10986d7e0d54b
Author: Dmitry Volodin <[email protected]>
AuthorDate: Tue Jun 12 08:51:31 2018 +0300
CAMEL-12564: Fixed examples build
---
.../hello-camel-grpc-client-kubernetes/pom.xml | 298 +++++++++++----------
.../hello-camel-grpc-server-kubernetes/pom.xml | 298 +++++++++++----------
2 files changed, 301 insertions(+), 295 deletions(-)
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 b454a88..10eefb4 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
@@ -1,162 +1,166 @@
<?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-grpc-kubernetes</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-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>
+ 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-parent</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-grpc-kubernetes</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-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>
- <!-- 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-parent</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <profiles>
- <profile>
- <id>kubernetes-install</id>
+ <dependencies>
- <build>
- <defaultGoal>install</defaultGoal>
+ <!-- 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>
- <plugins>
+ <!-- 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>
- <plugin>
- <groupId>io.fabric8</groupId>
-
<artifactId>fabric8-maven-plugin</artifactId>
-
<version>${fabric8-maven-plugin-version}</version>
- <configuration>
- <generator>
- <config>
-
<java-exec>
-
<mainClass>org.apache.camel.example.springboot.grpc.Application</mainClass>
-
</java-exec>
- </config>
- </generator>
- <enricher>
- <config>
-
<fmp-service>
-
<name>grpc-client</name>
-
</fmp-service>
- </config>
- </enricher>
- </configuration>
- <executions>
- <execution>
- <goals>
-
<goal>resource</goal>
-
<goal>build</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
- </profiles>
+ <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>
+ <profiles>
+ <profile>
+ <id>kubernetes-install</id>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>fabric8-maven-plugin</artifactId>
+ <version>${fabric8-maven-plugin-version}</version>
+ <configuration>
+ <generator>
+ <config>
+ <java-exec>
+
<mainClass>org.apache.camel.example.springboot.grpc.Application</mainClass>
+ </java-exec>
+ </config>
+ </generator>
+ <enricher>
+ <config>
+ <fmp-service>
+ <name>grpc-client</name>
+ </fmp-service>
+ </config>
+ </enricher>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>resource</goal>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
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 a07d606..5b1f83e 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
@@ -17,155 +17,157 @@
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-grpc-kubernetes</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-grpc-kubernetes</artifactId>
+ <version>2.22.0-SNAPSHOT</version>
+ </parent>
- <artifactId>camel-example-hello-grpc-server-kubernetes</artifactId>
- <name>Camel :: Example :: gRPC :: Hello Camel Server Kubernetes</name>
- <description>An example showing a simple gRPC server running on
Kubernetes</description>
+ <artifactId>camel-example-hello-grpc-server-kubernetes</artifactId>
+ <name>Camel :: Example :: gRPC :: Hello Camel Server Kubernetes</name>
+ <description>An example showing a simple gRPC server running on
Kubernetes</description>
- <properties>
-
<main.class>org.apache.camel.examples.grpc.HelloCamelServer</main.class>
- </properties>
+ <properties>
+ <main.class>org.apache.camel.examples.grpc.HelloCamelServer</main.class>
+ </properties>
- <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>
- <plugin>
- <!-- NOTE: We don't need a groupId
specification because the group is
- org.apache.maven.plugins ...which is
assumed by default. -->
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.0</version>
- <configuration>
- <descriptorRefs>
-
<descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <archive>
- <manifest>
-
<mainClass>org.apache.camel.examples.grpc.HelloCamelServer</mainClass>
- </manifest>
- </archive>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id> <!--
this is used for inheritance merges -->
- <phase>package</phase> <!--
bind to the packaging phase -->
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </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>
+ <plugin>
+ <!-- NOTE: We don't need a groupId specification because the group
+ is org.apache.maven.plugins ...which is assumed by default. -->
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <archive>
+ <manifest>
+
<mainClass>org.apache.camel.examples.grpc.HelloCamelServer</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id> <!-- this is used for inheritance merges -->
+ <phase>package</phase> <!-- bind to the packaging phase -->
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <profiles>
- <profile>
- <id>kubernetes-install</id>
-
- <build>
- <defaultGoal>install</defaultGoal>
-
- <plugins>
-
- <plugin>
- <groupId>io.fabric8</groupId>
-
<artifactId>fabric8-maven-plugin</artifactId>
-
<version>${fabric8-maven-plugin-version}</version>
- <configuration>
- <enricher>
- <config>
-
<fmp-service>
-
<name>grpc-server</name>
-
</fmp-service>
- </config>
- </enricher>
- </configuration>
- <executions>
- <execution>
- <goals>
-
<goal>resource</goal>
-
<goal>build</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
+ <profiles>
+ <profile>
+ <id>kubernetes-install</id>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>fabric8-maven-plugin</artifactId>
+ <version>${fabric8-maven-plugin-version}</version>
+ <configuration>
+ <enricher>
+ <config>
+ <fmp-service>
+ <name>grpc-server</name>
+ </fmp-service>
+ </config>
+ </enricher>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>resource</goal>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
[email protected].
