Ian Maxon has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/701
Change subject: Merge branch 'release-0.8.8' into imaxon/merge-0.8.8
......................................................................
Merge branch 'release-0.8.8' into imaxon/merge-0.8.8
Change-Id: I8fcf41c009f9faf51bc8bccc0c3c7217b7769149
---
M asterix-algebra/pom.xml
M asterix-app/pom.xml
D asterix-app/src/main/assembly/binary-assembly.xml
M asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java
M asterix-app/src/test/resources/metadata/testsuite.xml
D asterix-aql/pom.xml
M asterix-common/pom.xml
M asterix-external-data/pom.xml
M asterix-installer/pom.xml
M
asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java
M asterix-lang-aql/pom.xml
M asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
M asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
M asterix-metadata/pom.xml
M asterix-om/pom.xml
M
asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java
M asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java
M asterix-replication/pom.xml
M asterix-runtime/pom.xml
M asterix-tools/pom.xml
M asterix-transactions/pom.xml
M pom.xml
22 files changed, 99 insertions(+), 1,154 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/01/701/1
diff --git a/asterix-algebra/pom.xml b/asterix-algebra/pom.xml
index 9d40f2c..7bc2b8c 100644
--- a/asterix-algebra/pom.xml
+++ b/asterix-algebra/pom.xml
@@ -10,14 +10,18 @@
License for the ! specific language governing permissions and
limitations
! 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";>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<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-algebra</artifactId>
+
+ <properties>
+
<appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -81,41 +85,41 @@
<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-lang-common</artifactId>
- <version>0.8.8-SNAPSHOT</version>
+ <version>0.8.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-lang-aql</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-lang-sqlpp</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-metadata</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-external-data</artifactId>
- <version>0.8.8-SNAPSHOT</version>
+ <version>0.8.9-SNAPSHOT</version>
</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>
@@ -128,134 +132,3 @@
</dependency>
</dependencies>
</project>
-=======
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>apache-asterixdb</artifactId>
- <groupId>org.apache.asterix</groupId>
- <version>0.8.9-SNAPSHOT</version>
- </parent>
- <artifactId>asterix-algebra</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.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>javacc</id>
- <goals>
- <goal>javacc</goal>
- </goals>
- <configuration>
-
<isStatic>false</isStatic>
- </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.codehaus.mojo
-
</groupId>
-
<artifactId>
-
javacc-maven-plugin
-
</artifactId>
-
<versionRange>
-
[2.6,)
-
</versionRange>
-
<goals>
-
<goal>javacc</goal>
-
</goals>
-
</pluginExecutionFilter>
- <action>
-
<ignore />
-
</action>
-
</pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencies>
- <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-aql</artifactId>
- <version>0.8.9-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-metadata</artifactId>
- <version>0.8.9-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-external-data</artifactId>
- <version>0.8.9-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-transactions</artifactId>
- <version>0.8.9-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-compiler</artifactId>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </dependency>
- </dependencies>
-</project>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
diff --git a/asterix-app/pom.xml b/asterix-app/pom.xml
index f4bfb8d..949f12c 100644
--- a/asterix-app/pom.xml
+++ b/asterix-app/pom.xml
@@ -32,14 +32,11 @@
<comments>A business-friendly OSS license</comments>
</license>
</licenses>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-=======
<properties>
<appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
</properties>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<build>
<plugins>
<plugin>
@@ -131,72 +128,41 @@
<dependency>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-algebra</artifactId>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<version>${project.version}</version>
-=======
- <version>0.8.9-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-aql</artifactId>
- <version>0.8.9-SNAPSHOT</version>
- <type>jar</type>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-om</artifactId>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<version>${project.version}</version>
-=======
- <version>0.8.9-SNAPSHOT</version>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-metadata</artifactId>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<version>${project.version}</version>
-=======
- <version>0.8.9-SNAPSHOT</version>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-tools</artifactId>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<version>${project.version}</version>
-=======
- <version>0.8.9-SNAPSHOT</version>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-common</artifactId>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<version>${project.version}</version>
-=======
- <version>0.8.9-SNAPSHOT</version>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-common</artifactId>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<version>${project.version}</version>
-=======
- <version>0.8.9-SNAPSHOT</version>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -206,11 +172,7 @@
<dependency>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-transactions</artifactId>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<version>${project.version}</version>
-=======
- <version>0.8.9-SNAPSHOT</version>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<scope>compile</scope>
</dependency>
<dependency>
@@ -246,11 +208,7 @@
<dependency>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-test-framework</artifactId>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<version>${project.version}</version>
-=======
- <version>0.8.9-SNAPSHOT</version>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<scope>test</scope>
</dependency>
<dependency>
diff --git a/asterix-app/src/main/assembly/binary-assembly.xml
b/asterix-app/src/main/assembly/binary-assembly.xml
deleted file mode 100644
index f6b0540..0000000
--- a/asterix-app/src/main/assembly/binary-assembly.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-<!--
- ! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
- ! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
- ! to you under the Apache License, Version 2.0 (the
- ! "License"); you may not use this file except in compliance
- ! with the License. You may obtain a copy of the License at
- !
- ! http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing,
- ! software distributed under the License is distributed on an
- ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ! KIND, either express or implied. See the License for the
- ! specific language governing permissions and limitations
- ! under the License.
- !-->
-<assembly>
- <id>binary-assembly</id>
- <formats>
- <format>zip</format>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/appassembler/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/appassembler/lib</directory>
- <outputDirectory>lib</outputDirectory>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>externallib</outputDirectory>
- <includes>
- <include>asterix-external-data:*:zip</include>
- </includes>
- <unpack>false</unpack>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-</assembly>
-=======
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
diff --git
a/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java
b/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java
index f246c23..4c10eb2 100644
--- a/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java
+++ b/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java
@@ -69,10 +69,7 @@
conf.addResource(new Path(basePath + PATH_TO_HADOOP_CONF +
"/mapred-site.xml"));
conf.addResource(new Path(basePath + PATH_TO_HADOOP_CONF +
"/hdfs-site.xml"));
cleanupLocal();
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
setLoggingLevel(Level.WARN);
-=======
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
MiniDFSCluster.Builder build = new MiniDFSCluster.Builder(conf);
build.nameNodePort(nameNodePort);
build.numDataNodes(numDataNodes);
@@ -82,14 +79,11 @@
loadData(basePath);
}
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
private void setLoggingLevel(Level level) {
Logger rootLogger = Logger.getRootLogger();
rootLogger.setLevel(level);
}
-=======
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
private void loadData(String localDataRoot) throws IOException {
Path destDir = new Path(HDFS_PATH);
dfs.mkdirs(destDir);
@@ -113,31 +107,6 @@
dfsCluster.shutdown();
cleanupLocal();
}
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-=======
- }
-
- public static void main(String[] args) throws Exception {
- HDFSCluster cluster = new HDFSCluster();
- cluster.setup();
- JobConf conf = configureJobConf();
- InputSplit[] inputSplits = conf.getInputFormat().getSplits(conf, 0);
- for (InputSplit split : inputSplits) {
- System.out.println("split :" + split);
- }
- }
-
- private static JobConf configureJobConf() throws Exception {
- JobConf conf = new JobConf();
- String hdfsUrl = "hdfs://127.0.0.1:31888";
- String hdfsPath = "/asterix/extrasmalltweets.txt";
- conf.set("fs.default.name", hdfsUrl);
- conf.set("fs.hdfs.impl",
"org.apache.hadoop.hdfs.DistributedFileSystem");
- conf.setClassLoader(HDFSAdapter.class.getClassLoader());
- conf.set("mapred.input.dir", hdfsPath);
- conf.set("mapred.input.format.class",
"org.apache.hadoop.mapred.TextInputFormat");
- return conf;
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
}
}
diff --git a/asterix-app/src/test/resources/metadata/testsuite.xml
b/asterix-app/src/test/resources/metadata/testsuite.xml
index 41626c9..bba2ab0 100644
--- a/asterix-app/src/test/resources/metadata/testsuite.xml
+++ b/asterix-app/src/test/resources/metadata/testsuite.xml
@@ -174,21 +174,6 @@
</compilation-unit>
</test-case>
<test-case FilePath="basic">
- <compilation-unit name="meta22">
- <output-dir compare="Text">meta22</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="basic">
- <compilation-unit name="meta23">
- <output-dir compare="Text">meta23</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="basic">
- <compilation-unit name="meta24">
- <output-dir compare="Text">meta24</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="basic">
<compilation-unit name="metadata_compaction_policy">
<output-dir compare="Text">metadata_compaction_policy</output-dir>
</compilation-unit>
diff --git a/asterix-aql/pom.xml b/asterix-aql/pom.xml
deleted file mode 100644
index 6b0d9e1..0000000
--- a/asterix-aql/pom.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-=======
-<!--
- ! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements. See the NOTICE file
- ! distributed with this work for additional information
- ! regarding copyright ownership. The ASF licenses this file
- ! to you under the Apache License, Version 2.0 (the
- ! "License"); you may not use this file except in compliance
- ! with the License. You may obtain a copy of the License at
- !
- ! http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing,
- ! software distributed under the License is distributed on an
- ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ! KIND, either express or implied. See the License for the
- ! specific language governing permissions and limitations
- ! 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>
-
- <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>
-
- <artifactId>asterix-aql</artifactId>
- <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.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>javacc</id>
- <goals>
- <goal>javacc</goal>
- </goals>
- <configuration>
- <isStatic>false</isStatic>
- <javaUnicodeEscape>true</javaUnicodeEscape>
- </configuration>
- </execution>
- <execution>
- <id>javacc-jjdoc</id>
- <goals>
- <goal>jjdoc</goal>
- </goals>
- <phase>process-sources</phase>
- </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/javacc/</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.codehaus.mojo
- </groupId>
- <artifactId>
- javacc-maven-plugin
- </artifactId>
- <versionRange>
- [2.6,)
- </versionRange>
- <goals>
- <goal>jjdoc</goal>
- <goal>javacc</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </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-metadata</artifactId>
- <version>0.8.9-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>2.4.0</version>
- </dependency>
- </dependencies>
-
-</project>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
diff --git a/asterix-common/pom.xml b/asterix-common/pom.xml
index 1d91ae4..2ab8b91 100644
--- a/asterix-common/pom.xml
+++ b/asterix-common/pom.xml
@@ -33,13 +33,10 @@
<comments>A business-friendly OSS license</comments>
</license>
</licenses>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-=======
<properties>
<appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
</properties>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<build>
<plugins>
diff --git a/asterix-external-data/pom.xml b/asterix-external-data/pom.xml
index 115f429..9a8540f 100644
--- a/asterix-external-data/pom.xml
+++ b/asterix-external-data/pom.xml
@@ -17,12 +17,11 @@
! 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";>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<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>
<license>
@@ -33,12 +32,15 @@
</license>
</licenses>
<artifactId>asterix-external-data</artifactId>
+ <properties>
+
<appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ </properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.asterix</groupId>
<artifactId>lexer-generator-maven-plugin</artifactId>
- <version>0.8.8-SNAPSHOT</version>
+ <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>
@@ -93,41 +95,45 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <includes>
- <include>**/*.class</include>
- <include>**/*.txt</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <executions>
- <execution>
- <configuration>
-
<descriptor>src/main/assembly/binary-assembly-libzip.xml</descriptor>
- <finalName>testlib-zip</finalName>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <includes>
+ <include>**/*.class</include>
+ <include>**/*.txt</include>
+ <include>**/DISCLAIMER</include>
+ <include>**/NOTICE</include>
+ <include>**/LICENSE</include>
+ <include>**/DEPENDENCIES</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <executions>
+ <execution>
+ <configuration>
+
<descriptor>src/main/assembly/binary-assembly-libzip.xml</descriptor>
+ <finalName>testlib-zip</finalName>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -183,14 +189,14 @@
<dependency>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-om</artifactId>
- <version>0.8.8-SNAPSHOT</version>
+ <version>0.8.9-SNAPSHOT</version>
<type>jar</type>
<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>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -210,152 +216,10 @@
<version>[4.0,)</version>
</dependency>
<dependency>
-=======
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>apache-asterixdb</artifactId>
- <groupId>org.apache.asterix</groupId>
- <version>0.8.9-SNAPSHOT</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>
-
- <artifactId>asterix-external-data</artifactId>
-
- <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.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.9.0</version>
- <executions>
- <execution>
- <id>configuration</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
-
<schemaDirectory>src/main/resources/schema</schemaDirectory>
- <schemaIncludes>
-
<include>library.xsd</include>
- </schemaIncludes>
-
<generatePackage>org.apache.asterix.external.library</generatePackage>
-
<generateDirectory>${project.build.directory}/generated-sources/configuration</generateDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <includes>
- <include>**/*.class</include>
- <include>**/*.txt</include>
- <include>**/DISCLAIMER</include>
- <include>**/NOTICE</include>
- <include>**/LICENSE</include>
-
<include>**/DEPENDENCIES</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <executions>
- <execution>
- <configuration>
-
<descriptor>src/main/assembly/binary-assembly-libzip.xml</descriptor>
-
<finalName>testlib-zip</finalName>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-om</artifactId>
- <version>0.8.9-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-runtime</artifactId>
- <version>0.8.9-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-metadata</artifactId>
- <version>0.8.9-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-compiler</artifactId>
- </dependency>
- <dependency>
- <groupId>com.kenai.nbpwr</groupId>
- <artifactId>org-apache-commons-io</artifactId>
- <version>1.3.1-201002241208</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.twitter4j</groupId>
- <artifactId>twitter4j-core</artifactId>
- <version>[3.0,)</version>
- </dependency>
- <dependency>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<groupId>org.twitter4j</groupId>
<artifactId>twitter4j-stream</artifactId>
<version>[4.0,)</version>
</dependency>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
@@ -397,7 +261,7 @@
<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>com.microsoft.windowsazure</groupId>
@@ -432,61 +296,3 @@
</dependency>
</dependencies>
</project>
-=======
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>net.java.dev.rome</groupId>
- <artifactId>rome-fetcher</artifactId>
- <version>1.0.0</version>
- <type>jar</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>rome</artifactId>
- <groupId>net.java.dev.rome</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>rome</groupId>
- <artifactId>rome</artifactId>
- <version>1.0.1-modified-01</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-hdfs-core</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>0.8.9-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.microsoft.windowsazure</groupId>
- <artifactId>microsoft-windowsazure-api</artifactId>
- <version>0.4.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <version>0.13.0</version>
- </dependency>
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo2-api</artifactId>
- <version>2.3-20090302111651</version>
- </dependency>
- </dependencies>
-</project>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
diff --git a/asterix-installer/pom.xml b/asterix-installer/pom.xml
index 59f2f61..7eb4f3e 100644
--- a/asterix-installer/pom.xml
+++ b/asterix-installer/pom.xml
@@ -28,12 +28,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes>
<cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<cluster.extest.excludes>**/ClusterExecutionIT.java</cluster.extest.excludes>
<replication.test.excludes>**/ReplicationIT.java</replication.test.excludes>
-=======
<appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
</properties>
<licenses>
diff --git
a/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java
b/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java
index 04ca4eb..ad0f8cd 100644
---
a/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java
+++
b/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java
@@ -34,14 +34,9 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-=======
-import org.apache.asterix.test.aql.TestsUtils;
import org.apache.asterix.test.runtime.HDFSCluster;
import org.apache.asterix.testframework.context.TestCaseContext;
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
-
@RunWith(Parameterized.class)
public class RecoveryIT {
@@ -83,18 +78,10 @@
+ "resources" + File.separator + "transactionts" +
File.separator + "scripts";
env.put("SCRIPT_HOME", scriptHomePath);
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
TestExecutor.executeScript(pb,
scriptHomePath + File.separator + "setup_teardown" +
File.separator + "configure_and_validate.sh");
TestExecutor.executeScript(pb,
scriptHomePath + File.separator + "setup_teardown" +
File.separator + "stop_and_delete.sh");
-=======
- TestsUtils.executeScript(pb, scriptHomePath + File.separator +
"setup_teardown" + File.separator
- + "configure_and_validate.sh");
- TestsUtils.executeScript(pb, scriptHomePath + File.separator +
"setup_teardown" + File.separator
- + "stop_and_delete.sh");
- HDFSCluster.getInstance().setup(HDFS_BASE);
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
}
@AfterClass
@@ -104,18 +91,10 @@
File dataCopyDir = new File(
managixHomePath + File.separator + ".." + File.separator +
".." + File.separator + "data");
FileUtils.deleteDirectory(dataCopyDir);
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
TestExecutor.executeScript(pb,
scriptHomePath + File.separator + "setup_teardown" +
File.separator + "stop_and_delete.sh");
TestExecutor.executeScript(pb,
scriptHomePath + File.separator + "setup_teardown" +
File.separator + "shutdown.sh");
-=======
- TestsUtils.executeScript(pb, scriptHomePath + File.separator +
"setup_teardown" + File.separator
- + "stop_and_delete.sh");
- TestsUtils.executeScript(pb, scriptHomePath + File.separator +
"setup_teardown" + File.separator
- + "shutdown.sh");
- HDFSCluster.getInstance().cleanup();
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
}
@Parameters
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,17 +37,11 @@
</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>
@@ -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>
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
b/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
index 1fcb036..9fe2e44 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
@@ -29,28 +29,9 @@
<packaging>maven-plugin</packaging>
<name>lexer-generator-maven-plugin</name>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-=======
<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>
-
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<dependencies>
<dependency>
<groupId>junit</groupId>
diff --git
a/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
b/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
index 891cf12..eee8438 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
@@ -29,28 +29,9 @@
<packaging>maven-plugin</packaging>
<name>record-manager-generator-maven-plugin</name>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-=======
<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>
-
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/asterix-metadata/pom.xml b/asterix-metadata/pom.xml
index f9cffb7..d1f294c 100644
--- a/asterix-metadata/pom.xml
+++ b/asterix-metadata/pom.xml
@@ -17,14 +17,16 @@
! 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";>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<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>
@@ -37,25 +39,25 @@
<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>
@@ -84,95 +86,7 @@
<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>
-=======
- <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>
-</project>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
diff --git a/asterix-om/pom.xml b/asterix-om/pom.xml
index bf8bf20..48e4ffd 100644
--- a/asterix-om/pom.xml
+++ b/asterix-om/pom.xml
@@ -34,28 +34,10 @@
</license>
</licenses>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-=======
- <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>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<dependencies>
<dependency>
<groupId>org.apache.asterix</groupId>
diff --git
a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java
b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java
index 082b50d..364b2d6 100644
---
a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java
+++
b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java
@@ -68,22 +68,6 @@
public AOrderedList deserialize(DataInput in) throws HyracksDataException {
try {
ATypeTag typeTag =
EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(in.readByte());
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-=======
- switch (typeTag) {
- case STRING:
- case BINARY:
- case RECORD:
- case ORDEREDLIST:
- case UNORDEREDLIST:
- case ANY:
- fixedSize = false;
- break;
- default:
- fixedSize = true;
- break;
- }
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
IAType currentItemType = itemType;
@SuppressWarnings("rawtypes")
diff --git
a/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java
b/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java
index 8092d6f..620b9ae 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java
@@ -732,37 +732,6 @@
@Override
public String getTypeName() {
return "uuid";
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-=======
- }
-
- @Override
- public JSONObject toJSON() throws JSONException {
- JSONObject type = new JSONObject();
- type.put("type", getDisplayName());
- return type;
- }
- };
-
- // AUUID_STRING is used when converting between the string representation
of
- // UUID and corresponding a UUID instance
- public static final BuiltinType AUUID_STRING = new
LowerCaseConstructorType() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public ATypeTag getTypeTag() {
- return ATypeTag.UUID_STRING;
- }
-
- @Override
- public String getDisplayName() {
- return "UUID_STRING";
- }
-
- @Override
- public String getTypeName() {
- return "uuid_string";
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
}
@Override
diff --git a/asterix-replication/pom.xml b/asterix-replication/pom.xml
index b5595ef..9b1e8b0 100644
--- a/asterix-replication/pom.xml
+++ b/asterix-replication/pom.xml
@@ -3,8 +3,8 @@
<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>
@@ -50,12 +50,12 @@
<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>
@@ -67,4 +67,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/asterix-runtime/pom.xml b/asterix-runtime/pom.xml
index c1c3757..6414139 100644
--- a/asterix-runtime/pom.xml
+++ b/asterix-runtime/pom.xml
@@ -17,14 +17,16 @@
! 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";>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<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>
@@ -37,13 +39,13 @@
<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>
@@ -53,7 +55,7 @@
<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>
@@ -78,177 +80,3 @@
</dependency>
</dependencies>
</project>
-=======
- <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>
-
-</project>
-
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
diff --git a/asterix-tools/pom.xml b/asterix-tools/pom.xml
index 4d51fa8..ac377a8 100644
--- a/asterix-tools/pom.xml
+++ b/asterix-tools/pom.xml
@@ -41,20 +41,7 @@
<build>
<plugins>
<plugin>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
-=======
<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>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
@@ -103,13 +90,8 @@
<dependencies>
<dependency>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<artifactId>asterix-lang-aql</artifactId>
- <version>0.8.8-SNAPSHOT</version>
-=======
- <artifactId>asterix-aql</artifactId>
<version>0.8.9-SNAPSHOT</version>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/asterix-transactions/pom.xml b/asterix-transactions/pom.xml
index cd1a2b5..cc3f41f 100644
--- a/asterix-transactions/pom.xml
+++ b/asterix-transactions/pom.xml
@@ -90,24 +90,27 @@
<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>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<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>
@@ -122,15 +125,5 @@
<version>1.10.19</version>
</dependency>
</dependencies>
-=======
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>0.8.9-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- </dependencies>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
</project>
diff --git a/pom.xml b/pom.xml
index 743c85a..7d75162 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,13 +55,8 @@
<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 -->
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
- <algebricks.version>0.2.17-SNAPSHOT</algebricks.version>
- <hyracks.version>0.2.17-SNAPSHOT</hyracks.version>
-=======
- <algebricks.version>0.2.17-incubating</algebricks.version>
- <hyracks.version>0.2.17-incubating</hyracks.version>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
+ <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>
@@ -188,9 +183,6 @@
</configuration>
</plugin>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
- <!-- END OF GIT COMMIT ID PLUGIN CONFIGURATION -->
-=======
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -213,7 +205,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
</plugins>
<pluginManagement>
<plugins>
@@ -336,7 +327,6 @@
<test.heap.size>3072</test.heap.size>
</properties>
</profile>
-<<<<<<< HEAD (d1dae3 remove unused files in org/apache/asterix/common/api)
<profile>
<id>asterix-release</id>
<build>
@@ -377,8 +367,7 @@
<properties>
<jdk.version>1.8</jdk.version>
</properties>
-=======
-
+ </profile>
<profile>
<id>doclint-java8-disable</id>
<activation>
@@ -396,7 +385,6 @@
</plugin>
</plugins>
</build>
->>>>>>> BRANCH (84a44f Revert "ASTERIXDB-1109: Fixed deletion of records from
open )
</profile>
</profiles>
--
To view, visit https://asterix-gerrit.ics.uci.edu/701
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fcf41c009f9faf51bc8bccc0c3c7217b7769149
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <[email protected]>
