You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/04/18 11:21:09 UTC
[1/2] camel git commit: camel-protobuf: set gmaven-plugin version to
global param
Repository: camel
Updated Branches:
refs/heads/master 33bb03fb2 -> b3f0c7407
camel-protobuf: set gmaven-plugin version to global param
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b3f0c740
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b3f0c740
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b3f0c740
Branch: refs/heads/master
Commit: b3f0c7407633538fd4648175a87522343dd28f05
Parents: ecaf006
Author: Dmitry Volodin <dm...@gmail.com>
Authored: Tue Apr 18 14:08:10 2017 +0300
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 18 13:20:19 2017 +0200
----------------------------------------------------------------------
components/camel-protobuf/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b3f0c740/components/camel-protobuf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index f97679c..536d95c 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -107,7 +107,7 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.5</version>
+ <version>${gmaven-plugin-version}</version>
<executions>
<execution>
<phase>validate</phase>
[2/2] camel git commit: camel-protobuf: Check if the OS supports the
protobuf generator plugin
Posted by da...@apache.org.
camel-protobuf: Check if the OS supports the protobuf generator plugin
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ecaf0064
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ecaf0064
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ecaf0064
Branch: refs/heads/master
Commit: ecaf006408b55857abf341a505124befc4fb4be5
Parents: 33bb03f
Author: Dmitry Volodin <dm...@gmail.com>
Authored: Tue Apr 18 13:59:18 2017 +0300
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 18 13:20:19 2017 +0200
----------------------------------------------------------------------
components/camel-protobuf/pom.xml | 58 ++++++++++++++++++++++++++++++++--
1 file changed, 55 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ecaf0064/components/camel-protobuf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index 6785890..f97679c 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -17,6 +17,7 @@
-->
<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>
@@ -51,7 +52,7 @@
<version>${protobuf-version}</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
+ <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -82,7 +83,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<extensions>
<!-- Operating system and CPU architecture detection extension -->
@@ -92,8 +93,34 @@
<version>1.4.1.Final</version>
</extension>
</extensions>
-
+
<plugins>
+ <!--
+ Check if the running OS platform supports the protobuf generator plugin.
+ If the platform doesn't support, the protobuf test code generation, their
+ assembly and launch will be skipped
+ Supported platforms are:
+ - Linux (x86 32 and 64-bit)
+ - Windows (x86 32 and 64-bit)
+ - OSX (x86 32 and 64-bit)
+ -->
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source><![CDATA[pom.properties['skip-test']=pom.properties['os.detected.classifier'].matches('^.*?(linux|windows|osx)-x86.*$') ? 'false' : 'true';]]></source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Protobuf Java code generator plugin -->
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
@@ -107,10 +134,35 @@
</goals>
<configuration>
<protocArtifact>com.google.protobuf:protoc:${protobuf-version}:exe:${os.detected.classifier}</protocArtifact>
+ <skip>${skip-test}</skip>
</configuration>
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-testCompile</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <configuration>
+ <skip>${skip-test}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>${skip-test}</skipTests>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file