asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject [26/27] incubator-asterixdb-hyracks git commit: Merge branch 'release-0.2.17' into master
Date Fri, 18 Mar 2016 06:37:00 GMT
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/b165aca4/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml
----------------------------------------------------------------------
diff --cc hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml
index b018477,0b6b2a6..e0081cc
--- a/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml
+++ b/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml
@@@ -26,7 -26,23 +26,10 @@@
      <version>0.2.1-SNAPSHOT</version>
    </parent>
  
+   <properties>
+       <root.dir>${basedir}/../../..</root.dir>
+   </properties>
  
 -  <build>
 -    <plugins>
 -      <plugin>
 -        <groupId>org.apache.maven.plugins</groupId>
 -        <artifactId>maven-compiler-plugin</artifactId>
 -        <version>2.0.2</version>
 -        <configuration>
 -          <source>1.7</source>
 -          <target>1.7</target>
 -        </configuration>
 -      </plugin>
 -    </plugins>
 -  </build>
    <dependencies>
    <dependency>
    	<groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/b165aca4/hyracks/pom.xml
----------------------------------------------------------------------
diff --cc hyracks/pom.xml
index 7af92c7,dad4dc2..563b7bb
--- a/hyracks/pom.xml
+++ b/hyracks/pom.xml
@@@ -38,38 -39,21 +38,50 @@@
          <artifactId>versions-maven-plugin</artifactId>
          <version>1.2</version>
        </plugin>
+       <plugin>
+         <groupId>org.apache.rat</groupId>
+         <artifactId>apache-rat-plugin</artifactId>
+         <version>0.11</version>
+         <configuration>
+           <skip>true</skip>
+         </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.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>
+   </properties>
+ 
    <repositories>
      <repository>
        <id>maven-central</id>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/b165aca4/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index cc25c34,8a03ceb..4443b51
--- a/pom.xml
+++ b/pom.xml
@@@ -18,89 -18,87 +18,88 @@@
   !-->
  
  
- <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>
-     <artifactId>fullstack</artifactId>
-     <version>0.2.17-SNAPSHOT</version>
-     <packaging>pom</packaging>
-     <name>hyracks-ecosystem-full-stack</name>
+ <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>
+   <artifactId>apache-asterixdb-hyracks</artifactId>
+   <version>0.2.18-SNAPSHOT</version>
+   <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>
 -    <root.dir>${basedir}</root.dir>
 -    <jvm.extraargs />
 -    <!-- 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>
 -  </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>
 +    <properties>
 +        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 +        <jdk.version>1.8</jdk.version>
 +        <jvm.extraargs/>
 +        <!-- 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>
 +    </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>
@@@ -144,39 -142,38 +143,70 @@@
                <familyName>Apache License Version 2.0</familyName>
              </licenseFamily>
            </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>
          </configuration>
        </plugin>
@@@ -227,15 -224,48 +257,54 @@@
            </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>
+         <version>2.7</version>
+         <executions>
+           <execution>
+             <id>copy-resources</id>
+             <phase>validate</phase>
+             <goals>
+               <goal>copy-resources</goal>
+             </goals>
+             <configuration>
+               <outputDirectory>target</outputDirectory>
+               <resources>
+                 <resource>
+                   <directory>${root.dir}/src/main/appended-resources</directory>
+                   <!-- <filtering>true</filtering> -->
+                 </resource>
+               </resources>
+             </configuration>
+           </execution>
+         </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>
+       </plugin>
 -      <plugin>
 -          <groupId>org.apache.maven.plugins</groupId>
 -          <artifactId>maven-resources-plugin</artifactId>
 -      </plugin>
      </plugins>
    </build>
  


Mime
View raw message