asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject [35/36] incubator-asterixdb git commit: Merge branch 'release-0.8.8' into master
Date Fri, 18 Mar 2016 06:38:08 GMT
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3da9d068/asterix-metadata/pom.xml
----------------------------------------------------------------------
diff --cc asterix-metadata/pom.xml
index d665a15,9b140ce..d1f294c
--- a/asterix-metadata/pom.xml
+++ b/asterix-metadata/pom.xml
@@@ -17,73 -17,89 +17,76 @@@
   ! 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/xsd/maven-4.0.0.xsd">
 -	<modelVersion>4.0.0</modelVersion>
 -	<parent>
 -		<artifactId>apache-asterixdb</artifactId>
 -		<groupId>org.apache.asterix</groupId>
 -		<version>0.8.9-SNAPSHOT</version>
 -	</parent>
 -	<artifactId>asterix-metadata</artifactId>
 -
 -	<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>
 -		<appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
 -	</properties>
 -
 -	<build>
 -		<plugins>
 -			<plugin>
 -				<groupId>org.apache.maven.plugins</groupId>
 -				<artifactId>maven-compiler-plugin</artifactId>
 -				<version>2.3.2</version>
 -				<configuration>
 -					<source>1.7</source>
 -					<target>1.7</target>
 -					<fork>true</fork>
 -				</configuration>
 -			</plugin>
 -		</plugins>
 -	</build>
 -
 -	<dependencies>
 -		<dependency>
 -			<groupId>org.apache.asterix</groupId>
 -			<artifactId>asterix-common</artifactId>
 -			<version>0.8.9-SNAPSHOT</version>
 -			<scope>compile</scope>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.asterix</groupId>
 -			<artifactId>asterix-om</artifactId>
 -			<version>0.8.9-SNAPSHOT</version>
 -			<scope>compile</scope>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.asterix</groupId>
 -			<artifactId>asterix-runtime</artifactId>
 -			<version>0.8.9-SNAPSHOT</version>
 -			<scope>compile</scope>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.asterix</groupId>
 -			<artifactId>asterix-events</artifactId>
 -			<version>0.8.9-SNAPSHOT</version>
 -			<scope>compile</scope>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.hadoop</groupId>
 -			<artifactId>hadoop-client</artifactId>
 -			<type>jar</type>
 -			<scope>compile</scope>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.hyracks</groupId>
 -			<artifactId>hyracks-storage-am-lsm-invertedindex</artifactId>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.hyracks</groupId>
 -			<artifactId>hyracks-storage-am-lsm-btree</artifactId>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.hyracks</groupId>
 -			<artifactId>hyracks-storage-am-lsm-rtree</artifactId>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.hyracks</groupId>
 -			<artifactId>hyracks-hdfs-core</artifactId>
 -			<version>${hyracks.version}</version>
 -		</dependency>
 -	</dependencies>
 +    <modelVersion>4.0.0</modelVersion>
 +    <parent>
-         <artifactId>asterix</artifactId>
++        <artifactId>apache-asterixdb</artifactId>
 +        <groupId>org.apache.asterix</groupId>
-         <version>0.8.8-SNAPSHOT</version>
++        <version>0.8.9-SNAPSHOT</version>
 +    </parent>
 +    <artifactId>asterix-metadata</artifactId>
++    <properties>
++        <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
++    </properties>
 +    <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>
 +    <dependencies>
 +        <dependency>
 +            <groupId>org.apache.asterix</groupId>
 +            <artifactId>asterix-common</artifactId>
-             <version>0.8.8-SNAPSHOT</version>
++            <version>0.8.9-SNAPSHOT</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.asterix</groupId>
 +            <artifactId>asterix-om</artifactId>
-             <version>0.8.8-SNAPSHOT</version>
++            <version>0.8.9-SNAPSHOT</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.asterix</groupId>
 +            <artifactId>asterix-runtime</artifactId>
-             <version>0.8.8-SNAPSHOT</version>
++            <version>0.8.9-SNAPSHOT</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.asterix</groupId>
 +            <artifactId>asterix-events</artifactId>
