This is an automated email from the ASF dual-hosted git repository.
janbednar 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 bca9e47 CAMEL-15284: Fix kudu and docs Windows build (#3986)
bca9e47 is described below
commit bca9e473273819cfb319f434ce444609dad5ec2e
Author: Jan Bednar <m...@janbednar.eu>
AuthorDate: Thu Jul 9 10:47:25 2020 +0200
CAMEL-15284: Fix kudu and docs Windows build (#3986)
---
components/camel-kudu/pom.xml | 16 ++++++++++++++++
docs/pom.xml | 21 +++------------------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/components/camel-kudu/pom.xml b/components/camel-kudu/pom.xml
index 3f34240..25c1aff 100644
--- a/components/camel-kudu/pom.xml
+++ b/components/camel-kudu/pom.xml
@@ -31,6 +31,22 @@
<name>Camel :: Kudu</name>
<description>Camel Apache Kudu support</description>
+ <profiles>
+ <profile>
+ <!-- kudu-binary is not available for Windows. It is needed for
tests, so skip that on Windows OS -->
+ <id>Windows-Kudu-SkipTests</id>
+ <activation>
+ <os>
+ <family>Windows</family>
+ </os>
+ </activation>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ <os.detected.classifier>linux-x86_64</os.detected.classifier>
<!-- Fake classifier to allow dependency resolution. kudu-binary will not be
executed anyway on Windows -->
+ </properties>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/docs/pom.xml b/docs/pom.xml
index 2cc167d..00c288b 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -57,37 +57,22 @@
<yarnVersion>v1.12.3</yarnVersion>
</configuration>
</execution>
- </executions>
- </plugin>
- <!--
- executing yarn via frontend-maven yielded Process exited with an
error: 134 (Exit value: 134)
- using exec-maven plugin instead.
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
<execution>
<id>yarn-install</id>
<goals>
- <goal>exec</goal>
+ <goal>yarn</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
-
<executable>${project.basedir}/node/node</executable>
-
<commandlineArgs>${project.basedir}/node/yarn/dist/bin/yarn.js install
--no-progress --force --non-interactive --frozen-lockfile</commandlineArgs>
+ <arguments>install --no-progress --force
--non-interactive --frozen-lockfile</arguments>
</configuration>
</execution>
<execution>
<id>yarn-gulp</id>
<goals>
- <goal>exec</goal>
+ <goal>gulp</goal>
</goals>
<phase>generate-resources</phase>
- <configuration>
-
<executable>${project.basedir}/node/node</executable>
-
<commandlineArgs>${project.basedir}/node/yarn/dist/bin/yarn.js
--non-interactive gulp</commandlineArgs>
- </configuration>
</execution>
</executions>
</plugin>
