Update current version to 1.9.0

hulishui · Nov 9, 2018 · c98308e · c98308e
1 parent 70771cb
commit c98308e
Show file tree

Hide file tree

Showing 25 changed files with 115 additions and 108 deletions.
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1198,20 +1198,20 @@ lib/commons-validator-1.6.jar
 lib/fastutil-8.2.1.jar
 lib/findbugs-annotations-1.3.9-1.jar
 lib/geo-0.7.1.jar
-lib/geode-common-1.8.0-SNAPSHOT.jar
-lib/geode-connectors-1.8.0-SNAPSHOT.jar
-lib/geode-core-1.8.0-SNAPSHOT.jar
-lib/geode-cq-1.8.0-SNAPSHOT.jar
+lib/geode-common-1.9.0-SNAPSHOT.jar
+lib/geode-connectors-1.9.0-SNAPSHOT.jar
+lib/geode-core-1.9.0-SNAPSHOT.jar
+lib/geode-cq-1.9.0-SNAPSHOT.jar
 lib/geode-dependencies.jar
-lib/geode-jca-1.8.0-SNAPSHOT.rar
-lib/geode-json-1.8.0-SNAPSHOT.jar
-lib/geode-lucene-1.8.0-SNAPSHOT.jar
-lib/geode-old-client-support-1.8.0-SNAPSHOT.jar
-lib/geode-protobuf-1.8.0-SNAPSHOT.jar
-lib/geode-protobuf-messages-1.8.0-SNAPSHOT.jar
-lib/geode-rebalancer-1.8.0-SNAPSHOT.jar
-lib/geode-wan-1.8.0-SNAPSHOT.jar
-lib/geode-web-1.8.0-SNAPSHOT.jar
+lib/geode-jca-1.9.0-SNAPSHOT.rar
+lib/geode-json-1.9.0-SNAPSHOT.jar
+lib/geode-lucene-1.9.0-SNAPSHOT.jar
+lib/geode-old-client-support-1.9.0-SNAPSHOT.jar
+lib/geode-protobuf-1.9.0-SNAPSHOT.jar
+lib/geode-protobuf-messages-1.9.0-SNAPSHOT.jar
+lib/geode-rebalancer-1.9.0-SNAPSHOT.jar
+lib/geode-wan-1.9.0-SNAPSHOT.jar
+lib/geode-web-1.9.0-SNAPSHOT.jar
 lib/gfsh-dependencies.jar
 lib/grumpy-core-0.2.2.jar
 lib/jackson-annotations-2.9.6.jar
@@ -1272,11 +1272,11 @@ lib/spring-core-4.3.18.RELEASE.jar
 lib/spring-expression-4.3.18.RELEASE.jar
 lib/spring-shell-1.2.0.RELEASE.jar
 lib/spring-web-4.3.18.RELEASE.jar
-tools/ClientProtocol/geode-protobuf-messages-definitions-1.8.0-SNAPSHOT.zip
-tools/Extensions/geode-web-1.8.0-SNAPSHOT.war
-tools/Extensions/geode-web-api-1.8.0-SNAPSHOT.war
-tools/Modules/Apache_Geode_Modules-1.8.0-SNAPSHOT-AppServer.zip
-tools/Modules/Apache_Geode_Modules-1.8.0-SNAPSHOT-Tomcat.zip
-tools/Modules/Apache_Geode_Modules-1.8.0-SNAPSHOT-tcServer.zip
-tools/Modules/Apache_Geode_Modules-1.8.0-SNAPSHOT-tcServer30.zip
-tools/Pulse/geode-pulse-1.8.0-SNAPSHOT.war
+tools/ClientProtocol/geode-protobuf-messages-definitions-1.9.0-SNAPSHOT.zip
+tools/Extensions/geode-web-1.9.0-SNAPSHOT.war
+tools/Extensions/geode-web-api-1.9.0-SNAPSHOT.war
+tools/Modules/Apache_Geode_Modules-1.9.0-SNAPSHOT-AppServer.zip
+tools/Modules/Apache_Geode_Modules-1.9.0-SNAPSHOT-Tomcat.zip
+tools/Modules/Apache_Geode_Modules-1.9.0-SNAPSHOT-tcServer.zip
+tools/Modules/Apache_Geode_Modules-1.9.0-SNAPSHOT-tcServer30.zip
+tools/Pulse/geode-pulse-1.9.0-SNAPSHOT.war
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -10,17 +10,17 @@ commons-lang-2.6.jar
 commons-logging-1.2.jar
 commons-validator-1.6.jar
 fastutil-8.2.1.jar
