From c726b598ab02dd299fc2bc80af10d3f8b400cb38 Mon Sep 17 00:00:00 2001
From: Tim Reardon <tequalsme@gmail.com>
Date: Wed, 9 Oct 2013 20:39:17 -0400
Subject: [PATCH] Minor mods to allow forked wikisearch subtree to build

---
 .gitignore        | 17 +++++++++++++++++
 ingest/pom.xml    |  2 +-
 pom.xml           |  8 ++++----
 query-war/pom.xml |  2 +-
 query/pom.xml     |  2 +-
 5 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..399cb59
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+# 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.
+
+lib/
+target/
diff --git a/ingest/pom.xml b/ingest/pom.xml
index e84278d..29b2047 100644
--- a/ingest/pom.xml
+++ b/ingest/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>accumulo-wikisearch</artifactId>
     <groupId>org.apache.accumulo</groupId>
-    <version>1.4.4</version>
+    <version>1.4.5-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 87e9d71..e660d1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,9 @@
         <artifactId>accumulo-examples</artifactId>
         <groupId>org.apache.accumulo</groupId>
         <version>1.4.4</version>
-        <relativePath>../</relativePath>
   </parent>
   <artifactId>accumulo-wikisearch</artifactId>
+  <version>1.4.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>accumulo-wikisearch</name>
 
@@ -152,7 +152,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.commons-lang>2.4</version.commons-lang>
-    <version.accumulo>${project.version}</version.accumulo>
+    <version.accumulo>1.4.4</version.accumulo>
     <version.commons-jexl>2.0.1</version.commons-jexl>
     <version.commons-codec>1.5</version.commons-codec>
     <version.ejb-spec-api>1.0.1.Final</version.ejb-spec-api>
@@ -185,7 +185,7 @@
       <dependency>
         <groupId>org.apache.accumulo</groupId>
         <artifactId>accumulo-core</artifactId>
-        <version>${project.version}</version>
+        <version>${version.accumulo}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -200,7 +200,7 @@
       <dependency>
         <groupId>org.apache.accumulo</groupId>
         <artifactId>cloudtrace</artifactId>
-        <version>${project.version}</version>
+        <version>${version.accumulo}</version>
       </dependency>
       <dependency>
         <groupId>com.google.collections</groupId>
diff --git a/query-war/pom.xml b/query-war/pom.xml
index a425f7c..485d584 100644
--- a/query-war/pom.xml
+++ b/query-war/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>accumulo-wikisearch</artifactId>
     <groupId>org.apache.accumulo</groupId>
-    <version>1.4.4</version>
+    <version>1.4.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>wikisearch-query-war</artifactId>
diff --git a/query/pom.xml b/query/pom.xml
index b5ce0b0..05b1e46 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>accumulo-wikisearch</artifactId>
     <groupId>org.apache.accumulo</groupId>
-    <version>1.4.4</version>
+    <version>1.4.5-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>