You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/01/25 00:42:32 UTC
[4/5] hbase git commit: HBASE-17079 HBase build fails on windows,
hbase-archetype-builder is reason for failure
HBASE-17079 HBase build fails on windows, hbase-archetype-builder is reason for failure
Signed-off-by: Andrew Purtell <ap...@apache.org>
Conflicts:
hbase-archetypes/hbase-archetype-builder/pom.xml
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1c1e68f1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1c1e68f1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1c1e68f1
Branch: refs/heads/branch-1.4
Commit: 1c1e68f1d80ce46c5a98489a977e638b663c94d6
Parents: 636376b
Author: Mohammad Arshad <ar...@apache.org>
Authored: Sun Nov 5 01:04:13 2017 +0530
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Jan 24 16:37:43 2018 -0800
----------------------------------------------------------------------
.../hbase-archetype-builder/pom.xml | 26 +++++++++-----------
pom.xml | 1 +
2 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1c1e68f1/hbase-archetypes/hbase-archetype-builder/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-archetypes/hbase-archetype-builder/pom.xml b/hbase-archetypes/hbase-archetype-builder/pom.xml
index b975f54..ab734ac 100644
--- a/hbase-archetypes/hbase-archetype-builder/pom.xml
+++ b/hbase-archetypes/hbase-archetype-builder/pom.xml
@@ -244,24 +244,18 @@
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.4.0</version>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<!-- exec-maven-plugin executes chmod to make scripts executable -->
<execution>
<id>make-scripts-executable</id>
<phase>process-resources</phase>
<goals>
- <goal>exec</goal>
+ <goal>run</goal>
</goals>
<configuration>
- <executable>chmod</executable>
- <arguments>
- <argument>+x</argument>
- <argument>/${project.basedir}/createArchetypes.sh</argument>
- <argument>/${project.basedir}/installArchetypes.sh</argument>
- </arguments>
+ <chmod file="${project.basedir}/createArchetypes.sh" perm="+x" />
+ <chmod file="${project.basedir}/installArchetypes.sh" perm="+x" />
</configuration>
</execution>
<!-- exec-maven-plugin executes script which invokes 'archetype:create-from-project'
@@ -270,10 +264,12 @@
<id>run-createArchetypes-script</id>
<phase>compile</phase>
<goals>
- <goal>exec</goal>
+ <goal>run</goal>
</goals>
<configuration>
- <executable>/${project.basedir}/createArchetypes.sh</executable>
+ <exec executable="${shell-executable}" dir="${project.basedir}" failonerror="true">
+ <arg line="./createArchetypes.sh"/>
+ </exec>
</configuration>
</execution>
<!-- exec-maven-plugin executes script which invokes 'install' to install each
@@ -285,10 +281,12 @@
<id>run-installArchetypes-script</id>
<phase>install</phase>
<goals>
- <goal>exec</goal>
+ <goal>run</goal>
</goals>
<configuration>
- <executable>/${project.basedir}/installArchetypes.sh</executable>
+ <exec executable="${shell-executable}" dir="${project.basedir}" failonerror="true">
+ <arg line="./installArchetypes.sh"/>
+ </exec>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/hbase/blob/1c1e68f1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 887995a..abf8ce0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1354,6 +1354,7 @@
<extra.enforcer.version>1.0-beta-6</extra.enforcer.version>
<!-- Location of test resources -->
<test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+ <shell-executable>bash</shell-executable>
</properties>
<!-- Sorted by groups of dependencies then groupId and artifactId -->
<dependencyManagement>