Merge branch 'release-0.8.8' into master

Change-Id: I8fcf41c009f9faf51bc8bccc0c3c7217b7769149
diff --git a/asterix-lang-aql/pom.xml b/asterix-lang-aql/pom.xml
index b8ea8c3..43ac3df 100644
--- a/asterix-lang-aql/pom.xml
+++ b/asterix-lang-aql/pom.xml
@@ -22,9 +22,9 @@
     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>asterix</artifactId>
+        <artifactId>apache-asterixdb</artifactId>
         <groupId>org.apache.asterix</groupId>
-        <version>0.8.8-SNAPSHOT</version>
+        <version>0.8.9-SNAPSHOT</version>
     </parent>
 
     <licenses>
@@ -37,18 +37,12 @@
     </licenses>
 
     <artifactId>asterix-lang-aql</artifactId>
+    <properties>
+        <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+    </properties>
     <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.codehaus.mojo</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
                 <version>2.6</version>
@@ -135,7 +129,7 @@
         <dependency>
             <groupId>org.apache.asterix</groupId>
             <artifactId>asterix-lang-common</artifactId>
-            <version>0.8.8-SNAPSHOT</version>
+            <version>0.8.9-SNAPSHOT</version>
         </dependency>
     </dependencies>