asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mb...@apache.org
Subject [01/13] incubator-asterixdb git commit: Normalize XML Whitespace
Date Mon, 09 May 2016 23:20:55 GMT
Repository: incubator-asterixdb
Updated Branches:
  refs/heads/master 11810ce0d -> b4c1fb060


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/hyracks-fullstack/hyracks/hyracks-util/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-util/pom.xml b/hyracks-fullstack/hyracks/hyracks-util/pom.xml
index 9bf3459..5b2c331 100644
--- a/hyracks-fullstack/hyracks/hyracks-util/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-util/pom.xml
@@ -21,38 +21,37 @@
 <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/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>hyracks</artifactId>
-        <groupId>org.apache.hyracks</groupId>
-        <version>0.2.18-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <artifactId>hyracks</artifactId>
+    <groupId>org.apache.hyracks</groupId>
+    <version>0.2.18-SNAPSHOT</version>
+  </parent>
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <artifactId>hyracks-util</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-    </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
+  <artifactId>hyracks-util</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+  </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-am/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-am/pom.xml b/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-am/pom.xml
index db6597c..a247eff 100644
--- a/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-am/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-am/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <properties>
-      <root.dir>${basedir}/../../..</root.dir>
+    <root.dir>${basedir}/../../..</root.dir>
   </properties>
 
   <build>
@@ -74,15 +74,15 @@
     </plugins>
   </build>
   <dependencies>
-  <dependency>
-  	<groupId>args4j</groupId>
-  	<artifactId>args4j</artifactId>
-  	<version>2.0.16</version>
-  </dependency>
-  <dependency>
-  	<groupId>org.apache.hyracks</groupId>
-  	<artifactId>hyracks-yarn-common</artifactId>
-  	<version>0.2.1-SNAPSHOT</version>
-  </dependency>
+    <dependency>
+      <groupId>args4j</groupId>
+      <artifactId>args4j</artifactId>
+      <version>2.0.16</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hyracks</groupId>
+      <artifactId>hyracks-yarn-common</artifactId>
+      <version>0.2.1-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-client/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-client/pom.xml b/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-client/pom.xml
index afa9b83..6ebadc9 100644
--- a/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-client/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-client/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <properties>
-      <root.dir>${basedir}/../../..</root.dir>
+    <root.dir>${basedir}/../../..</root.dir>
   </properties>
 
   <build>
@@ -78,22 +78,22 @@
     </plugins>
   </build>
   <dependencies>
-  <dependency>
-  	<groupId>args4j</groupId>
-  	<artifactId>args4j</artifactId>
-  	<version>2.0.16</version>
-  </dependency>
-  <dependency>
-  	<groupId>org.apache.hyracks</groupId>
-  	<artifactId>hyracks-yarn-common</artifactId>
-  	<version>0.2.1-SNAPSHOT</version>
-  </dependency>
-  <dependency>
-  	<groupId>org.apache.hyracks</groupId>
-  	<artifactId>hyracks-yarn-am</artifactId>
-  	<version>0.2.1-SNAPSHOT</version>
-    <type>zip</type>
-    <classifier>binary-assembly</classifier>
-  </dependency>
+    <dependency>
+      <groupId>args4j</groupId>
+      <artifactId>args4j</artifactId>
+      <version>2.0.16</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hyracks</groupId>
+      <artifactId>hyracks-yarn-common</artifactId>
+      <version>0.2.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hyracks</groupId>
+      <artifactId>hyracks-yarn-am</artifactId>
+      <version>0.2.1-SNAPSHOT</version>
+      <type>zip</type>
+      <classifier>binary-assembly</classifier>
+    </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-client/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-client/src/main/assembly/binary-assembly.xml
b/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-client/src/main/assembly/binary-assembly.xml
index bc03322..04567a3 100644
--- a/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-client/src/main/assembly/binary-assembly.xml
+++ b/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-client/src/main/assembly/binary-assembly.xml
@@ -35,7 +35,7 @@
       <outputDirectory>lib</outputDirectory>
     </fileSet>
   </fileSets>
-    <dependencySets>
+  <dependencySets>
     <dependencySet>
       <outputDirectory>hyracks-yarn-am</outputDirectory>
       <includes>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml
index e0081cc..43b4cc0 100644
--- a/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml
@@ -27,24 +27,24 @@
   </parent>
 
   <properties>
-      <root.dir>${basedir}/../../..</root.dir>
+    <root.dir>${basedir}/../../..</root.dir>
   </properties>
 
   <dependencies>