-             <version>0.8.8-SNAPSHOT</version>
++            <version>0.8.9-SNAPSHOT</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.hadoop</groupId>
 +            <artifactId>hadoop-client</artifactId>
 +            <type>jar</type>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.hyracks</groupId>
 +            <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.hyracks</groupId>
 +            <artifactId>hyracks-storage-am-lsm-btree</artifactId>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.hyracks</groupId>
 +            <artifactId>hyracks-storage-am-lsm-rtree</artifactId>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.hyracks</groupId>
 +            <artifactId>hyracks-hdfs-core</artifactId>
 +            <version>${hyracks.version}</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.asterix</groupId>
 +            <artifactId>asterix-external-data</artifactId>
-             <version>0.8.8-SNAPSHOT</version>
++            <version>0.8.9-SNAPSHOT</version>
 +        </dependency>
 +    </dependencies>
- </project>
+ </project>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3da9d068/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
----------------------------------------------------------------------
diff --cc asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
index 3c7dc78,e2fd888..90bec64
--- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
+++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
@@@ -799,7 -830,21 +799,21 @@@ public class AqlMetadataProvider implem
          }
  
          for (int j = 0; j < pidxKeyFieldCount; ++j, ++i) {
-             IAType keyType = recType.getSubFieldType(pidxKeyFieldNames.get(j));
 -            IAType keyType = null;
 -            try {
 -                switch (dsType) {
 -                    case INTERNAL:
 -                    keyType = recType.getSubFieldType(pidxKeyFieldNames.get(j));
 -                    break;
 -                case EXTERNAL:
 -                    keyType = IndexingConstants.getFieldType(j);
 -                    break;
 -                default:
 -                    throw new AlgebricksException("Unknown Dataset Type");
 -                }
 -            } catch (IOException| AsterixException e) {
 -                throw new AlgebricksException(e);
 -            }
++           IAType keyType = null;
++           try {
++               switch (dsType) {
++                   case INTERNAL:
++                   keyType = recType.getSubFieldType(pidxKeyFieldNames.get(j));
++                   break;
++               case EXTERNAL:
++                   keyType = IndexingConstants.getFieldType(j);
++                   break;
++               default:
++                   throw new AlgebricksException("Unknown Dataset Type");
++               }
++           } catch (AsterixException e) {
++               throw new AlgebricksException(e);
++           }
              comparatorFactories[i] = AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType,
                      true);
              typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType);

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3da9d068/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java
----------------------------------------------------------------------
diff --cc asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java
index b0c6c51,8f806e2..3508554
--- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java
+++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java
@@@ -148,10 -132,9 +148,11 @@@ public class InternalDatasetDetails imp
          ArrayBackedValueStorage itemValue = new ArrayBackedValueStorage();
          OrderedListBuilder primaryKeyListBuilder = new OrderedListBuilder();
          AOrderedListType stringList = new AOrderedListType(BuiltinType.ASTRING, null);
 +        AOrderedListType int8List = new AOrderedListType(BuiltinType.AINT8, null);
+         AOrderedListType heterogeneousList = new AOrderedListType(BuiltinType.ANY, null);
          internalRecordBuilder.reset(MetadataRecordTypes.INTERNAL_DETAILS_RECORDTYPE);
          AMutableString aString = new AMutableString("");
 +        AMutableInt8 aInt8 = new AMutableInt8((byte) 0);
          @SuppressWarnings("unchecked")
          ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE
                  .getSerializerDeserializer(BuiltinType.ABOOLEAN);
