Ian Maxon has submitted this change and it was merged.
Change subject: Merge release 0.9.3 into master
......................................................................
Merge release 0.9.3 into master
Change-Id: I9ff693c4b3c8101557e555c266f68c91714d1742
---
M asterixdb/asterix-dashboard/pom.xml
D asterixdb/asterix-events/pom.xml
D asterixdb/asterix-experiments/pom.xml
D asterixdb/asterix-installer/pom.xml
M asterixdb/asterix-maven-plugins/pom.xml
D asterixdb/asterix-yarn/pom.xml
D hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml
D hyracks-fullstack/algebricks/algebricks-examples/pom.xml
8 files changed, 2 insertions(+), 1,666 deletions(-)
Approvals:
Jenkins: Verified; No violations found; ; Verified
Michael Blow: Looks good to me, approved; No violations found
diff --git a/asterixdb/asterix-dashboard/pom.xml
b/asterixdb/asterix-dashboard/pom.xml
index aafdadb..7e49934 100644
--- a/asterixdb/asterix-dashboard/pom.xml
+++ b/asterixdb/asterix-dashboard/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>asterix-dashboard</artifactId>
diff --git a/asterixdb/asterix-events/pom.xml b/asterixdb/asterix-events/pom.xml
deleted file mode 100644
index 4dee8ed..0000000
--- a/asterixdb/asterix-events/pom.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<<<<<<< HEAD (9c02f5 [ASTERIXDB-2281][RT] Consider reserved txn ids when
determin)
-=======
-<!--
- ! 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.9.4-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-events</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>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <executions>
- <execution>
- <id>event</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-Xsetters</arg>
- <arg>-Xvalue-constructor</arg>
- </args>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>jaxb2-basics</artifactId>
- <version>0.6.2</version>
- </plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>jaxb2-value-constructor</artifactId>
- <version>3.0</version>
- </plugin>
- </plugins>
- <schemaDirectory>src/main/resources/schema</schemaDirectory>
- <schemaIncludes>
- <include>event.xsd</include>
- </schemaIncludes>
-
<generatePackage>org.apache.asterix.event.schema.event</generatePackage>
-
<generateDirectory>${project.build.directory}/generated-sources/event</generateDirectory>
- </configuration>
- </execution>
- <execution>
- <id>configuration</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-Xsetters</arg>
- <arg>-Xvalue-constructor</arg>
- </args>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>jaxb2-basics</artifactId>
- <version>0.6.2</version>
- </plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>jaxb2-value-constructor</artifactId>
- <version>3.0</version>
- </plugin>
- </plugins>
- <schemaDirectory>src/main/resources/schema</schemaDirectory>
- <schemaIncludes>
- <include>installer-conf.xsd</include>
- </schemaIncludes>
-
<generatePackage>org.apache.asterix.installer.schema.conf</generatePackage>
-
<generateDirectory>${project.build.directory}/generated-sources/configuration</generateDirectory>
- </configuration>
- </execution>
- <execution>
- <id>pattern</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-Xsetters</arg>
- <arg>-Xvalue-constructor</arg>
- </args>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>jaxb2-basics</artifactId>
- <version>0.6.2</version>
- </plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>jaxb2-value-constructor</artifactId>
- <version>3.0</version>
- </plugin>
- </plugins>
- <schemaDirectory>src/main/resources/schema</schemaDirectory>
- <schemaIncludes>
- <include>pattern.xsd</include>
- </schemaIncludes>
-
<generatePackage>org.apache.asterix.event.schema.pattern</generatePackage>
-
<generateDirectory>${project.build.directory}/generated-sources/pattern</generateDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- </dependencies>
-</project>
->>>>>>> BRANCH (0948b2 Advance version to AsterixDB 0.9.4-SNAPSHOT and Hyracks
0.3.)
diff --git a/asterixdb/asterix-experiments/pom.xml
b/asterixdb/asterix-experiments/pom.xml
deleted file mode 100644
index 479c84b..0000000
--- a/asterixdb/asterix-experiments/pom.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<<<<<<< HEAD (9c02f5 [ASTERIXDB-2281][RT] Consider reserved txn ids when
determin)
-=======
-<!--
- ! Copyright 2009-2013 by The Regents of the University of California
- ! Licensed 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 from
- !
- ! 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.9.4-SNAPSHOT</version>
- </parent>
- <artifactId>asterix-experiments</artifactId>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <programs>
- <program>
-
<mainClass>org.apache.asterix.experiment.client.LSMExperimentSetRunner</mainClass>
- <name>lsmexprunner</name>
- </program>
- <program>
-
<mainClass>org.apache.asterix.experiment.client.SocketTweetGeneratorDriver</mainClass>
- <name>datagenrunner</name>
- </program>
- <program>
-
<mainClass>org.apache.asterix.experiment.client.SpatialQueryGeneratorDriver</mainClass>
- <name>querygenrunner</name>
- </program>
- <program>
-
<mainClass>org.apache.asterix.experiment.client.RecordCountingServer</mainClass>
- <name>rcserver</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>
- <executions>
- <execution>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <failOnWarning>false</failOnWarning>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <licenses combine.children="append">
- <license
implementation="org.apache.rat.analysis.license.FullTextMatchingLicense">
- <licenseFamilyCategory>BSD</licenseFamilyCategory>
- <licenseFamilyName>Modified BSD License</licenseFamilyName>
- <fullText>
- Copyright (c) 2013, Los Alamos National Security, LLC
- All rights reserved.
-
- Copyright 2013. Los Alamos National Security, LLC. This
software
- was produced under U.S. Government contract DE-AC52-06NA25396
for
- Los Alamos National Laboratory (LANL), which is operated by Los
- Alamos National Security, LLC for the U.S. Department of
Energy.
- The U.S. Government has rights to use, reproduce, and
distribute
- this software. NEITHER THE GOVERNMENT NOR LOS ALAMOS NATIONAL
- SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
ASSUMES
- ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is
modified
- to produce derivative works, such modified software should be
clearly
- marked, so as not to confuse it with the version available
from LANL.
-
-
- Additionally, redistribution and use in source and binary
forms,
- with or without modification, are permitted provided that the
- following conditions are met:
-
- * Redistributions of source code must retain the above
copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
copyright
- notice, this list of conditions and the following disclaimer
in the
- documentation and/or other materials provided with the
distribution.
-
- * Neither the name of Los Alamos National Security, LLC, Los
Alamos
- National Laboratory, LANL, the U.S. Government, nor the names
of
- its contributors may be used to endorse or promote products
derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC
AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL LOS ALAMOS NATIONAL
SECURITY, LLC OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- </fullText>
- </license>
- </licenses>
- <licenseFamilies combine.children="append">
- <licenseFamily
implementation="org.apache.rat.license.ModifiedBSDLicenseFamily"/>
- </licenseFamilies>
- <excludes combine.children="append">
- <exclude>**/*.dgen</exclude>
- <exclude>**/*.dqgen</exclude>
- <exclude>src/main/resources/gantt/vargantt1.txt</exclude>
- <exclude>src/main/resources/gantt/*.eps</exclude> <!-- generated
by gnuplot -->
- <exclude>src/main/resources/gantt/*.gpl</exclude> <!-- generated
by Gantt -->
- <exclude>src/main/resources/gantt/*.plt</exclude> <!-- generated
by Gantt -->
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-control-cc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-app</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-tools</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.hierynomus</groupId>
- <artifactId>sshj</artifactId>
- <version>0.13.0</version>
- </dependency>
- </dependencies>
-
-</project>
->>>>>>> BRANCH (0948b2 Advance version to AsterixDB 0.9.4-SNAPSHOT and Hyracks
0.3.)
diff --git a/asterixdb/asterix-installer/pom.xml
b/asterixdb/asterix-installer/pom.xml
deleted file mode 100644
index 3608de6..0000000
--- a/asterixdb/asterix-installer/pom.xml
+++ /dev/null
@@ -1,553 +0,0 @@
-<<<<<<< HEAD (9c02f5 [ASTERIXDB-2281][RT] Consider reserved txn ids when
determin)
-=======
-<!--
- ! 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.9.4-SNAPSHOT</version>
- </parent>
- <artifactId>asterix-installer</artifactId>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
-
- <failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes>
-
<cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes>
-
<cluster.extest.excludes>**/ClusterExecutionIT.java</cluster.extest.excludes>
- </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>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>license-automation-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <!--<goal>licensedownload</goal>-->
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-
<templateRootDir>${basedir}/../src/main/licenses/templates</templateRootDir>
- <generatedFiles>
- <generatedFile>
- <template>asterix-license.ftl</template>
- <outputFile>LICENSE</outputFile>
- </generatedFile>
- <generatedFile>
- <template>asterix-notice.ftl</template>
- <outputFile>NOTICE</outputFile>
- </generatedFile>
- </generatedFiles>
- <location>repo/</location>
- <timeoutSecs>10</timeoutSecs>
- <extraLicenseMaps>
- <extraLicenseMap>
-
<file>${basedir}/../asterix-server/target/generated-resources/license_map.json</file>
-
<location>asterix/asterix-server-${project.version}-binary-assembly.zip::repo/</location>
- </extraLicenseMap>
- </extraLicenseMaps>
- <models>
-
<model>${basedir}/../src/main/appended-resources/supplemental-models.xml</model>
- </models>
-
<downloadDir>${project.build.directory}/generated-resources/license</downloadDir>
- <excludedScopes>
- <excludedScope>test</excludedScope>
- </excludedScopes>
- <excludes>
- <exclude>org.apache.asterix:*</exclude>
- <exclude>org.apache.algebricks:*</exclude>
- <exclude>org.apache.hyracks:*</exclude>
- </excludes>
-
<licenseDirectory>${basedir}/../src/main/licenses/content</licenseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <!-- NOTE! Any changes here must be mirrored in
src/main/assembly/binary-assembly.xml -->
- <include>log4j:log4j</include>
- <include>org.apache.asterix:asterix-events</include>
- <include>org.apache.asterix:asterix-common</include>
- <include>org.apache.commons:commons-lang3</include>
- <include>org.apache.zookeeper:zookeeper</include>
- <include>args4j:args4j</include>
- <include>log4j:log4j</include>
- <include>commons-io:commons-io</include>
- <include>org.slf4j:slf4j-api</include>
- <include>org.slf4j:slf4j-log4j12</include>
- </includes>
- <location>lib</location>
- </dependencySet>
- <dependencySet>
- <includes>
- <!-- NOTE! Any changes here must be mirrored in
src/main/assembly/binary-assembly.xml -->
- <include>commons-cli:commons-cli</include>
- <include>commons-logging:commons-logging</include>
- </includes>
- <location>.installer/hadoop-0.20.2/lib</location>
- </dependencySet>
- <dependencySet>
- <includes>
- <!-- NOTE! Any changes here must be mirrored in
src/main/assembly/binary-assembly.xml -->
- <include>org.apache.zookeeper:zookeeper</include>
- <include>log4j:log4j</include>
- <include>org.slf4j:slf4j-api</include>
- </includes>
- <location>.installer/zookeeper/lib</location>
- </dependencySet>
- </dependencySets>
- <overrides>
- <override>
- <gav>org.apache.zookeeper:zookeeper:3.4.5</gav>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </override>
- </overrides>
- <templateProperties>
- <packageName>Apache AsterixDB Managix Install</packageName>
- <asterixAppLocation>repo/asterix-app-${project.version}.jar,
within
asterix/asterix-server-${project.version}-binary-assembly.zip</asterixAppLocation>
-
<hyracksControlCcLocation>repo/hyracks-control-cc-${project.version}.jar,
within
asterix/asterix-server-${project.version}-binary-assembly.zip</hyracksControlCcLocation>
-
<hivecompatLocation>repo/asterix-hivecompat-${project.version}.jar, within
asterix/asterix-server-${project.version}-binary-assembly.zip</hivecompatLocation>
- </templateProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <executions>
- <execution>
- <id>configuration</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <args>
- <arg>-Xsetters</arg>
- <arg>-Xvalue-constructor</arg>
- </args>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>jaxb2-basics</artifactId>
- <version>0.6.2</version>
- </plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>jaxb2-value-constructor</artifactId>
- <version>3.0</version>
- </plugin>
- </plugins>
- <schemaDirectory>src/main/resources/schema</schemaDirectory>
- <schemaIncludes>
- <include>installer-conf.xsd</include>
- </schemaIncludes>
-
<generatePackage>org.apache.asterix.installer.schema.conf</generatePackage>
-
<generateDirectory>${project.build.directory}/generated-sources/configuration</generateDirectory>
- </configuration>
- </execution>
- <execution>
- <id>cluster</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <schemaDirectory>src/main/resources/schema</schemaDirectory>
- <schemaIncludes>
- <include>cluster.xsd</include>
- </schemaIncludes>
-
<generatePackage>org.apache.asterix.installer.schema.cluster</generatePackage>
- <bindingDirectory>src/main/resources/schema</bindingDirectory>
- <bindingIncludes>
- <bindingInclude>jaxb-bindings.xjb</bindingInclude>
- </bindingIncludes>
-
<generateDirectory>${project.build.directory}/generated-sources/cluster</generateDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-test-data</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>target/data</outputDirectory>
- <overwrite>true</overwrite>
- <resources>
- <resource>
- <directory>../asterix-app/data/external-parser</directory>
- <includes>
- <include>jobads.new</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-external-testlib</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeClassifiers>testlib</includeClassifiers>
- <outputDirectory>target/resources/externallib</outputDirectory>
- <stripVersion>true</stripVersion>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <usedDependencies combine.children="append">
- <usedDependency>org.apache.asterix:asterix-server</usedDependency>
- <usedDependency>org.apache.hadoop:hadoop-common</usedDependency>
- <usedDependency>org.apache.hadoop:hadoop-hdfs</usedDependency>
-
<usedDependency>org.apache.hadoop:hadoop-minicluster</usedDependency>
- <usedDependency>org.apache.zookeeper:zookeeper</usedDependency>
- </usedDependencies>
- <ignoredUnusedDeclaredDependencies>
-
<ignoredUnusedDeclaredDependency>org.apache.asterix:asterix-external-data:zip:*</ignoredUnusedDeclaredDependency>
-
<ignoredUnusedDeclaredDependency>org.apache.asterix:asterix-external-data:test-jar:*</ignoredUnusedDeclaredDependency>
- </ignoredUnusedDeclaredDependencies>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <licenses combine.children="append">
- <license
implementation="org.apache.rat.analysis.license.MITLicense"/>
- <license
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
- <licenseFamilyCategory>MIT</licenseFamilyCategory>
- <licenseFamilyName>JQuery</licenseFamilyName>
- <patterns>(c) jQuery Foundation | jquery.org/license</patterns>
- </license>
- <license
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
- <licenseFamilyCategory>MIT</licenseFamilyCategory>
- <licenseFamilyName>Bootstrap</licenseFamilyName>
- <patterns>Licensed under MIT
(https://github.com/twbs/bootstrap/blob/master/LICENSE)</patterns>
- </license>
- <license
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
- <licenseFamilyCategory>MIT</licenseFamilyCategory>
- <licenseFamilyName>AngularJS</licenseFamilyName>
- <patterns>http://angularjs.org | (c) 2010-2016 Google, Inc. |
License: MIT</patterns>
- </license>
- </licenses>
- <licenseFamilies combine.children="append">
- <licenseFamily
implementation="org.apache.rat.license.MITLicenseFamily"/>
- <licenseFamily
implementation="org.apache.rat.license.SimpleLicenseFamily">
- <familyName>JQuery</familyName>
- </licenseFamily>
- <licenseFamily
implementation="org.apache.rat.license.SimpleLicenseFamily">
- <familyName>Bootstrap</familyName>
- </licenseFamily>
- <licenseFamily
implementation="org.apache.rat.license.SimpleLicenseFamily">
- <familyName>AngularJS</familyName>
- </licenseFamily>
- </licenseFamilies>
- <excludes combine.children="append">
- <exclude>src/test/resources/clusterts/id_rsa</exclude>
- <exclude>src/test/resources/clusterts/id_rsa.pub</exclude>
- <exclude>src/test/resources/clusterts/known_hosts</exclude>
- <exclude>src/test/resources/docker/id_rsa</exclude>
- <exclude>src/test/resources/docker/id_rsa.pub</exclude>
-
<exclude>src/test/resources/transactionts/results/query_after_restart/big_object_20M/big_object_20M.1.adm.template</exclude>
-
<exclude>src/test/resources/integrationts/restart/tweets.json</exclude> <!--
https://issues.apache.org/jira/browse/ASTERIXDB-1850 -->
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>${failsafe.test.excludes}</exclude>
- <exclude>${cluster.test.excludes}</exclude>
- <exclude>${cluster.extest.excludes}</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>license-automation-plugin</artifactId>
- <versionRange>[0.0,)</versionRange>
- <goals>
- <goal>generate</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>cluster-tests</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>clusterTest</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>net.ju-n.maven.plugins</groupId>
- <artifactId>vagrant-maven-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <executions>
-
- <!-- Before tests: import box, start VM -->
- <execution>
- <id>setup-and-start-vagrant-vm</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>up</goal>
- </goals>
- <configuration>
- <box>chef/centos-6.5</box>
- <url>https://vagrantcloud.com/chef/centos-6.5</url>
-
<vagrantHome>${project.basedir}/src/test/resources/clusterts</vagrantHome>
- </configuration>
- </execution>
-
- <!-- After tests: shut down, destroy VM -->
- <execution>
- <id>destroy-vagrant-vm</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>destroy</goal>
- </goals>
- <configuration>
- <box>chef/centos-6.5</box>
- <url>https://vagrantcloud.com/chef/centos-6.5</url>
-
<vagrantHome>${project.basedir}/src/test/resources/clusterts</vagrantHome>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <runOrder>alphabetical</runOrder>
- <forkMode>pertest</forkMode>
- <excludes>
- <exclude>${failsafe.test.excludes}</exclude>
- <exclude>${cluster.test.excludes}</exclude>
- <exclude>${cluster.extest.excludes}</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-events</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-app</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-server</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>binary-assembly</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-external-data</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.20</version>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-external-data</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-api</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-util</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-server</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-external-data</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>testlib</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
->>>>>>> BRANCH (0948b2 Advance version to AsterixDB 0.9.4-SNAPSHOT and Hyracks
0.3.)
diff --git a/asterixdb/asterix-maven-plugins/pom.xml
b/asterixdb/asterix-maven-plugins/pom.xml
index 647e657..03bce12 100644
--- a/asterixdb/asterix-maven-plugins/pom.xml
+++ b/asterixdb/asterix-maven-plugins/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<licenses>
@@ -40,24 +40,6 @@
<properties>
<root.dir>${basedir}/..</root.dir>
</properties>
-<<<<<<< HEAD (9c02f5 [ASTERIXDB-2281][RT] Consider reserved txn ids when
determin)
-=======
-
- <parent>
- <artifactId>apache-asterixdb</artifactId>
- <groupId>org.apache.asterix</groupId>
- <version>0.9.4-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- </dependencies>
->>>>>>> BRANCH (0948b2 Advance version to AsterixDB 0.9.4-SNAPSHOT and Hyracks
0.3.)
<modules>
<module>lexer-generator-maven-plugin</module>
diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml
deleted file mode 100644
index 56ceefc..0000000
--- a/asterixdb/asterix-yarn/pom.xml
+++ /dev/null
@@ -1,473 +0,0 @@
-<<<<<<< HEAD (9c02f5 [ASTERIXDB-2281][RT] Consider reserved txn ids when
determin)
-=======
-<!--
- ! 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.9.4-SNAPSHOT</version>
- </parent>
- <artifactId>asterix-yarn</artifactId>
-
- <properties>
-
<appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>aoya</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <classifier>aoya</classifier>
- <archive>
- <manifest>
- <MainClass>org.apache.asterix.aoya.Client</MainClass>
- </manifest>
- </archive>
- <includes>
- <include>**/org/apache/asterix/aoya/*</include>
- <include>**/README*</include>
- <include>**/LICENSE*</include>
- <include>**/NOTICE*</include>
- <include>**/DEPENDENCIES*</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>license-automation-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-
<templateRootDir>${basedir}/../src/main/licenses/templates</templateRootDir>
- <generatedFiles>
- <generatedFile>
- <template>asterix-license.ftl</template>
- <outputFile>LICENSE</outputFile>
- </generatedFile>
- <generatedFile>
- <template>asterix-notice.ftl</template>
- <outputFile>NOTICE</outputFile>
- </generatedFile>
- </generatedFiles>
- <location>repo/</location>
- <timeoutSecs>10</timeoutSecs>
- <extraLicenseMaps>
- <extraLicenseMap>
-
<file>${basedir}/../asterix-server/target/generated-resources/license_map.json</file>
-
<location>asterix/asterix-server-${project.version}-binary-assembly.zip::repo/</location>
- </extraLicenseMap>
- </extraLicenseMaps>
-
<downloadDir>${project.build.directory}/generated-resources/license</downloadDir>
- <excludedScopes>
- <excludedScope>test</excludedScope>
- </excludedScopes>
- <excludes>
- <exclude>org.apache.asterix:*</exclude>
- <exclude>org.apache.algebricks:*</exclude>
- <exclude>org.apache.hyracks:*</exclude>
- </excludes>
-
<licenseDirectory>${basedir}/../src/main/licenses/content</licenseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <!-- NOTE! Any changes here must be mirrored in
src/main/assembly/binary-assembly.xml -->
- <include>org.apache.asterix:asterix-yarn</include>
- <include>org.apache.asterix:asterix-common</include>
- <include>log4j:log4j</include>
- <include>org.slf4j:slf4j-api</include>
- <include>org.slf4j:slf4j-simple</include>
- <include>commons-io:commons-io</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-configuration:commons-configuration</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-logging:commons-logging</include>
- <include>commons-codec:commons-codec</include>
- <include>commons-lang:commons-lang</include>
- <include>org.apache.hadoop:hadoop-common</include>
- <include>org.apache.hadoop:hadoop-hdfs</include>
- <include>org.apache.hadoop:hadoop-auth</include>
- <include>org.apache.hadoop:hadoop-yarn-common</include>
- <include>org.apache.hadoop:hadoop-yarn-api</include>
- <include>org.apache.httpcomponents:httpcore</include>
- <include>org.apache.httpcomponents:httpclient</include>
- <include>commons-httpclient:commons-httpclient</include>
- <include>com.google.protobuf:protobuf-java</include>
- <include>com.google.guava:guava</include>
- </includes>
- <location>lib</location>
- </dependencySet>
- </dependencySets>
- <models>
-
<model>${basedir}/../src/main/appended-resources/supplemental-models.xml</model>
- </models>
- <overrides>
- <override>
- <gav>commons-configuration:commons-configuration:1.6</gav>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </override>
- <override>
- <gav>com.google.protobuf:protobuf-java:2.5.0</gav>
-
<url>https://github.com/google/protobuf/blob/v2.5.0/COPYING.txt</url>
- </override>
- </overrides>
- <licenses>
- <license>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <aliasUrls>http://www.apache.org/licenses/LICENSE-2.0</aliasUrls>
- </license>
- </licenses>
- <templateProperties>
- <packageName>Apache AsterixDB YARN Install</packageName>
- <asterixAppLocation>repo/asterix-app-${project.version}.jar,
within
asterix/asterix-server-${project.version}-binary-assembly.zip</asterixAppLocation>
-
<hyracksControlCcLocation>repo/hyracks-control-cc-${project.version}.jar,
within
asterix/asterix-server-${project.version}-binary-assembly.zip</hyracksControlCcLocation>
-
<hivecompatLocation>repo/asterix-hivecompat-${project.version}.jar, within
asterix/asterix-server-${project.version}-binary-assembly.zip</hivecompatLocation>
- </templateProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-external-testlib</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeClassifiers>testlib</includeClassifiers>
- <outputDirectory>target/resources/externallib</outputDirectory>
- <stripVersion>true</stripVersion>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <ignoredDependencies>
- <ignoredDependency>org.apache.hive:hive-exec:*</ignoredDependency>
- </ignoredDependencies>
- <usedDependencies>
- <usedDependency>commons-codec:commons-codec</usedDependency>
-
<usedDependency>commons-collections:commons-collections</usedDependency>
-
<usedDependency>commons-configuration:commons-configuration</usedDependency>
- <usedDependency>commons-lang:commons-lang</usedDependency>
-
<usedDependency>commons-logging:commons-logging-api</usedDependency>
- <usedDependency>commons-net:commons-net</usedDependency>
- <usedDependency>org.apache.asterix:asterix-events</usedDependency>
- <usedDependency>org.apache.asterix:asterix-runtime</usedDependency>
- <usedDependency>org.apache.asterix:asterix-server</usedDependency>
- <usedDependency>org.apache.commons:commons-math</usedDependency>
-
<usedDependency>org.apache.hadoop:hadoop-minicluster</usedDependency>
-
<usedDependency>org.apache.httpcomponents:httpclient</usedDependency>
- <usedDependency>org.apache.httpcomponents:httpcore</usedDependency>
- <usedDependency>org.slf4j:slf4j-simple</usedDependency>
- </usedDependencies>
- <ignoredUnusedDeclaredDependencies>
-
<ignoredUnusedDeclaredDependency>org.apache.asterix:asterix-external-data:zip:*</ignoredUnusedDeclaredDependency>
- </ignoredUnusedDeclaredDependencies>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>license-automation-plugin</artifactId>
- <versionRange>[0.0,)</versionRange>
- <goals>
- <goal>generate</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <repositories>
- <repository>
- <id>central</id>
- <url>http://repo1.maven.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <id>HDPReleases</id>
- <name>HDP Releases</name>
- <url>http://repo.hortonworks.com/content/repositories/releases</url>
- <layout>default</layout>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-events</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-app</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-client</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-server</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>binary-assembly</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-runtime</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-app</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-api</artifactId>
- <version>${hadoop.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-server-tests</artifactId>
- <version>${hadoop.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
- <version>${hadoop.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-external-data</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>testlib</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-control-cc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-control-nc</artifactId>
- </dependency>
- </dependencies>
-</project>
->>>>>>> BRANCH (0948b2 Advance version to AsterixDB 0.9.4-SNAPSHOT and Hyracks
0.3.)
diff --git
a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml
b/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml
deleted file mode 100644
index 4901b75..0000000
--- a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<<<<<<< HEAD (9c02f5 [ASTERIXDB-2281][RT] Consider reserved txn ids when
determin)
-=======
-<!--
- ! 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/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>piglet-example</artifactId>
- <name>piglet-example</name>
- <parent>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-examples</artifactId>
- <version>0.3.4-SNAPSHOT</version>
- </parent>
-
- <properties>
- <root.dir>${basedir}/../../..</root.dir>
- </properties>
-
- <build>
- <plugins>
- <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>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <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>javacc</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <dependencies>
- <dependency>
- <!-- Dependency management inherited from top-level hyracks -->
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-compiler</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-util</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-dataflow-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-rewriter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-runtime</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-data</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-dataflow-std</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-data-std</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- </dependencies>
-</project>
->>>>>>> BRANCH (0948b2 Advance version to AsterixDB 0.9.4-SNAPSHOT and Hyracks
0.3.)
diff --git a/hyracks-fullstack/algebricks/algebricks-examples/pom.xml
b/hyracks-fullstack/algebricks/algebricks-examples/pom.xml
deleted file mode 100644
index 910aa8d..0000000
--- a/hyracks-fullstack/algebricks/algebricks-examples/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<<<<<<< HEAD (9c02f5 [ASTERIXDB-2281][RT] Consider reserved txn ids when
determin)
-=======
-<!--
- ! 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/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>algebricks-examples</artifactId>
- <packaging>pom</packaging>
- <name>algebricks-examples</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <parent>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks</artifactId>
- <version>0.3.4-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>
- <root.dir>${basedir}/../..</root.dir>
- </properties>
-
- <modules>
- <module>piglet-example</module>
- </modules>
-</project>
->>>>>>> BRANCH (0948b2 Advance version to AsterixDB 0.9.4-SNAPSHOT and Hyracks
0.3.)
--
To view, visit https://asterix-gerrit.ics.uci.edu/2279
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ff693c4b3c8101557e555c266f68c91714d1742
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <ima...@apache.org>
Gerrit-Reviewer: Ian Maxon <ima...@apache.org>
Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