-  <dependency>
-  	<groupId>org.apache.hadoop</groupId>
-  	<artifactId>hadoop-yarn-api</artifactId>
-  	<version>2.0.0-alpha</version>
-  </dependency>
-  <dependency>
-  	<groupId>org.apache.hadoop</groupId>
-  	<artifactId>hadoop-yarn-common</artifactId>
-  	<version>2.0.0-alpha</version>
-  </dependency>
-  <dependency>
-  	<groupId>org.apache.hadoop</groupId>
-  	<artifactId>hadoop-common</artifactId>
-  	<version>2.0.0-alpha</version>
-  </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-yarn-api</artifactId>
+      <version>2.0.0-alpha</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-yarn-common</artifactId>
+      <version>2.0.0-alpha</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>2.0.0-alpha</version>
+    </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/hyracks-fullstack/hyracks/hyracks-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-yarn/pom.xml b/hyracks-fullstack/hyracks/hyracks-yarn/pom.xml
index a496e53..a86befb 100644
--- a/hyracks-fullstack/hyracks/hyracks-yarn/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-yarn/pom.xml
@@ -39,7 +39,7 @@
   </licenses>
 
   <properties>
-      <root.dir>${basedir}/../..</root.dir>
+    <root.dir>${basedir}/../..</root.dir>
   </properties>
 
   <modules>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/hyracks-fullstack/hyracks/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/pom.xml b/hyracks-fullstack/hyracks/pom.xml
index 563b7bb..2143753 100644
--- a/hyracks-fullstack/hyracks/pom.xml
+++ b/hyracks-fullstack/hyracks/pom.xml
@@ -48,38 +48,38 @@
       </plugin>
     </plugins>
     <pluginManagement>
-        <plugins>
-            <!--This plugin's configuration is used to store Eclipse m2e settings only.
It has no influence on the Maven build itself.-->
-            <plugin>
-                <groupId>org.eclipse.m2e</groupId>
-                <artifactId>lifecycle-mapping</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <lifecycleMappingMetadata>
-                        <pluginExecutions>
-                            <pluginExecution>
-                                <pluginExecutionFilter>
-                                    <groupId>org.apache.maven.plugins</groupId>
-                                    <artifactId>maven-plugin-plugin</artifactId>
-                                    <versionRange>[3.4,)</versionRange>
-                                    <goals>
-                                        <goal>descriptor</goal>
-                                    </goals>
-                                </pluginExecutionFilter>
-                                <action>
-                                    <ignore></ignore>
-                                </action>
-                            </pluginExecution>
-                        </pluginExecutions>
-                    </lifecycleMappingMetadata>
-                </configuration>
-            </plugin>
-        </plugins>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It
has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <versionRange>[3.4,)</versionRange>
+                    <goals>
+                      <goal>descriptor</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
     </pluginManagement>
   </build>
 
   <properties>
-      <root.dir>${basedir}/..</root.dir>
+    <root.dir>${basedir}/..</root.dir>
   </properties>
 
   <repositories>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/hyracks-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 54e7f34..513bb80 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -17,7 +17,6 @@
  ! under the License.
  !-->
 
-
 <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>
   <groupId>org.apache.hyracks</groupId>
@@ -26,83 +25,83 @@
   <packaging>pom</packaging>
   <name>hyracks-ecosystem-full-stack</name>
 
-    <parent>
-        <groupId>org.apache</groupId>
-        <artifactId>apache</artifactId>
-        <version>LATEST</version>
-    </parent>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>LATEST</version>
+  </parent>
 
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-            <comments>A business-friendly OSS license</comments>
-        </license>
-    </licenses>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+      <comments>A business-friendly OSS license</comments>
+    </license>
+  </licenses>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jdk.version>1.8</jdk.version>
-        <jvm.extraargs/>
-        <sonar.jacoco.reportPath>${env.PWD}/target/jacoco-merged.exec</sonar.jacoco.reportPath>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <jdk.version>1.8</jdk.version>
+    <jvm.extraargs/>
+    <sonar.jacoco.reportPath>${env.PWD}/target/jacoco-merged.exec</sonar.jacoco.reportPath>
 
