You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2012/03/21 20:44:59 UTC

svn commit: r1303529 - in /incubator/accumulo/trunk: ./ assemble/ bin/ core/ core/src/main/java/org/apache/accumulo/core/ core/src/main/resources/org/apache/accumulo/core/conf/ docs/ examples/ examples/simple/ examples/wikisearch/ examples/wikisearch/i...

Author: ecn
Date: Wed Mar 21 19:44:58 2012
New Revision: 1303529

URL: http://svn.apache.org/viewvc?rev=1303529&view=rev
Log:
ACCUMULO-481: remove "incubating"

Modified:
    incubator/accumulo/trunk/README
    incubator/accumulo/trunk/assemble/pom.xml
    incubator/accumulo/trunk/bin/config.sh
    incubator/accumulo/trunk/core/pom.xml
    incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java
    incubator/accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html
    incubator/accumulo/trunk/docs/combiners.html
    incubator/accumulo/trunk/examples/pom.xml
    incubator/accumulo/trunk/examples/simple/pom.xml
    incubator/accumulo/trunk/examples/wikisearch/ingest/pom.xml
    incubator/accumulo/trunk/examples/wikisearch/pom.xml
    incubator/accumulo/trunk/examples/wikisearch/query-war/pom.xml
    incubator/accumulo/trunk/examples/wikisearch/query/pom.xml
    incubator/accumulo/trunk/pom.xml
    incubator/accumulo/trunk/server/pom.xml
    incubator/accumulo/trunk/server/src/main/c++/mlock/Makefile
    incubator/accumulo/trunk/server/src/main/c++/nativeMap/Makefile
    incubator/accumulo/trunk/start/pom.xml
    incubator/accumulo/trunk/trace/pom.xml

Modified: incubator/accumulo/trunk/README
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/README?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/README (original)
+++ incubator/accumulo/trunk/README Wed Mar 21 19:44:58 2012
@@ -36,7 +36,7 @@ easier to install.
 
 Copy the accumulo tar file produced by mvn package from the src/assemble/target/
 directory to the desired destination, then untar it (e.g. 
-tar xvzf accumulo-1.5.0-incubating-SNAPSHOT-dist.tar.gz).
+tar xvzf accumulo-1.5.0-SNAPSHOT-dist.tar.gz).
 
 If you are using the RPM, install the RPM on every machine that will run
 accumulo.
@@ -63,7 +63,7 @@ found in the same location on every mach
 have password-less ssh set up as described in the hadoop documentation. 
 
 You will need to have hadoop installed and configured on your system.
-Accumulo 1.5.0-incubating-SNAPSHOT has been tested with hadoop version 0.20.2.
+Accumulo 1.5.0-SNAPSHOT has been tested with hadoop version 0.20.2.
 
 The example accumulo configuration files are placed in directories based on the 
 memory footprint for the accumulo processes.  If you are using native libraries
@@ -158,7 +158,7 @@ scanned.
 
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.5.0-incubating-SNAPSHOT
+    - version: 1.5.0-SNAPSHOT
     - instance name: accumulo
     - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
     - 
@@ -179,7 +179,7 @@ certain column.
 
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.5.0-incubating-SNAPSHOT
+    - version: 1.5.0-SNAPSHOT
     - instance name: accumulo
     - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
     - 

Modified: incubator/accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/assemble/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/assemble/pom.xml (original)
+++ incubator/accumulo/trunk/assemble/pom.xml Wed Mar 21 19:44:58 2012
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.accumulo</groupId>
 		<artifactId>accumulo</artifactId>
-		<version>1.5.0-incubating-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/accumulo/trunk/bin/config.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/bin/config.sh?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/bin/config.sh (original)
+++ incubator/accumulo/trunk/bin/config.sh Wed Mar 21 19:44:58 2012
@@ -46,7 +46,7 @@ mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null
 export ACCUMULO_LOG_DIR
 
 if [ -z ${ACCUMULO_VERSION} ]; then
