Merge tag 'tags/1.4.4' into 1.4.5-SNAPSHOT
Ensure that 1.4.5 and later includes 1.4.4 history
diff --git a/ingest/bin/ingest.sh b/ingest/bin/ingest.sh
index aff15d3..acdcbf8 100755
--- a/ingest/bin/ingest.sh
+++ b/ingest/bin/ingest.sh
@@ -38,7 +38,7 @@
#
# Map/Reduce job
#
-JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.4.jar
+JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.5-SNAPSHOT.jar
CONF=$SCRIPT_DIR/../conf/wikipedia.xml
HDFS_DATA_DIR=$1
export HADOOP_CLASSPATH=$CLASSPATH
diff --git a/ingest/bin/ingest_parallel.sh b/ingest/bin/ingest_parallel.sh
index 2f77520..8c63ac0 100755
--- a/ingest/bin/ingest_parallel.sh
+++ b/ingest/bin/ingest_parallel.sh
@@ -38,7 +38,7 @@
#
# Map/Reduce job
#
-JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.4.jar
+JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.5-SNAPSHOT.jar
CONF=$SCRIPT_DIR/../conf/wikipedia.xml
HDFS_DATA_DIR=$1
export HADOOP_CLASSPATH=$CLASSPATH
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..1ea9a2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo-examples</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.4</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>accumulo-wikisearch</artifactId>
@@ -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>