-geode-common-1.8.0-SNAPSHOT.jar
-geode-connectors-1.8.0-SNAPSHOT.jar
-geode-core-1.8.0-SNAPSHOT.jar
-geode-cq-1.8.0-SNAPSHOT.jar
-geode-json-1.8.0-SNAPSHOT.jar
-geode-lucene-1.8.0-SNAPSHOT.jar
-geode-old-client-support-1.8.0-SNAPSHOT.jar
-geode-protobuf-1.8.0-SNAPSHOT.jar
-geode-protobuf-messages-1.8.0-SNAPSHOT.jar
-geode-rebalancer-1.8.0-SNAPSHOT.jar
-geode-wan-1.8.0-SNAPSHOT.jar
+geode-common-1.9.0-SNAPSHOT.jar
+geode-connectors-1.9.0-SNAPSHOT.jar
+geode-core-1.9.0-SNAPSHOT.jar
+geode-cq-1.9.0-SNAPSHOT.jar
+geode-json-1.9.0-SNAPSHOT.jar
+geode-lucene-1.9.0-SNAPSHOT.jar
+geode-old-client-support-1.9.0-SNAPSHOT.jar
+geode-protobuf-1.9.0-SNAPSHOT.jar
+geode-protobuf-messages-1.9.0-SNAPSHOT.jar
+geode-rebalancer-1.9.0-SNAPSHOT.jar
+geode-wan-1.9.0-SNAPSHOT.jar
 jackson-annotations-2.9.6.jar
 jackson-core-2.9.6.jar
 jackson-databind-2.9.6.jar

diff --git a/geode-assembly/src/test/resources/expected-pom.xml b/geode-assembly/src/test/resources/expected-pom.xml
@@ -19,8 +19,8 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>apache-geode</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
+  <version>1.9.0-SNAPSHOT</version>
+  <packaging>tgz</packaging>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>

diff --git a/geode-book/config.yml b/geode-book/config.yml
@@ -21,14 +21,14 @@ public_host: localhost
 sections:
 - repository:
     name: geode-docs
-  directory: docs/guide/18
+  directory: docs/guide/19
   subnav_template: geode-subnav
 
 template_variables:
   product_name_long: Apache Geode
   product_name: Geode
-  product_version: 1.8
-  product_version_nodot: 18
+  product_version: 1.9
+  product_version_nodot: 19
   min_java_update: 121
   support_url: http://geode.apache.org/community
   product_url: http://geode.apache.org/

diff --git a/geode-common/src/test/resources/expected-pom.xml b/geode-common/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-common</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>

diff --git a/geode-concurrency-test/src/test/resources/expected-pom.xml b/geode-concurrency-test/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-concurrency-test</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>

diff --git a/geode-connectors/src/test/resources/expected-pom.xml b/geode-connectors/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-connectors</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>
@@ -38,13 +38,13 @@
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-common</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-core</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -55,7 +55,7 @@ public class Version implements Comparable<Version> {
   /** byte used as ordinal to represent this <code>Version</code> */
   private final short ordinal;
 
-  public static final int HIGHEST_VERSION = 95;
+  public static final int HIGHEST_VERSION = 100;
 
   private static final Version[] VALUES = new Version[HIGHEST_VERSION + 1];
 
@@ -224,13 +224,18 @@ public class Version implements Comparable<Version> {
   public static final Version GEODE_180 =
       new Version("GEODE", "1.8.0", (byte) 1, (byte) 8, (byte) 0, (byte) 0, GEODE_180_ORDINAL);
 
+  private static final byte GEODE_190_ORDINAL = 100;
+
+  public static final Version GEODE_190 =
+      new Version("GEODE", "1.9.0", (byte) 1, (byte) 9, (byte) 0, (byte) 0, GEODE_190_ORDINAL);
+
   /* NOTE: when adding a new version bump the ordinal by 5. Ordinals can be short ints */
 
   /**
    * This constant must be set to the most current version of the product. !!! NOTE: update
    * HIGHEST_VERSION when changing CURRENT !!!
    */
-  public static final Version CURRENT = GEODE_180;
+  public static final Version CURRENT = GEODE_190;
 
   /**
    * A lot of versioning code needs access to the current version's ordinal

diff --git a/...e-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java b/...e-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -330,6 +330,7 @@ private static void initializeAllCommands() {
     ALL_COMMANDS.put(Version.GEODE_160, commands);
     ALL_COMMANDS.put(Version.GEODE_170, commands);
     ALL_COMMANDS.put(Version.GEODE_180, commands);
+    ALL_COMMANDS.put(Version.GEODE_190, commands);
 
   }
 

diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-core</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>
@@ -290,13 +290,13 @@
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-common</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-json</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/geode-cq/src/test/resources/expected-pom.xml b/geode-cq/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-cq</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-core</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/geode-dunit/src/test/resources/expected-pom.xml b/geode-dunit/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-dunit</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>
@@ -38,13 +38,13 @@
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-core</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-junit</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-json</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/geode-experimental-driver/src/test/resources/expected-pom.xml b/geode-experimental-driver/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-experimental-driver</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>
@@ -38,13 +38,13 @@
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-common</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-protobuf-messages</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/geode-json/src/test/resources/expected-pom.xml b/geode-json/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-json</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>

diff --git a/geode-junit/src/test/resources/expected-pom.xml b/geode-junit/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-junit</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>
@@ -140,7 +140,7 @@
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-old-versions</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

diff --git a/geode-lucene/src/test/resources/expected-pom.xml b/geode-lucene/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-lucene</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>
@@ -95,13 +95,13 @@
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-core</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-common</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/geode-old-client-support/src/test/resources/expected-pom.xml b/geode-old-client-support/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-old-client-support</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-core</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/geode-protobuf-messages/src/test/resources/expected-pom.xml b/geode-protobuf-messages/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-protobuf-messages</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
   <url>http://geode.apache.org</url>