@@@ -222,10 -202,9 +223,10 @@@
          internalRecordBuilder.addField(MetadataRecordTypes.INTERNAL_DETAILS_ARECORD_AUTOGENERATED_FIELD_INDEX,
                  fieldValue);
  
 +        // write filter fields if any
          List<String> filterField = getFilterField();
          if (filterField != null) {
-             listBuilder.reset(stringList);
+             listBuilder.reset(heterogeneousList);
              ArrayBackedValueStorage nameValue = new ArrayBackedValueStorage();
              nameValue.reset();
              aString.setValue(FILTER_FIELD_NAME);

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3da9d068/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3da9d068/asterix-om/pom.xml
----------------------------------------------------------------------
diff --cc asterix-om/pom.xml
index e16a7da,5fc20ae..48e4ffd
--- a/asterix-om/pom.xml
+++ b/asterix-om/pom.xml
@@@ -34,6 -34,25 +34,10 @@@
      </license>
    </licenses>
  
 -	<build>
 -		<plugins>
 -			<plugin>
 -				<groupId>org.apache.maven.plugins</groupId>
 -				<artifactId>maven-compiler-plugin</artifactId>
 -				<version>2.3.2</version>
 -				<configuration>
 -					<source>1.7</source>
 -					<target>1.7</target>
 -					<fork>true</fork>
 -				</configuration>
 -			</plugin>
 -		</plugins>
 -	</build>
 -
+     <properties>
+         <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+     </properties>
+ 
  	<dependencies>
  		<dependency>
  			<groupId>org.apache.asterix</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3da9d068/asterix-replication/pom.xml
----------------------------------------------------------------------
diff --cc asterix-replication/pom.xml
index b5595ef,0000000..5086192
mode 100644,000000..100644
--- a/asterix-replication/pom.xml
+++ b/asterix-replication/pom.xml
@@@ -1,70 -1,0 +1,61 @@@
 +<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">
 +	<modelVersion>4.0.0</modelVersion>
 +	<parent>
 +		<groupId>org.apache.asterix</groupId>
- 		<artifactId>asterix</artifactId>
- 		<version>0.8.8-SNAPSHOT</version>
++		<artifactId>apache-asterixdb</artifactId>
++		<version>0.8.9-SNAPSHOT</version>
 +	</parent>
 +	<artifactId>asterix-replication</artifactId>
 +	<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>
 +	<build>
 +		<plugins>
 +			<plugin>
 +				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-compiler-plugin</artifactId>
- 				<configuration>
- 					<source>1.8</source>
- 					<target>1.8</target>
- 					<fork>true</fork>
- 				</configuration>
- 			</plugin>
- 			<plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
 +				<artifactId>maven-jar-plugin</artifactId>
 +				<configuration>
 +					<includes>
 +						<include>**/*.class</include>
 +						<include>**/*.txt</include>
 +					</includes>
 +				</configuration>
 +				<executions>
 +					<execution>
 +						<goals>
 +							<goal>test-jar</goal>
 +						</goals>
 +						<phase>package</phase>
 +					</execution>
 +				</executions>
 +			</plugin>
 +		</plugins>
 +	</build>
 +	<dependencies>
 +		<dependency>
 +			<groupId>org.apache.asterix</groupId>
 +			<artifactId>asterix-common</artifactId>
- 			<version>0.8.8-SNAPSHOT</version>
++			<version>0.8.9-SNAPSHOT</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.apache.asterix</groupId>
 +			<artifactId>asterix-metadata</artifactId>
- 			<version>0.8.8-SNAPSHOT</version>
++			<version>0.8.9-SNAPSHOT</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.apache.hyracks</groupId>
 +			<artifactId>hyracks-api</artifactId>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.apache.hyracks</groupId>
 +			<artifactId>hyracks-storage-am-common</artifactId>
 +		</dependency>
 +	</dependencies>
 +
- </project>
++</project>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3da9d068/asterix-runtime/pom.xml
----------------------------------------------------------------------
diff --cc asterix-runtime/pom.xml
index 4f2d0b2,5806d49..6414139
--- a/asterix-runtime/pom.xml
+++ b/asterix-runtime/pom.xml
@@@ -17,63 -17,175 +17,66 @@@
   ! 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/xsd/maven-4.0.0.xsd">
 -	<modelVersion>4.0.0</modelVersion>
 -	<parent>
 -		<artifactId>apache-asterixdb</artifactId>
 -		<groupId>org.apache.asterix</groupId>
 -		<version>0.8.9-SNAPSHOT</version>
 -	</parent>
 -	<artifactId>asterix-runtime</artifactId>
 -
 -  <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>
 -      <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
 -  </properties>
 -
 -	<build>
 -		<plugins>
 -			<plugin>
 -				<groupId>org.apache.maven.plugins</groupId>
 -				<artifactId>maven-compiler-plugin</artifactId>
 -				<version>2.3.2</version>
 -				<configuration>
 -					<source>1.7</source>
 -					<target>1.7</target>
 -					<fork>true</fork>
 -				</configuration>
 -			</plugin>
 -	      	<plugin>
 -	        	<groupId>org.apache.asterix</groupId>
 -	        	<artifactId>lexer-generator-maven-plugin</artifactId>
 -	        	<version>0.8.9-SNAPSHOT</version>
 -	        	<configuration>
 -	        	  	<grammarFile>src/main/resources/adm.grammar</grammarFile>
 -	        	  	<outputDir>${project.build.directory}/generated-sources/org/apache/asterix/runtime/operators/file/adm</outputDir>
 -	        	</configuration>
 -	        	<executions>
 -		          	<execution>
 -		          		<id>generate-lexer</id>
 -            			<phase>generate-sources</phase>
 -			            <goals>
 -	              			<goal>generate-lexer</goal>
 -	            		</goals>
 -	          		</execution>
 -	        	</executions>
 -	      	</plugin>
 -	      	 <plugin>
 -			    <groupId>org.codehaus.mojo</groupId>
 -			    <artifactId>build-helper-maven-plugin</artifactId>
 -			    <version>1.9</version>
 -			    <executions>
 -			        <execution>
 -			            <id>add-source</id>
 -			            <phase>generate-sources</phase>
 -			            <goals>
 -			                <goal>add-source</goal>
 -			            </goals>
 -			            <configuration>
 -			                <sources>
 -			                    <source>${project.build.directory}/generated-sources/</source>
 -			                </sources>
 -			            </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.asterix
 -										</groupId>
 -										<artifactId>
 -											lexer-generator-maven-plugin
 -										</artifactId>
 -										<versionRange>
 -											[0.1,)
 -										</versionRange>
 -										<goals>
 -											<goal>generate-lexer</goal>
 -										</goals>
 -									</pluginExecutionFilter>
 -									<action>
 -										<execute>
 -											<runOnIncremental>false</runOnIncremental>
 -										</execute>
 -									</action>
 -								</pluginExecution>
 -								<pluginExecution>
 -									<pluginExecutionFilter>
 -										<groupId>
 -											org.codehaus.mojo
 -										</groupId>
 -										<artifactId>
 -											build-helper-maven-plugin
 -										</artifactId>
 -										<versionRange>
 -											[1.7,)
 -										</versionRange>
 -										<goals>
 -											<goal>add-source</goal>
 -										</goals>
 -									</pluginExecutionFilter>
 -									<action>
 -										<ignore />
 -									</action>
 -								</pluginExecution>
 -							</pluginExecutions>
 -						</lifecycleMappingMetadata>
 -					</configuration>
 -				</plugin>
 -			</plugins>
 -		</pluginManagement>
 -	</build>
 -
 -	<dependencies>
 -		<dependency>
 -			<groupId>org.apache.asterix</groupId>
 -			<artifactId>asterix-om</artifactId>
 -			<version>0.8.9-SNAPSHOT</version>
 -			<scope>compile</scope>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.asterix</groupId>
 -			<artifactId>asterix-fuzzyjoin</artifactId>
 -			<version>0.8.9-SNAPSHOT</version>
 -			<scope>compile</scope>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.hyracks</groupId>
 -			<artifactId>hyracks-storage-am-btree</artifactId>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.asterix</groupId>
 -			<artifactId>asterix-transactions</artifactId>
 -			<version>0.8.9-SNAPSHOT</version>
 -			<scope>compile</scope>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.twitter4j</groupId>
 -			<artifactId>twitter4j-core</artifactId>
 -			<version>2.2.3</version>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.apache.hadoop</groupId>
 -			<artifactId>hadoop-client</artifactId>
 -			<type>jar</type>
 -			<scope>compile</scope>
 -		</dependency>
 -		<dependency>
 -		         <groupId>org.apache.hyracks</groupId>
 -		         <artifactId>hyracks-api</artifactId>
 -	        </dependency>
 -	</dependencies>
 -
 +    <modelVersion>4.0.0</modelVersion>
 +    <parent>
-         <artifactId>asterix</artifactId>
++        <artifactId>apache-asterixdb</artifactId>
 +        <groupId>org.apache.asterix</groupId>
-         <version>0.8.8-SNAPSHOT</version>
++        <version>0.8.9-SNAPSHOT</version>
 +    </parent>
 +    <artifactId>asterix-runtime</artifactId>
++    <properties>
++        <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
++    </properties>
 +    <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>
 +    <dependencies>
 +        <dependency>
 +            <groupId>org.apache.asterix</groupId>
 +            <artifactId>asterix-om</artifactId>
-             <version>0.8.8-SNAPSHOT</version>
++            <version>0.8.9-SNAPSHOT</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.asterix</groupId>
 +            <artifactId>asterix-fuzzyjoin</artifactId>
-             <version>0.8.8-SNAPSHOT</version>
++            <version>0.8.9-SNAPSHOT</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.hyracks</groupId>
 +            <artifactId>hyracks-storage-am-btree</artifactId>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.asterix</groupId>
 +            <artifactId>asterix-transactions</artifactId>
-             <version>0.8.8-SNAPSHOT</version>
++            <version>0.8.9-SNAPSHOT</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.twitter4j</groupId>
 +            <artifactId>twitter4j-core</artifactId>
 +            <version>[4.0,)</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.twitter4j</groupId>
 +            <artifactId>twitter4j-stream</artifactId>
 +            <version>[4.0,)</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.hadoop</groupId>
 +            <artifactId>hadoop-client</artifactId>
 +            <type>jar</type>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.hyracks</groupId>
 +            <artifactId>hyracks-api</artifactId>
 +        </dependency>
 +    </dependencies>
- </project>
+ </project>
 -

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3da9d068/asterix-test-framework/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3da9d068/asterix-tools/pom.xml
----------------------------------------------------------------------
diff --cc asterix-tools/pom.xml
index 50eee60,7959df2..ac377a8
--- a/asterix-tools/pom.xml
+++ b/asterix-tools/pom.xml
@@@ -37,72 -41,29 +41,19 @@@
  	<build>
  		<plugins>
  			<plugin>
+ 				<groupId>org.apache.maven.plugins</groupId>
 -				<artifactId>maven-compiler-plugin</artifactId>
 -				<version>2.3.2</version>
 -				<configuration>
 -					<source>1.7</source>
 -					<target>1.7</target>
 -					<fork>true</fork>
 -				</configuration>
 -			</plugin>
 -			<plugin>
 -				<groupId>org.apache.maven.plugins</groupId>
  				<artifactId>maven-jar-plugin</artifactId>
  				<version>2.4</version>
- 				<executions>
- 					<execution>
- 						<id>aqlclient</id>
- 						<goals>
- 							<goal>jar</goal>
- 						</goals>
- 						<phase>package</phase>
- 						<configuration>
- 							<classifier>aqlclient</classifier>
- 							<archive>
- 								<manifest>
- 									<MainClass>org.apache.asterix.tools.aqlclient.AqlClient</MainClass>
- 								</manifest>
- 							</archive>
- 							<includes>
- 								<include>**/uci/ics/asterix/tools/aqlclient/*</include>
- 							</includes>
- 						</configuration>
- 					</execution>
- 				</executions>
- 			</plugin>
- 			<plugin>
- 				<groupId>org.codehaus.mojo</groupId>
- 				<artifactId>appassembler-maven-plugin</artifactId>
- 				<version>1.0</version>
- 				<executions>
- 					<execution>
- 						<configuration>
- 							<programs>
- 								<program>
- 									<mainClass>org.apache.asterix.tools.TblToAdm</mainClass>
- 									<name>tbl2adm</name>
- 								</program>
- 								<program>
- 									<mainClass>org.apache.asterix.tools.datagen.AdgClientDriver</mainClass>
- 									<name>adg</name>
- 								</program>
- 							</programs>
- 							<repositoryLayout>flat</repositoryLayout>
- 							<repositoryName>lib</repositoryName>
- 						</configuration>
- 						<phase>package</phase>
- 						<goals>
- 							<goal>assemble</goal>
- 						</goals>
- 					</execution>
- 				</executions>
- 			</plugin>
- 			<plugin>
- 				<artifactId>maven-assembly-plugin</artifactId>
- 				<version>2.2-beta-5</version>
- 				<executions>
- 					<execution>
- 						<configuration>
- 							<descriptors>
- 								<descriptor>src/main/assembly/binary-assembly.xml</descriptor>
- 							</descriptors>
- 						</configuration>
- 						<phase>package</phase>
- 						<goals>
- 							<goal>attached</goal>
- 						</goals>
- 					</execution>
- 				</executions>
+ 				<configuration>
+ 					<includes>
+ 						<include>**/*.class</include>
+ 						<include>**/README*</include>
+ 						<include>**/DISCLAIMER*</include>
+ 						<include>**/NOTICE*</include>
+ 						<include>**/LICENSE*</include>
+ 						<include>**/DEPENDENCIES*</include>
+ 					</includes>
+ 				</configuration>
  			</plugin>
  		</plugins>
  	</build>
@@@ -139,8 -100,8 +90,8 @@@
  	<dependencies>
  		<dependency>
  			<groupId>org.apache.asterix</groupId>
 -			<artifactId>asterix-aql</artifactId>
 +			<artifactId>asterix-lang-aql</artifactId>
- 			<version>0.8.8-SNAPSHOT</version>
+ 			<version>0.8.9-SNAPSHOT</version>
  			<scope>compile</scope>
  		</dependency>
  		<dependency>
@@@ -158,15 -119,15 +109,15 @@@
  		<dependency>
  			<groupId>org.apache.asterix</groupId>
  			<artifactId>asterix-metadata</artifactId>
- 			<version>0.8.8-SNAPSHOT</version>
+ 			<version>0.8.9-SNAPSHOT</version>
  			<scope>compile</scope>
  		</dependency>
 -		<dependency>
 +		<!--<dependency>
  			<groupId>org.apache.asterix</groupId>
  			<artifactId>asterix-metadata</artifactId>
- 			<version>0.8.8-SNAPSHOT</version>
+ 			<version>0.8.9-SNAPSHOT</version>
  			<scope>compile</scope>
 -		</dependency>
 +		</dependency>-->
  		<dependency>
  			<groupId>org.apache.asterix</groupId>
  			<artifactId>asterix-events</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3da9d068/asterix-transactions/pom.xml
----------------------------------------------------------------------
diff --cc asterix-transactions/pom.xml
index ae4aaa5,ea2db26..cc3f41f
--- a/asterix-transactions/pom.xml
+++ b/asterix-transactions/pom.xml
@@@ -37,9 -41,19 +41,9 @@@
  	<build>
  		<plugins>
  			<plugin>
 -				<groupId>org.apache.maven.plugins</groupId>
 -				<artifactId>maven-compiler-plugin</artifactId>
 -				<version>2.3.2</version>
 -				<configuration>
 -					<source>1.7</source>
 -					<target>1.7</target>
 -					<fork>true</fork>
 -				</configuration>
 -			</plugin>
 -            <plugin>
                  <groupId>org.apache.asterix</groupId>
                  <artifactId>record-manager-generator-maven-plugin</artifactId>
-                 <version>0.8.8-SNAPSHOT</version>
+                 <version>0.8.9-SNAPSHOT</version>
                  <configuration>
                      <debug>false</debug>
                      <inputFiles>
@@@ -86,36 -100,26 +90,40 @@@
  		<dependency>
  			<groupId>org.apache.hyracks</groupId>
  			<artifactId>hyracks-storage-am-common</artifactId>
++            <version>${hyracks.version}</version>
  		</dependency>
  		<dependency>
  			<groupId>org.apache.hyracks</groupId>
  			<artifactId>hyracks-storage-am-lsm-btree</artifactId>
++            <version>${hyracks.version}</version>
  		</dependency>
  		<dependency>
  			<groupId>org.apache.hyracks</groupId>
  			<artifactId>hyracks-storage-am-lsm-rtree</artifactId>
++            <version>${hyracks.version}</version>
  		</dependency>
  		<dependency>
  			<groupId>org.apache.hyracks</groupId>
  			<artifactId>hyracks-storage-am-lsm-invertedindex</artifactId>
++            <version>${hyracks.version}</version>
  		</dependency>
 -                <dependency>
 -                        <groupId>org.apache.asterix</groupId>
 -                        <artifactId>asterix-common</artifactId>
 -                        <version>0.8.9-SNAPSHOT</version>
 -                        <type>jar</type>
 -                        <scope>compile</scope>
 -                </dependency>
 -	</dependencies>
 +        <dependency>
 +            <groupId>org.apache.asterix</groupId>
 +            <artifactId>asterix-common</artifactId>
-             <version>0.8.8-SNAPSHOT</version>
++            <version>0.8.9-SNAPSHOT</version>
 +            <type>jar</type>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>com.google.guava</groupId>
 +            <artifactId>guava</artifactId>
 +            <version>18.0</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.mockito</groupId>
 +            <artifactId>mockito-all</artifactId>
 +            <version>1.10.19</version>
 +        </dependency>
 +    </dependencies>
  
  </project>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3da9d068/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 2bf4e4f,46a8aa4..dcabb5b
--- a/pom.xml
+++ b/pom.xml
@@@ -42,8 -42,8 +42,9 @@@
      <properties>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <jvm.extraargs />
 +        <jdk.version>1.8</jdk.version>
          <runSlowAQLTests>false</runSlowAQLTests>
+         <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
  
      <!-- Definition of tests in various categories which may be excluded -->
          <optimizer.tests>**/optimizer/**/*Test.java</optimizer.tests>
@@@ -53,10 -53,9 +54,9 @@@
          <invalid.tests>**/DmlTest.java</invalid.tests>
          <global.test.includes>**/*TestSuite.java,**/*Test.java,${execution.tests}</global.test.includes>
          <global.test.excludes>${optimizer.tests},${metadata.tests},${invalid.tests},${repeated.tests}</global.test.excludes>
- 
-         <!-- Versions under dependencymanagement or used in many projects via properties -->
-         <algebricks.version>0.2.17-SNAPSHOT</algebricks.version>
-         <hyracks.version>0.2.17-SNAPSHOT</hyracks.version>
+     <!-- Versions under dependencymanagement or used in many projects via properties -->
 -        <algebricks.version>0.2.17-incubating</algebricks.version>
 -        <hyracks.version>0.2.17-incubating</hyracks.version>
++        <algebricks.version>0.2.18-SNAPSHOT</algebricks.version>
++        <hyracks.version>0.2.18-SNAPSHOT</hyracks.version>
          <hadoop.version>2.2.0</hadoop.version>
          <junit.version>4.11</junit.version>
          <commons.io.version>2.4</commons.io.version>
@@@ -84,9 -81,7 +84,9 @@@
                          -Djava.util.logging.config.file=${user.home}/logging.properties
                          -DrunSlowAQLTests=${runSlowAQLTests}
                          -Xdebug
 -                        -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n</argLine>
 +                        -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n
 +                        ${coverageArgLine}
-                     </argLine>
++                        </argLine>
                      <includes>
                          <include>${global.test.includes},${test.includes}</include>
                      </includes>
@@@ -152,98 -146,52 +152,119 @@@
              </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 -->
 +                <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>
 +                <groupId>pl.project13.maven</groupId>
 +                <artifactId>git-commit-id-plugin</artifactId>
 +                <version>2.2.0</version>
                  <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>
 +                            <goal>revision</goal>
 +                         </goals>
 +                    </execution>
 +                </executions>
 +
 +                <configuration>
 +                    <!--
 +                        If you'd like to tell the plugin where your .git directory is,
 +                        use this setting, otherwise we'll perform a search trying to
 +                        figure out the right directory. It's better to add it explicite IMHO.
 +                    -->
 +                    <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
 +                    <!-- this is false by default, forces the plugin to generate the git.properties file -->
 +                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
 +
 +                    <!-- The path for the to be generated properties file, it's relative to ${project.basedir} -->
 +                    <generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
 +                </configuration>
 +
              </plugin>
-             <!-- END OF GIT COMMIT ID PLUGIN CONFIGURATION -->
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-remote-resources-plugin</artifactId>
+                 <executions>
+                     <execution>
+                         <goals>
+                             <goal>process</goal>
+                         </goals>
+                         <configuration>
+                             <appendedResourcesDirectory>${appendedResourcesDirectory}</appendedResourcesDirectory>
+                             <resourceBundles>
+                                 <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>
 +        <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>
 +                                <pluginExecution>
 +                                    <pluginExecutionFilter>
 +                                        <groupId>org.apache.asterix</groupId>
 +                                        <artifactId>record-manager-generator-maven-plugin</artifactId>
 +                                        <versionRange>[0.8.7-SNAPSHOT,)</versionRange>
 +                                        <goals>
 +                                            <goal>generate-record-manager</goal>
 +                                        </goals>
 +                                    </pluginExecutionFilter>
 +                                    <action>
 +                                        <ignore></ignore>
 +                                    </action>
 +                                </pluginExecution>
 +                                <pluginExecution>
 +                                    <pluginExecutionFilter>
 +                                        <groupId>org.apache.maven.plugins</groupId>
 +                                        <artifactId>maven-jar-plugin</artifactId>
 +                                        <versionRange>[2.4,)</versionRange>
 +                                        <goals>
 +                                            <goal>test-jar</goal>
 +                                        </goals>
 +                                    </pluginExecutionFilter>
 +                                    <action>
 +                                        <ignore></ignore>
 +                                    </action>
 +                                </pluginExecution>
 +                            </pluginExecutions>
 +                        </lifecycleMappingMetadata>
 +                    </configuration>
 +                </plugin>
 +            </plugins>
 +        </pluginManagement>
      </build>
  
      <scm>
@@@ -309,90 -258,25 +331,107 @@@
                  <test.heap.size>3072</test.heap.size>
              </properties>
          </profile>
 -
 +        <profile>
 +          <id>asterix-release</id>
 +          <build>
 +            <plugins>
 +              <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>
 +              </plugin>
 +            </plugins>
 +          </build>
 +        </profile>
 +        <profile>
 +            <id>java8</id>
 +            <activation>
 +                <jdk>1.8</jdk>
 +            </activation>
 +             <properties>
 +                <jdk.version>1.8</jdk.version>
 +             </properties>
 +        </profile>
-         <!-- Code Coverage -->
 +        <profile>
 +            <id>coverage</id>
 +            <activation>
 +                <property>
 +                    <name>coverage</name>
 +                </property>
 +            </activation>
 +            <build>
 +                <plugins>
 +                    <plugin>
 +                        <groupId>org.jacoco</groupId>
 +                        <artifactId>jacoco-maven-plugin</artifactId>
 +                        <version>${jacoco.version}</version>
 +                        <executions>
 +                            <execution>
 +                                <id>default-prepare-agent</id>
 +                                <goals>
 +                                    <goal>prepare-agent</goal>
 +                                </goals>
 +                                <configuration>
 +                                    <propertyName>coverageArgLine</propertyName>
 +                                </configuration>
 +                            </execution>
 +                        </executions>
 +                    </plugin>
 +                </plugins>
 +            </build>
 +            <properties>
 +                <coverage/>
 +            </properties>
 +        </profile>
 +        <profile>
 +            <id>no-coverage</id>
 +            <activation>
 +                <property>
 +                    <name>!coverage</name>
 +                </property>
 +            </activation>
 +            <properties>
 +                <coverageArgLine/>
 +            </properties>
 +        </profile>
+         <profile>
+             <id>doclint-java8-disable</id>
+             <activation>
+                 <jdk>[1.8,)</jdk>
+             </activation>
+ 
+             <build>
+                 <plugins>
+                     <plugin>
+                         <groupId>org.apache.maven.plugins</groupId>
+                         <artifactId>maven-javadoc-plugin</artifactId>
+                         <configuration>
+                                 <additionalparam>-Xdoclint:none</additionalparam>
+                         </configuration>
+                     </plugin>
+                 </plugins>
+             </build>
+         </profile>
      </profiles>
  
      <modules>



Mime
View raw message