Repository: camel Updated Branches: refs/heads/master e7c3d6758 -> ddf98531f
CAMEL-11181 Replace gmaven with gmavenplus Mave... ...n plugin This replaces the use of `gmaven` plugin with `gmavenplus` plugin. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ddf98531 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ddf98531 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ddf98531 Branch: refs/heads/master Commit: ddf98531f23c91485f71f292290370e457cabda0 Parents: e7c3d67 Author: Zoran Regvart <zregv...@apache.org> Authored: Fri Apr 21 12:10:00 2017 +0200 Committer: Zoran Regvart <zregv...@apache.org> Committed: Fri Apr 21 13:56:03 2017 +0200 ---------------------------------------------------------------------- components/camel-grpc/pom.xml | 20 ++++++++++++++---- components/camel-protobuf/pom.xml | 22 +++++++++++++++----- .../camel-salesforce-component/pom.xml | 2 +- parent/pom.xml | 2 +- 4 files changed, 35 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ddf98531/components/camel-grpc/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml index af65988..700f5e7 100644 --- a/components/camel-grpc/pom.xml +++ b/components/camel-grpc/pom.xml @@ -113,9 +113,9 @@ - OSX (x86 32 and 64-bit) --> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>${gmaven-plugin-version}</version> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> + <version>${gmavenplus-plugin-version}</version> <executions> <execution> <phase>validate</phase> @@ -123,10 +123,22 @@ <goal>execute</goal> </goals> <configuration> - <source><![CDATA[pom.properties['skip-test']=pom.properties['os.detected.classifier'].matches('^.*?(linux|windows|osx)-x86.*$') ? 'false' : 'true';]]></source> + <scripts> + <script><![CDATA[ + project.properties['skip-test']=project.properties['os.detected.classifier'].matches('^.*?(linux|windows|osx)-x86.*$') ? 'false' : 'true'; + ]]></script> + </scripts> </configuration> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>${groovy-version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> </plugin> <!-- gRPC and protobuf Java code generator plugin --> http://git-wip-us.apache.org/repos/asf/camel/blob/ddf98531/components/camel-protobuf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml index 536d95c..c284012 100644 --- a/components/camel-protobuf/pom.xml +++ b/components/camel-protobuf/pom.xml @@ -105,9 +105,9 @@ - OSX (x86 32 and 64-bit) --> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>${gmaven-plugin-version}</version> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> + <version>${gmavenplus-plugin-version}</version> <executions> <execution> <phase>validate</phase> @@ -115,10 +115,22 @@ <goal>execute</goal> </goals> <configuration> - <source><![CDATA[pom.properties['skip-test']=pom.properties['os.detected.classifier'].matches('^.*?(linux|windows|osx)-x86.*$') ? 'false' : 'true';]]></source> + <scripts> + <script><![CDATA[ + project.properties['skip-test']=project.properties['os.detected.classifier'].matches('^.*?(linux|windows|osx)-x86.*$') ? 'false' : 'true'; + ]]></script> + </scripts> </configuration> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>${groovy-version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> </plugin> <!-- Protobuf Java code generator plugin --> @@ -165,4 +177,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/camel/blob/ddf98531/components/camel-salesforce/camel-salesforce-component/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml index a68b689..526a5c4 100644 --- a/components/camel-salesforce/camel-salesforce-component/pom.xml +++ b/components/camel-salesforce/camel-salesforce-component/pom.xml @@ -177,7 +177,7 @@ <plugin> <groupId>org.codehaus.gmavenplus</groupId> <artifactId>gmavenplus-plugin</artifactId> - <version>1.5</version> + <version>${gmavenplus-plugin-version}</version> <executions> <execution> <goals> http://git-wip-us.apache.org/repos/asf/camel/blob/ddf98531/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 5e60dde..254e6b2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -233,7 +233,7 @@ <geronimo-servlet-spec-version>1.0</geronimo-servlet-spec-version> <geronimo-servlet-2.5-spec-version>1.2</geronimo-servlet-2.5-spec-version> <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version> - <gmaven-plugin-version>1.4</gmaven-plugin-version> + <gmavenplus-plugin-version>1.5</gmavenplus-plugin-version> <gmetric4j-version>1.0.10</gmetric4j-version> <google-guava-version>19.0</google-guava-version> <google-api-client-version>1.22.0</google-api-client-version>