Ian Maxon has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/459
Change subject: Merge branch 'release-0.8.7' ...................................................................... Merge branch 'release-0.8.7' Change-Id: Iadb5074d0e0d7fb2a2d4103aa405e9fc91f443c5 --- M asterix-fuzzyjoin/pom.xml M asterix-transactions/pom.xml 2 files changed, 1 insertion(+), 26 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/59/459/1 diff --git a/asterix-fuzzyjoin/pom.xml b/asterix-fuzzyjoin/pom.xml index 54f9503..a96c926 100644 --- a/asterix-fuzzyjoin/pom.xml +++ b/asterix-fuzzyjoin/pom.xml @@ -1,18 +1,4 @@ <!-- -<<<<<<< HEAD (4bb94a Fixed m2e lifecycle mapping pom issues) - ! 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. -======= ! 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 @@ -29,7 +15,6 @@ ! KIND, either express or implied. See the License for the ! specific language governing permissions and limitations ! under the License. ->>>>>>> BRANCH (4e6a92 [maven-release-plugin] prepare for next development iteratio) !--> <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> diff --git a/asterix-transactions/pom.xml b/asterix-transactions/pom.xml index 0918d54..b8673bb 100644 --- a/asterix-transactions/pom.xml +++ b/asterix-transactions/pom.xml @@ -99,11 +99,10 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> </dependency> -<<<<<<< HEAD (4bb94a Fixed m2e lifecycle mapping pom issues) <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> - <version>0.8.7-SNAPSHOT</version> + <version>0.8.8-SNAPSHOT</version> <type>jar</type> <scope>compile</scope> </dependency> @@ -112,15 +111,6 @@ <artifactId>guava</artifactId> <version>18.0</version> </dependency> -======= - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-common</artifactId> - <version>0.8.8-SNAPSHOT</version> - <type>jar</type> - <scope>compile</scope> - </dependency> ->>>>>>> BRANCH (4e6a92 [maven-release-plugin] prepare for next development iteratio) </dependencies> </project> -- To view, visit https://asterix-gerrit.ics.uci.edu/459 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iadb5074d0e0d7fb2a2d4103aa405e9fc91f443c5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon <[email protected]>
