asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mb...@apache.org
Subject asterixdb git commit: Fix Appassember Scripts On MacOS
Date Fri, 10 Mar 2017 18:30:04 GMT
Repository: asterixdb
Updated Branches:
  refs/heads/master c0ac93f09 -> a7fad1993


Fix Appassember Scripts On MacOS

Advance all appassembler versions to 2.0.0, which eliminates requirement
to have JAVA_HOME defined.

Change-Id: I0ebf8b688f72617ed6595bdd175a8be9b788a922
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1566
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: abdullah alamoudi <bamousaa@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/a7fad199
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/a7fad199
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/a7fad199

Branch: refs/heads/master
Commit: a7fad19931c6064b0ea44b6dbcd6a21d4557e7fb
Parents: c0ac93f
Author: Michael Blow <mblow@apache.org>
Authored: Thu Mar 9 22:10:19 2017 -0500
Committer: Michael Blow <mblow@apache.org>
Committed: Fri Mar 10 10:16:17 2017 -0800

----------------------------------------------------------------------
 asterixdb/asterix-client-helper/pom.xml            |  8 --------
 asterixdb/asterix-experiments/pom.xml              |  1 -
 asterixdb/asterix-server/pom.xml                   |  8 --------
 asterixdb/pom.xml                                  | 11 +++++++++++
 .../btree-example/btreeclient/pom.xml              |  1 -
 .../btree-example/btreeserver/pom.xml              |  1 -
 .../hyracks-examples/hyracks-shutdown-test/pom.xml |  1 -
 .../text-example/textclient/pom.xml                |  1 -
 .../text-example/textserver/pom.xml                |  1 -
 .../tpch-example/tpchclient/pom.xml                |  1 -
 .../tpch-example/tpchserver/pom.xml                |  1 -
 hyracks-fullstack/hyracks/hyracks-server/pom.xml   |  1 -
 hyracks-fullstack/pom.xml                          | 17 +++++++++++------
 13 files changed, 22 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/asterixdb/asterix-client-helper/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-client-helper/pom.xml b/asterixdb/asterix-client-helper/pom.xml
index bf8a51e..d3ad745 100644
--- a/asterixdb/asterix-client-helper/pom.xml
+++ b/asterixdb/asterix-client-helper/pom.xml
@@ -29,7 +29,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.10</version>
         <configuration>
           <assembleDirectory>
             ${project.build.directory}/appassembler
@@ -161,13 +160,6 @@
     <dependency>
       <groupId>org.codehaus.mojo.appassembler</groupId>
       <artifactId>appassembler-booter</artifactId>
-      <version>1.10</version>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/asterixdb/asterix-experiments/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-experiments/pom.xml b/asterixdb/asterix-experiments/pom.xml
index 80a00fa..009ed03 100644
--- a/asterixdb/asterix-experiments/pom.xml
+++ b/asterixdb/asterix-experiments/pom.xml
@@ -26,7 +26,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.0</version>
         <executions>
           <execution>
             <configuration>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/asterixdb/asterix-server/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 3a2fbe1..5bfe30f 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -224,7 +224,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.10</version>
         <configuration>
           <assembleDirectory>
             ${project.build.directory}/appassembler
@@ -515,13 +514,6 @@
     <dependency>
       <groupId>org.codehaus.mojo.appassembler</groupId>
       <artifactId>appassembler-booter</artifactId>
-      <version>1.10</version>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.asterix</groupId>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/asterixdb/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 11b706b..d890420 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -1094,6 +1094,17 @@
         <artifactId>jaxb-api</artifactId>
         <version>2.2.12</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.mojo.appassembler</groupId>
+        <artifactId>appassembler-booter</artifactId>
+        <version>2.0.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml
index 2486fe8..fba0469 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml
@@ -83,7 +83,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.3</version>
         <executions>
           <execution>
             <configuration>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml
index 8cff14a..8bb3447 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml
@@ -38,7 +38,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.3</version>
         <executions>
           <execution>
             <configuration>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
index 42a104d..8ab4195 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
@@ -57,7 +57,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.3</version>
         <executions>
           <execution>
             <configuration>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml
index 9003724..cbf3f9d 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml
@@ -68,7 +68,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.3</version>
         <executions>
           <execution>
             <id>textclient</id>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml
index ed269ea..c35aa70 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml
@@ -59,7 +59,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.3</version>
         <executions>
           <execution>
             <configuration>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
index f8378c6..9bc153b 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
@@ -62,7 +62,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.3</version>
         <executions>
           <execution>
             <id>sort</id>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
index 96a9d33..b42b3bf 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
@@ -38,7 +38,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.3</version>
         <executions>
           <execution>
             <configuration>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/hyracks-fullstack/hyracks/hyracks-server/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-server/pom.xml b/hyracks-fullstack/hyracks/hyracks-server/pom.xml
index 5e36b8a..692daff 100644
--- a/hyracks-fullstack/hyracks/hyracks-server/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-server/pom.xml
@@ -87,7 +87,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.3</version>
         <executions>
           <execution>
             <configuration>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a7fad199/hyracks-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 3bf472d..072165b 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -416,14 +416,19 @@
           </configuration>
         </plugin>
         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>versions-maven-plugin</artifactId>
-            <version>2.1</version>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>versions-maven-plugin</artifactId>
+          <version>2.1</version>
         </plugin>
         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-scm-plugin</artifactId>
-            <version>1.9.5</version>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-scm-plugin</artifactId>
+          <version>1.9.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>appassembler-maven-plugin</artifactId>
+          <version>2.0.0</version>
         </plugin>
       </plugins>
     </pluginManagement>


Mime
View raw message