-        ACCUMULO_VERSION=1.5.0-incubating-SNAPSHOT
+        ACCUMULO_VERSION=1.5.0-SNAPSHOT
 fi
 
 if [ -z "$HADOOP_HOME" ]

Modified: incubator/accumulo/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/core/pom.xml (original)
+++ incubator/accumulo/trunk/core/pom.xml Wed Mar 21 19:44:58 2012
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
-    <version>1.5.0-incubating-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java Wed Mar 21 19:44:58 2012
@@ -28,7 +28,7 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 
 public class Constants {
-  public static final String VERSION = "1.5.0-incubating-SNAPSHOT";
+  public static final String VERSION = "1.5.0-SNAPSHOT";
   public static final int DATA_VERSION = 4;
   public static final int PREV_DATA_VERSION = 3;
   

Modified: incubator/accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html (original)
+++ incubator/accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html Wed Mar 21 19:44:58 2012
@@ -55,7 +55,7 @@
 
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.5.0-incubating-SNAPSHOT
+    - version: 1.5.0-SNAPSHOT
     - instance name: ac14
     - instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
     - 

Modified: incubator/accumulo/trunk/docs/combiners.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/combiners.html?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/combiners.html (original)
+++ incubator/accumulo/trunk/docs/combiners.html Wed Mar 21 19:44:58 2012
@@ -30,7 +30,7 @@
 <p><pre>
 
 Shell - Apache Accumulo Interactive Shell
-- version: 1.5.0-incubating-SNAPSHOT
+- version: 1.5.0-SNAPSHOT
 - instance id: 863fc0d1-3623-4b6c-8c23-7d4fdb1c8a49
 - 
 - type 'help' for a list of available commands

Modified: incubator/accumulo/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/examples/pom.xml (original)
+++ incubator/accumulo/trunk/examples/pom.xml Wed Mar 21 19:44:58 2012
@@ -20,7 +20,7 @@
   <parent>
         <artifactId>accumulo</artifactId>
         <groupId>org.apache.accumulo</groupId>
-        <version>1.5.0-incubating-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>accumulo-examples</artifactId>
   <packaging>pom</packaging>

Modified: incubator/accumulo/trunk/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/simple/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/examples/simple/pom.xml (original)
+++ incubator/accumulo/trunk/examples/simple/pom.xml Wed Mar 21 19:44:58 2012
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo-examples</artifactId>
-    <version>1.5.0-incubating-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/accumulo/trunk/examples/wikisearch/ingest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/wikisearch/ingest/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/examples/wikisearch/ingest/pom.xml (original)
+++ incubator/accumulo/trunk/examples/wikisearch/ingest/pom.xml Wed Mar 21 19:44:58 2012
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>accumulo-wikisearch</artifactId>
     <groupId>org.apache.accumulo</groupId>
-    <version>1.5.0-incubating-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>wikisearch-ingest</artifactId>

Modified: incubator/accumulo/trunk/examples/wikisearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/wikisearch/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/examples/wikisearch/pom.xml (original)
+++ incubator/accumulo/trunk/examples/wikisearch/pom.xml Wed Mar 21 19:44:58 2012
@@ -20,7 +20,7 @@
   <parent>
         <artifactId>accumulo-examples</artifactId>
         <groupId>org.apache.accumulo</groupId>
-        <version>1.5.0-incubating-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>accumulo-wikisearch</artifactId>
   <packaging>pom</packaging>

Modified: incubator/accumulo/trunk/examples/wikisearch/query-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/wikisearch/query-war/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/examples/wikisearch/query-war/pom.xml (original)
+++ incubator/accumulo/trunk/examples/wikisearch/query-war/pom.xml Wed Mar 21 19:44:58 2012
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>accumulo-wikisearch</artifactId>
     <groupId>org.apache.accumulo</groupId>
-    <version>1.5.0-incubating-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>wikisearch-query-war</artifactId>

Modified: incubator/accumulo/trunk/examples/wikisearch/query/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/wikisearch/query/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/examples/wikisearch/query/pom.xml (original)
+++ incubator/accumulo/trunk/examples/wikisearch/query/pom.xml Wed Mar 21 19:44:58 2012
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>accumulo-wikisearch</artifactId>
     <groupId>org.apache.accumulo</groupId>
-    <version>1.5.0-incubating-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>wikisearch-query</artifactId>

Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Wed Mar 21 19:44:58 2012
@@ -26,7 +26,7 @@
   <groupId>org.apache.accumulo</groupId>
   <artifactId>accumulo</artifactId>
   <packaging>pom</packaging>
-  <version>1.5.0-incubating-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <name>accumulo</name>
   <prerequisites>
     <maven>2.2.0</maven>
@@ -489,33 +489,33 @@
       <dependency>
         <groupId>org.apache.accumulo</groupId>
         <artifactId>cloudtrace</artifactId>
-        <version>1.5.0-incubating-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
         <artifactId>accumulo-start</artifactId>
-        <version>1.5.0-incubating-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
         <artifactId>accumulo-core</artifactId>
-        <version>1.5.0-incubating-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
         <artifactId>accumulo-server</artifactId>
-        <version>1.5.0-incubating-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
         <artifactId>examples-simple</artifactId>
-        <version>1.5.0-incubating-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
         <artifactId>wikisearch-query-war</artifactId>
         <type>war</type>
-        <version>1.5.0-incubating-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
       </dependency>
 
       <!-- additional dependencies we need to provide -->

Modified: incubator/accumulo/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/server/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/server/pom.xml (original)
+++ incubator/accumulo/trunk/server/pom.xml Wed Mar 21 19:44:58 2012
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
-    <version>1.5.0-incubating-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/accumulo/trunk/server/src/main/c++/mlock/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/server/src/main/c%2B%2B/mlock/Makefile?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/server/src/main/c++/mlock/Makefile (original)
+++ incubator/accumulo/trunk/server/src/main/c++/mlock/Makefile Wed Mar 21 19:44:58 2012
@@ -37,7 +37,7 @@ clean:
 	rm -f $(INSTALLED_LIBS) $(LIBS)
 
 org_apache_accumulo_server_tabletserver_$(LIB).h : ../../java/org/apache/accumulo/server/tabletserver/$(LIB).java
-	javah -classpath ../../../../../lib/accumulo-server-1.5.0-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
+	javah -classpath ../../../../../lib/accumulo-server-1.5.0-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
 
 $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
 	cp $(LIBS) $(INSTALL_DIR)

Modified: incubator/accumulo/trunk/server/src/main/c++/nativeMap/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/server/src/main/c++/nativeMap/Makefile (original)
+++ incubator/accumulo/trunk/server/src/main/c++/nativeMap/Makefile Wed Mar 21 19:44:58 2012
@@ -36,7 +36,7 @@ clean:
 	rm -f $(INSTALLED_LIBS) $(LIBS)
 
 org_apache_accumulo_server_tabletserver_NativeMap.h : ../../java/org/apache/accumulo/server/tabletserver/NativeMap.java
-	javah -classpath ../../../../../lib/accumulo-server-1.5.0-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
+	javah -classpath ../../../../../lib/accumulo-server-1.5.0-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
 
 $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
 	cp $(LIBS) $(INSTALL_DIR)

Modified: incubator/accumulo/trunk/start/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/start/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/start/pom.xml (original)
+++ incubator/accumulo/trunk/start/pom.xml Wed Mar 21 19:44:58 2012
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
-    <version>1.5.0-incubating-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/accumulo/trunk/trace/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/trace/pom.xml?rev=1303529&r1=1303528&r2=1303529&view=diff
==============================================================================
--- incubator/accumulo/trunk/trace/pom.xml (original)
+++ incubator/accumulo/trunk/trace/pom.xml Wed Mar 21 19:44:58 2012
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
-    <version>1.5.0-incubating-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>