From 3cb43deb0ec39683ae77bb9283bb19f504a706fd Mon Sep 17 00:00:00 2001
From: Yonik Seeley <yonik@apache.org>
Date: Mon, 15 Mar 2010 21:00:55 +0000
Subject: [PATCH] sync release numbers

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/branches/solr@923439 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt      | 2 +-
 common-build.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f424fc10565..32d537d8fcd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,7 +21,7 @@ See the tutorial at http://lucene.apache.org/solr/tutorial.html
 
 $Id$
 
-==================  1.5.0-dev ==================
+==================  3.1.0-dev ==================
 Upgrading from Solr 1.4
 ----------------------
 * The experimental ALIAS command is removed in Solr 1.5 (SOLR-1637)
diff --git a/common-build.xml b/common-build.xml
index be17f20d6b7..c57102c8e84 100644
--- a/common-build.xml
+++ b/common-build.xml
@@ -52,7 +52,7 @@
   <property name="svnversion.exe" value="svnversion" />
 
   <!-- Java Version we are compatible with -->
-  <property name="java.compat.version" value="1.5" />
+  <property name="java.compat.version" value="1.6" />
 
   <!-- Solr Implementation Version -->
   <!--
@@ -62,7 +62,7 @@
        By default, this should be set to "X.Y.N-dev" where X.Y.N is
        "1 greater" then the last version released (on this branch).
     -->
-  <property name="version" value="1.5-dev" />
+  <property name="version" value="3.1-dev" />
   
   <!-- Solr Specification Version -->
   <!--
@@ -72,7 +72,7 @@
        By default, this should be set to "X.Y.M.${dateversion}"
        where X.Y.M is the last version released (on this branch).
     -->
-  <property name="specversion" value="1.4.0.${dateversion}" />
+  <property name="specversion" value="3.0.0.${dateversion}" />
 
   
     <!-- Type of checksum to compute for distribution files -->
@@ -116,7 +116,7 @@
   -->
   <property name="lucene_version" value="3.1-dev"/>
   <!-- The version number to assign to the Maven artifacts. -->
-  <property name="maven_version" value="1.5-SNAPSHOT"/>
+  <property name="maven_version" value="3.1-SNAPSHOT"/>
 
   <!-- By default, "deploy" to a temporary directory (as well as installing
        into your local repository).  If you wish to deploy to a remote