-        <!-- Definition of tests in various categories which may be excluded -->
-        <hanging.pregelix.tests>**/pregelix/**/FailureRecovery*.java</hanging.pregelix.tests>
-        <hivesterix.perf.tests>**/hivesterix/perf/PerfTestSuite.java</hivesterix.perf.tests>
-        <global.test.includes>**/*TestSuite.java,**/*Test.java</global.test.includes>
-        <global.test.excludes>**/Abstract*.java,${hanging.pregelix.tests},${hivesterix.perf.tests}
-        </global.test.excludes>
-        <!-- Versions under dependencymanagement or used in many projects via properties
-->
-        <hadoop.version>2.2.0</hadoop.version>
-        <junit.version>4.8.1</junit.version>
-        <commons.io.version>2.4</commons.io.version>
-        <jacoco.version>0.7.6.201602180812</jacoco.version>
-    </properties>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-yarn-client</artifactId>
-                <version>${hadoop.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-client</artifactId>
-                <version>${hadoop.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-common</artifactId>
-                <version>${hadoop.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-hdfs</artifactId>
-                <version>${hadoop.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-minicluster</artifactId>
-                <version>${hadoop.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-mapreduce-client-core</artifactId>
-                <version>${hadoop.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons.io.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <!-- Definition of tests in various categories which may be excluded -->
+    <hanging.pregelix.tests>**/pregelix/**/FailureRecovery*.java</hanging.pregelix.tests>
+    <hivesterix.perf.tests>**/hivesterix/perf/PerfTestSuite.java</hivesterix.perf.tests>
+    <global.test.includes>**/*TestSuite.java,**/*Test.java</global.test.includes>
+    <global.test.excludes>**/Abstract*.java,${hanging.pregelix.tests},${hivesterix.perf.tests}
+    </global.test.excludes>
+    <!-- Versions under dependencymanagement or used in many projects via properties -->
+    <hadoop.version>2.2.0</hadoop.version>
+    <junit.version>4.8.1</junit.version>
+    <commons.io.version>2.4</commons.io.version>
+    <jacoco.version>0.7.6.201602180812</jacoco.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-yarn-client</artifactId>
+        <version>${hadoop.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-client</artifactId>
+        <version>${hadoop.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-common</artifactId>
+        <version>${hadoop.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-hdfs</artifactId>
+        <version>${hadoop.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-minicluster</artifactId>
+        <version>${hadoop.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-mapreduce-client-core</artifactId>
+        <version>${hadoop.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons.io.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
   <build>
     <plugins>
@@ -116,12 +115,12 @@
         <artifactId>apache-rat-plugin</artifactId>
         <version>0.11</version>
         <executions>
-            <execution>
-                <phase>validate</phase>
-                <goals>
-                    <goal>check</goal>
-                </goals>
-            </execution>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
         </executions>
         <configuration>
           <licenses>
@@ -148,129 +147,128 @@
           </licenseFamilies>
           <excludeSubProjects>false</excludeSubProjects>
           <excludes>
-           <exclude>**/algebricks-tests/src/test/resources/results/**</exclude>
-           <exclude>**/javascript/flot/*.js</exclude>
-           <exclude>**/javascript/jsplumb/*.js</exclude>
-           <exclude>**/javascript/jquery/*.js</exclude>
-           <exclude>**/javascript/adminconsole/*.js</exclude>
-           <exclude>**/stylesheet/jquery-ui/**</exclude>
-           <exclude>**/hyracks-dist/src/main/resources/conf/**</exclude>
-           <exclude>**/src/test/resources/data/**</exclude>
-           <exclude>**/src/test/resources/results/**</exclude>
-           <exclude>**/src/test/resources/expected/**</exclude>
-           <exclude>**/testcases/*.piglet</exclude>
-           <exclude>**/data/**/*.tbl</exclude>
-           <exclude>**/data/**/*.ddl</exclude>
-           <exclude>**/data/**/*.tsv</exclude>
-           <exclude>**/actual/conf.xml</exclude>
-           <exclude>**/actual/customer_result/part-*</exclude>
-           <exclude>**/src/main/resources/conf/*</exclude>
-           <exclude>**/data/dfs/**</exclude>
-           <exclude>**/invIndex*/**</exclude>
-           <exclude>**/*.job</exclude>
-           <exclude>**/*.conf</exclude>
-           <exclude>**/src/main/resources/*.cleaned</exclude>
-           <exclude>**/ClusterControllerService/**</exclude>
-           <exclude>**/target/**</exclude>
-           <exclude>**/output/**</exclude>
-           <exclude>**/target/**</exclude>
-           <exclude>**/*.iml</exclude>
-           <exclude>**/*.prefs</exclude>
-           <exclude>**/data/*.txt</exclude>
-           <exclude>**/data/**/*.txt</exclude>
-           <exclude>**/.classpath</exclude>
-           <exclude>**/.project</exclude>
-           <exclude>**/target/**</exclude>
-           <exclude>**/*.iml</exclude>
-           <exclude>**/.classpath</exclude>
-           <exclude>**/.project</exclude>
-           <exclude>**/.settings/**</exclude>
-           <exclude>algebricks/algebricks-examples/piglet-example/testcases/*.piglet</exclude>
-           <exclude>algebricks/algebricks-tests/ClusterControllerService/logs/jobs/*.log</exclude>
-           <exclude>algebricks/algebricks-tests/data/simple/*.tbl</exclude>
-           <exclude>algebricks/algebricks-tests/data/tpch0.001/*.tbl</exclude>
-           <exclude>algebricks/algebricks-tests/data/tpch0.001/tpch.ddl</exclude>
-           <exclude>algebricks/algebricks-tests/src/test/resources/results/scanMicroSortWrite.out</exclude>
-           <exclude>ClusterControllerService/logs/jobs/*.log</exclude>
-           <exclude>hyracks/hyracks-client/ClusterControllerService/logs/jobs/*.log</exclude>
-           <exclude>hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/*.js</exclude>
-           <exclude>hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/jsplumb/jquery.jsPlumb-1.3.5-all-min.js</exclude>
-           <exclude>hyracks/hyracks-dist/src/main/resources/conf/master</exclude>
-           <exclude>hyracks/hyracks-dist/src/main/resources/conf/slaves</exclude>
-           <exclude>hyracks/hyracks-examples/hyracks-integration-tests/data/*.txt</exclude>
-           <exclude>hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/*.tbl</exclude>
-           <exclude>hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/tpch.ddl</exclude>
-           <exclude>hyracks/hyracks-examples/hyracks-integration-tests/data/wordcount.tsv</exclude>
-           <exclude>hyracks/hyracks-examples/text-example/textserver/data/*.txt</exclude>
-           <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/actual/conf.xml</exclude>
-           <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/actual/customer_result/part-0</exclude>
-           <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/build/test/data/dfs/**</exclude>
-           <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/ClusterControllerService/logs/jobs/*.log</exclude>
-           <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/data/customer.tbl</exclude>
-           <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/expected/part-0</exclude>
-           <exclude>hyracks/hyracks-storage-am-common/src/main/resources/dist.all.first.cleaned</exclude>
-           <exclude>hyracks/hyracks-storage-am-common/src/main/resources/dist.all.last.cleaned</exclude>
-      </excludes>
+            <exclude>**/algebricks-tests/src/test/resources/results/**</exclude>
+            <exclude>**/javascript/flot/*.js</exclude>
+            <exclude>**/javascript/jsplumb/*.js</exclude>
+            <exclude>**/javascript/jquery/*.js</exclude>
+            <exclude>**/javascript/adminconsole/*.js</exclude>
+            <exclude>**/stylesheet/jquery-ui/**</exclude>
+            <exclude>**/hyracks-dist/src/main/resources/conf/**</exclude>
+            <exclude>**/src/test/resources/data/**</exclude>
+            <exclude>**/src/test/resources/results/**</exclude>
+            <exclude>**/src/test/resources/expected/**</exclude>
+            <exclude>**/testcases/*.piglet</exclude>
+            <exclude>**/data/**/*.tbl</exclude>
+            <exclude>**/data/**/*.ddl</exclude>
+            <exclude>**/data/**/*.tsv</exclude>
+            <exclude>**/actual/conf.xml</exclude>
+            <exclude>**/actual/customer_result/part-*</exclude>
+            <exclude>**/src/main/resources/conf/*</exclude>
+            <exclude>**/data/dfs/**</exclude>
+            <exclude>**/invIndex*/**</exclude>
+            <exclude>**/*.job</exclude>
+            <exclude>**/*.conf</exclude>
+            <exclude>**/src/main/resources/*.cleaned</exclude>
+            <exclude>**/ClusterControllerService/**</exclude>
+            <exclude>**/target/**</exclude>
+            <exclude>**/output/**</exclude>
+            <exclude>**/target/**</exclude>
+            <exclude>**/*.iml</exclude>
+            <exclude>**/*.prefs</exclude>
+            <exclude>**/data/*.txt</exclude>
+            <exclude>**/data/**/*.txt</exclude>
+            <exclude>**/.classpath</exclude>
+            <exclude>**/.project</exclude>
+            <exclude>**/target/**</exclude>
+            <exclude>**/*.iml</exclude>
+            <exclude>**/.classpath</exclude>
+            <exclude>**/.project</exclude>
+            <exclude>**/.settings/**</exclude>
+            <exclude>algebricks/algebricks-examples/piglet-example/testcases/*.piglet</exclude>
+            <exclude>algebricks/algebricks-tests/ClusterControllerService/logs/jobs/*.log</exclude>
+            <exclude>algebricks/algebricks-tests/data/simple/*.tbl</exclude>
+            <exclude>algebricks/algebricks-tests/data/tpch0.001/*.tbl</exclude>
+            <exclude>algebricks/algebricks-tests/data/tpch0.001/tpch.ddl</exclude>
+            <exclude>algebricks/algebricks-tests/src/test/resources/results/scanMicroSortWrite.out</exclude>
+            <exclude>ClusterControllerService/logs/jobs/*.log</exclude>
+            <exclude>hyracks/hyracks-client/ClusterControllerService/logs/jobs/*.log</exclude>
+            <exclude>hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/*.js</exclude>
+            <exclude>hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/jsplumb/jquery.jsPlumb-1.3.5-all-min.js</exclude>
+            <exclude>hyracks/hyracks-dist/src/main/resources/conf/master</exclude>
+            <exclude>hyracks/hyracks-dist/src/main/resources/conf/slaves</exclude>
+            <exclude>hyracks/hyracks-examples/hyracks-integration-tests/data/*.txt</exclude>
+            <exclude>hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/*.tbl</exclude>
+            <exclude>hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/tpch.ddl</exclude>
+            <exclude>hyracks/hyracks-examples/hyracks-integration-tests/data/wordcount.tsv</exclude>
+            <exclude>hyracks/hyracks-examples/text-example/textserver/data/*.txt</exclude>
+            <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/actual/conf.xml</exclude>
+            <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/actual/customer_result/part-0</exclude>
+            <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/build/test/data/dfs/**</exclude>
+            <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/ClusterControllerService/logs/jobs/*.log</exclude>
+            <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/data/customer.tbl</exclude>
+            <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/expected/part-0</exclude>
+            <exclude>hyracks/hyracks-storage-am-common/src/main/resources/dist.all.first.cleaned</exclude>
+            <exclude>hyracks/hyracks-storage-am-common/src/main/resources/dist.all.last.cleaned</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-surefire-plugin</artifactId>
-	<version>2.16</version>
-	<configuration>
-	  <failIfNoTests>false</failIfNoTests>
-	  <forkCount>1</forkCount>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.16</version>
+        <configuration>
+          <failIfNoTests>false</failIfNoTests>
+          <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
-    <argLine>
-      -enableassertions -Xmx2048m
-      -Dfile.encoding=UTF-8
-      -Djava.util.logging.config.file=${user.home}/logging.properties
-      -Xdebug
-      -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n
-      ${coverageArgLine}
-    </argLine>
-	  <includes>
-	    <include>${global.test.includes},${test.includes}</include>
-	  </includes>
+          <argLine>-enableassertions -Xmx2048m
+            -Dfile.encoding=UTF-8
+            -Djava.util.logging.config.file=${user.home}/logging.properties
+            -Xdebug
+            -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n
+            ${coverageArgLine}
+          </argLine>
+          <includes>
+            <include>${global.test.includes},${test.includes}</include>
+          </includes>
           <excludes>
             <exclude>${global.test.excludes},${test.excludes}</exclude>
           </excludes>
-   </configuration>
-   </plugin>
-   <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <!-- We override the configuration plugin to override the descriptor to use
for building
-            the source release zip. Specifically, we would like to control the inclusions/exclusions.
-            For example, we exclude the KEYS file from the zip -->
-          <executions>
-              <execution>
-                  <!-- Use this id to match the id mentioned in the assembly plugin configuration
in
-                    the apache parent POM under the apache-release profile -->
-                  <id>source-release-assembly</id>
-                  <phase>package</phase>
-                  <goals>
-                      <goal>single</goal>
-                  </goals>
-                  <!-- combine.self should be override to replace the configuration in
the parent POM -->
-                  <configuration combine.self="override">
-                      <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                      <descriptors>
-                          <descriptor>src/main/assembly/source.xml</descriptor>
-                      </descriptors>
-                  </configuration>
-              </execution>
-          </executions>
+        </configuration>
       </plugin>
       <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.1</version>
-            <configuration>
-               <source>${jdk.version}</source>
-               <target>${jdk.version}</target>
-               <compilerArgument>-Xlint:all</compilerArgument>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <!-- We override the configuration plugin to override the descriptor to use for
building
+          the source release zip. Specifically, we would like to control the inclusions/exclusions.
+          For example, we exclude the KEYS file from the zip -->
+        <executions>
+          <execution>
+            <!-- Use this id to match the id mentioned in the assembly plugin configuration
in
+              the apache parent POM under the apache-release profile -->
+            <id>source-release-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <!-- combine.self should be override to replace the configuration in the parent
POM -->
+            <configuration combine.self="override">
+              <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+              <descriptors>
+                <descriptor>src/main/assembly/source.xml</descriptor>
+              </descriptors>
             </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>${jdk.version}</source>
+          <target>${jdk.version}</target>
+          <compilerArgument>-Xlint:all</compilerArgument>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
@@ -295,52 +293,52 @@
         </executions>
       </plugin>
       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-remote-resources-plugin</artifactId>
-          <executions>
-              <execution>
-                  <goals>
-                      <goal>process</goal>
-                  </goals>
-                  <configuration>
-                      <resourceBundles combine.children="append">
-                          <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-                          <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
-                      </resourceBundles>
-                  </configuration>
-              </execution>
-          </executions>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles combine.children="append">
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+                <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
     <pluginManagement>
-           <plugins>
-               <!--This plugin's configuration is used to store Eclipse m2e settings only.
It has no influence on the Maven build itself.-->
-               <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                              <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.apache.rat</groupId>
-                                        <artifactId>apache-rat-plugin</artifactId>
-                                        <versionRange>[0.11,)</versionRange>
-                                        <goals>
-                                            <goal>check</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore></ignore>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-      </pluginManagement>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It
has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.rat</groupId>
+                    <artifactId>apache-rat-plugin</artifactId>
+                    <versionRange>[0.11,)</versionRange>
+                    <goals>
+                      <goal>check</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 
   <scm>
@@ -350,12 +348,11 @@
     <tag>HEAD</tag>
   </scm>
 
-
   <profiles>
     <profile>
       <id>hanging-pregelix-tests</id>
       <properties>
-        <hanging.pregelix.tests />
+        <hanging.pregelix.tests/>
       </properties>
     </profile>
     <profile>
@@ -442,13 +439,13 @@
       </properties>
     </profile>
     <profile>
-        <id>java8</id>
-        <activation>
-            <jdk>1.8</jdk>
-        </activation>
-         <properties>
-            <jdk.version>1.8</jdk.version>
-         </properties>
+      <id>java8</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <jdk.version>1.8</jdk.version>
+      </properties>
     </profile>
   </profiles>
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/hyracks-fullstack/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/src/main/appended-resources/supplemental-models.xml b/hyracks-fullstack/src/main/appended-resources/supplemental-models.xml
index 1ebd3f2..0d69dc6 100644
--- a/hyracks-fullstack/src/main/appended-resources/supplemental-models.xml
+++ b/hyracks-fullstack/src/main/appended-resources/supplemental-models.xml
@@ -597,8 +597,8 @@
       <name>Jetty Server</name>
       <url>http://jetty.mortbay.org/</url>
       <organization>
-	    <name>Mort Bay Consulting</name>
-	    <url>http://www.mortbay.com</url>
+        <name>Mort Bay Consulting</name>
+        <url>http://www.mortbay.com</url>
       </organization>
       <licenses>
         <license>
@@ -615,8 +615,8 @@
       <name>Jetty Utilities</name>
       <url>http://jetty.mortbay.org/</url>
       <organization>
-	    <name>Mort Bay Consulting</name>
-	    <url>http://www.mortbay.com</url>
+        <name>Mort Bay Consulting</name>
+        <url>http://www.mortbay.com</url>
       </organization>
       <licenses>
         <license>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/hyracks-fullstack/src/main/assembly/source.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/src/main/assembly/source.xml b/hyracks-fullstack/src/main/assembly/source.xml
index fc28713..59d1bd1 100644
--- a/hyracks-fullstack/src/main/assembly/source.xml
+++ b/hyracks-fullstack/src/main/assembly/source.xml
@@ -13,8 +13,8 @@
   limitations under the License.
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
   <id>source-release</id>
   <formats>
     <format>zip</format>



Mime
View raw message