You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/07/16 03:38:11 UTC
svn commit: r1361857 - in /lucene/dev/trunk/lucene/core/src:
java/org/apache/lucene/util/Constants.java
test/org/apache/lucene/index/TestCheckIndex.java
Author: rmuir
Date: Mon Jul 16 01:38:10 2012
New Revision: 1361857
URL: http://svn.apache.org/viewvc?rev=1361857&view=rev
Log:
LUCENE-4180: Bump Constants.LUCENE_MAIN_VERSION before beta release
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Constants.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Constants.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Constants.java?rev=1361857&r1=1361856&r2=1361857&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Constants.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Constants.java Mon Jul 16 01:38:10 2012
@@ -117,9 +117,14 @@ public final class Constants {
Package pkg = LucenePackage.get();
String v = (pkg == null) ? null : pkg.getImplementationVersion();
if (v == null) {
- v = LUCENE_MAIN_VERSION + "-SNAPSHOT";
- } else if (!v.startsWith(LUCENE_MAIN_VERSION)) {
- v = LUCENE_MAIN_VERSION + "-SNAPSHOT " + v;
+ String parts[] = LUCENE_MAIN_VERSION.split("\\.");
+ if (parts.length == 4) {
+ // alpha/beta
+ assert parts[2].equals("0");
+ v = parts[0] + "." + parts[1] + "-SNAPSHOT";
+ } else {
+ v = LUCENE_MAIN_VERSION + "-SNAPSHOT";
+ }
}
LUCENE_VERSION = ident(v);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java?rev=1361857&r1=1361856&r2=1361857&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java Mon Jul 16 01:38:10 2012
@@ -119,9 +119,19 @@ public class TestCheckIndex extends Luce
// common-build.xml sets lucene.version
final String version = System.getProperty("lucene.version");
assertNotNull( "null version", version);
+ final String constantVersion;
+ String parts[] = Constants.LUCENE_MAIN_VERSION.split("\\.");
+ if (parts.length == 4) {
+ // alpha/beta version: pull the real portion
+ assert parts[2].equals("0");
+ constantVersion = parts[0] + "." + parts[1];
+ } else {
+ // normal version
+ constantVersion = Constants.LUCENE_MAIN_VERSION;
+ }
assertTrue("Invalid version: "+version,
- version.equals(Constants.LUCENE_MAIN_VERSION+"-SNAPSHOT") ||
- version.equals(Constants.LUCENE_MAIN_VERSION));
+ version.equals(constantVersion+"-SNAPSHOT") ||
+ version.equals(constantVersion));
assertTrue(Constants.LUCENE_VERSION + " should start with: "+version,
Constants.LUCENE_VERSION.startsWith(version));
}