You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2018/09/07 15:59:43 UTC
[geode] branch release/1.7.0 created (now d07244df)
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a change to branch release/1.7.0
in repository https://gitbox.apache.org/repos/asf/geode.git.
at d07244df GEODE-5695: Update Gemfile.lock to Sprockets 3.7.2
This branch includes the following new commits:
new 31e6612 Updated release versions to 1.7.0 for release preparation
new 0936c9f Revert "Adding 1.8 as a version in Version.java"
new bbc9bac Changing all the version numbers from 1.8.0 to 1.7.0
new 9175e34 Changing all Version.GEODE_180 to Version_170
new fb0ee09 Revert "[GEODE-5591] If there is a BindException we should always throw. (#2351)"
new ab7e6e7 Disabling the the Windows test pipeline
new d07244df GEODE-5695: Update Gemfile.lock to Sprockets 3.7.2
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[geode] 01/07: Updated release versions to 1.7.0 for release
preparation
Posted by nn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch release/1.7.0
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 31e661248edf42f2f67c9ca13a89dfe3bdb5e63f
Author: nabarun <na...@cs.wisc.edu>
AuthorDate: Mon May 21 16:32:30 2018 -0700
Updated release versions to 1.7.0 for release preparation
---
docker/Dockerfile | 2 +-
gradle.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 004b6d2..7427aca 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -32,7 +32,7 @@ ENV GEODE_HOME /geode
ENV PATH $PATH:$GEODE_HOME/bin
# https://geode.apache.org/releases/
-ENV GEODE_VERSION 1.6.0
+ENV GEODE_VERSION 1.7.0
# Binaries TGZ SHA-256
# https://dist.apache.org/repos/dist/release/geode/VERSION/apache-geode-VERSION.tgz.sha256
ENV GEODE_SHA256 79e8d81d058b1c4edd5fb414ff30ac530f7913b978f5abc899c353fcb06e5ef3
diff --git a/gradle.properties b/gradle.properties
index 3edf13d..f6e3224 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,7 @@ releaseQualifier =
# -SNAPSHOT - development version
# <blank> - release
# This is only really relevant for Maven artifacts.
-releaseType = -SNAPSHOT
+releaseType =
# Set the buildId, sourceRevision, and sourceRepository to add build metadata
# that can be viewed from gfsh or pulse (`gfsh version --full`).
[geode] 06/07: Disabling the the Windows test pipeline
Posted by nn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch release/1.7.0
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ab7e6e7500c2349f9c26e40535e793f5e1e408a8
Author: nabarun <na...@cs.wisc.edu>
AuthorDate: Wed Sep 5 10:15:12 2018 -0700
Disabling the the Windows test pipeline
---
ci/pipelines/geode-build/jinja.template.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index 720c33a..da4d13f 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -44,7 +44,7 @@ groups:
- name: main
jobs:
- {{ build_test.name }}
- {% for test in (tests + windowstests) if not test.name=="StressNew" -%}
+ {% for test in tests if not test.name=="StressNew" -%}
- {{test.name}}Test
{% endfor -%}
- UpdatePassingRef
[geode] 05/07: Revert "[GEODE-5591] If there is a BindException we
should always throw. (#2351)"
Posted by nn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch release/1.7.0
in repository https://gitbox.apache.org/repos/asf/geode.git
commit fb0ee0970dead958c8e7531451dd3e46e17af004
Author: nabarun <na...@cs.wisc.edu>
AuthorDate: Wed Sep 5 09:59:02 2018 -0700
Revert "[GEODE-5591] If there is a BindException we should always throw. (#2351)"
This reverts commit b6eb8fa
---
.../geode/internal/cache/wan/WANTestBase.java | 14 ++++--
.../cache/wan/misc/WANConfigurationJUnitTest.java | 15 ++++--
.../internal/cache/wan/GatewayReceiverImpl.java | 54 +++++++++++++++++-----
3 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java
index a091942..0b1af66 100644
--- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java
@@ -37,7 +37,6 @@ import static org.apache.geode.distributed.ConfigurationProperties.REMOTE_LOCATO
import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
import static org.apache.geode.test.dunit.Host.getHost;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -2018,9 +2017,16 @@ public class WANTestBase extends DistributedTestCase {
fact.setManualStart(true);
fact.setBindAddress("200.112.204.10");
GatewayReceiver receiver = fact.create();
- assertThatThrownBy(receiver::start)
- .isInstanceOf(GatewayReceiverException.class)
- .hasMessageContaining("No available free port found in the given range");
+ try {
+ receiver.start();
+ fail("Expected GatewayReceiver Exception");
+ } catch (GatewayReceiverException gRE) {
+ logger.debug("Got the GatewayReceiverException", gRE);
+ assertTrue(gRE.getMessage().contains("Failed to create server socket on"));
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Test " + test.getName() + " failed to start GatewayReceiver on port " + port);
+ }
}
public static int createReceiverWithSSL(int locPort) {
diff --git a/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
index 038b759..edcd55f 100644
--- a/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
+++ b/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
@@ -437,18 +437,25 @@ public class WANConfigurationJUnitTest {
public void test_ValidateGatewayReceiverAttributes_WrongBindAddress() {
cache = new CacheFactory().set(MCAST_PORT, "0").create();
GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
- fact.setStartPort(50505);
+ fact.setStartPort(50504);
fact.setMaximumTimeBetweenPings(1000);
fact.setSocketBufferSize(4000);
- fact.setEndPort(50505);
+ fact.setEndPort(70707);
fact.setManualStart(true);
fact.setBindAddress("200.112.204.10");
GatewayTransportFilter myStreamFilter1 = new MyGatewayTransportFilter1();
fact.addGatewayTransportFilter(myStreamFilter1);
-
GatewayReceiver receiver = fact.create();
- assertThatThrownBy(() -> receiver.start()).isInstanceOf(GatewayReceiverException.class);
+ try {
+ receiver.start();
+ fail("Expected GatewayReceiverException");
+ } catch (GatewayReceiverException gRE) {
+ assertTrue(gRE.getMessage().contains("Failed to create server socket on"));
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("The test failed with IOException");
+ }
}
@Test
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
index cd27029..0f0fc63 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
@@ -15,6 +15,8 @@
package org.apache.geode.internal.cache.wan;
import java.io.IOException;
+import java.net.BindException;
+import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.List;
@@ -26,6 +28,7 @@ import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ResourceEvent;
+import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.cache.CacheServerImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -143,9 +146,10 @@ public class GatewayReceiverImpl implements GatewayReceiver {
logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_IS_ALREADY_RUNNING));
return;
}
-
- for (int port = this.startPort; port <= this.endPort; port++) {
- receiver.setPort(port);
+ boolean started = false;
+ this.port = getPortToStart();
+ while (!started && this.port != -1) {
+ receiver.setPort(this.port);
receiver.setSocketBufferSize(socketBufferSize);
receiver.setMaximumTimeBetweenPings(timeBetPings);
if (hostnameForSenders != null && !hostnameForSenders.isEmpty()) {
@@ -156,19 +160,33 @@ public class GatewayReceiverImpl implements GatewayReceiver {
((CacheServerImpl) receiver).setGatewayTransportFilter(this.filters);
try {
receiver.start();
- this.port = port;
- break;
- } catch (IOException e) {
- if (port == this.endPort) {
- throw new GatewayReceiverException("No available free port found in the given range (" +
- this.startPort +
- "-" +
- this.endPort +
- ")", e);
+ started = true;
+ } catch (BindException be) {
+ if (be.getCause() != null
+ && be.getCause().getMessage().contains("assign requested address")) {
+ throw new GatewayReceiverException(
+ LocalizedStrings.SocketCreator_FAILED_TO_CREATE_SERVER_SOCKET_ON_0_1
+ .toLocalizedString(new Object[] {bindAdd, this.port}));
+ }
+ // ignore as this port might have been used by other threads.
+ logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_Address_Already_In_Use,
+ this.port));
+ this.port = getPortToStart();
+ } catch (SocketException se) {
+ if (se.getMessage().contains("Address already in use")) {
+ logger.warn(LocalizedMessage
+ .create(LocalizedStrings.GatewayReceiver_Address_Already_In_Use, this.port));
+ this.port = getPortToStart();
+
+ } else {
+ throw se;
}
}
}
+ if (!started) {
+ throw new IllegalStateException("No available free port found in the given range.");
+ }
logger
.info(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_STARTED_ON_PORT, this.port));
@@ -177,6 +195,18 @@ public class GatewayReceiverImpl implements GatewayReceiver {
}
+ private int getPortToStart() {
+ // choose a random port from the given port range
+ int rPort;
+ if (this.startPort == this.endPort) {
+ rPort = this.startPort;
+ } else {
+ rPort = AvailablePort.getRandomAvailablePortInRange(this.startPort, this.endPort,
+ AvailablePort.SOCKET);
+ }
+ return rPort;
+ }
+
public void stop() {
if (!isRunning()) {
throw new GatewayReceiverException(
[geode] 03/07: Changing all the version numbers from 1.8.0 to 1.7.0
Posted by nn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch release/1.7.0
in repository https://gitbox.apache.org/repos/asf/geode.git
commit bbc9bac7d85886777aeb9e0cf8ebbf34da0f13ac
Author: nabarun <na...@cs.wisc.edu>
AuthorDate: Tue Sep 4 10:23:37 2018 -0700
Changing all the version numbers from 1.8.0 to 1.7.0
* all *.pom files
* gradle.properties
---
geode-assembly/src/test/resources/expected-pom.xml | 2 +-
geode-common/src/test/resources/expected-pom.xml | 2 +-
geode-concurrency-test/src/test/resources/expected-pom.xml | 2 +-
geode-connectors/src/test/resources/expected-pom.xml | 6 +++---
geode-core/src/test/resources/expected-pom.xml | 6 +++---
geode-cq/src/test/resources/expected-pom.xml | 2 +-
geode-dunit/src/test/resources/expected-pom.xml | 8 ++++----
geode-experimental-driver/src/test/resources/expected-pom.xml | 6 +++---
geode-json/src/test/resources/expected-pom.xml | 2 +-
geode-junit/src/test/resources/expected-pom.xml | 4 ++--
geode-lucene/src/test/resources/expected-pom.xml | 6 +++---
geode-old-client-support/src/test/resources/expected-pom.xml | 4 ++--
geode-protobuf-messages/src/test/resources/expected-pom.xml | 2 +-
geode-protobuf/src/test/resources/expected-pom.xml | 4 ++--
geode-pulse/src/test/resources/expected-pom.xml | 2 +-
geode-rebalancer/src/test/resources/expected-pom.xml | 2 +-
geode-wan/src/test/resources/expected-pom.xml | 2 +-
geode-web-api/src/test/resources/expected-pom.xml | 2 +-
geode-web/src/test/resources/expected-pom.xml | 2 +-
gradle.properties | 2 +-
20 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/geode-assembly/src/test/resources/expected-pom.xml b/geode-assembly/src/test/resources/expected-pom.xml
index 3f8abf5..e2d6370 100644
--- a/geode-assembly/src/test/resources/expected-pom.xml
+++ b/geode-assembly/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>apache-geode</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<packaging>pom</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>
diff --git a/geode-common/src/test/resources/expected-pom.xml b/geode-common/src/test/resources/expected-pom.xml
index 118561e..b1b7859 100644
--- 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.7.0</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
index 765f5d9..57d9c63 100644
--- 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.7.0</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
index 6330a6e..c994588 100644
--- 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.7.0</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.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-common</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
index 87115d4..14ace78 100644
--- 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.7.0</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>
@@ -260,13 +260,13 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-common</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-json</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</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
index bc9c769..aaf6ece 100644
--- 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.7.0</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-dunit/src/test/resources/expected-pom.xml b/geode-dunit/src/test/resources/expected-pom.xml
index cbf8394..77be1e4 100644
--- 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.7.0</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,19 +38,19 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-core</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-junit</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-json</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</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
index d688575..c244d90 100644
--- 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.7.0</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.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-protobuf-messages</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</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
index 275c6ec..9b6ef7c 100644
--- 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.7.0</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
index 35775fa..c6204fd 100644
--- 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.7.0</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>
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-old-versions</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</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
index 545099d..54ac47a 100644
--- 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.7.0</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.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-common</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</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
index a129c23..6beb709 100644
--- 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.7.0</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.7.0</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
index d5874a0..a5287c8 100644
--- 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.7.0</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-protobuf/src/test/resources/expected-pom.xml b/geode-protobuf/src/test/resources/expected-pom.xml
index 6a60525..8ce188f 100644
--- a/geode-protobuf/src/test/resources/expected-pom.xml
+++ b/geode-protobuf/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-protobuf</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</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-protobuf-messages</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/geode-pulse/src/test/resources/expected-pom.xml b/geode-pulse/src/test/resources/expected-pom.xml
index 3ac7a8f..7f3b155 100644
--- a/geode-pulse/src/test/resources/expected-pom.xml
+++ b/geode-pulse/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-pulse</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</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-rebalancer/src/test/resources/expected-pom.xml b/geode-rebalancer/src/test/resources/expected-pom.xml
index 5028aef..75f7977 100644
--- a/geode-rebalancer/src/test/resources/expected-pom.xml
+++ b/geode-rebalancer/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-rebalancer</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</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-wan/src/test/resources/expected-pom.xml b/geode-wan/src/test/resources/expected-pom.xml
index 12d9649..495d32b 100644
--- a/geode-wan/src/test/resources/expected-pom.xml
+++ b/geode-wan/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-wan</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</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-web-api/src/test/resources/expected-pom.xml b/geode-web-api/src/test/resources/expected-pom.xml
index f9d2afe..22d1008 100644
--- a/geode-web-api/src/test/resources/expected-pom.xml
+++ b/geode-web-api/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-api</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</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-web/src/test/resources/expected-pom.xml b/geode-web/src/test/resources/expected-pom.xml
index bf94ad6..76b607a 100644
--- a/geode-web/src/test/resources/expected-pom.xml
+++ b/geode-web/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0</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/gradle.properties b/gradle.properties
index f6e3224..2757caa 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@
# -SNAPSHOT - development version
# .M? - milestone release
# <blank> - release
-versionNumber = 1.8.0
+versionNumber = 1.7.0
# Set the release qualifier using the following conventions:
# .M? - milestone release
[geode] 04/07: Changing all Version.GEODE_180 to Version_170
Posted by nn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch release/1.7.0
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9175e34fc07a01064d32ee598b7e493341f95734
Author: nabarun <na...@cs.wisc.edu>
AuthorDate: Tue Sep 4 11:16:42 2018 -0700
Changing all Version.GEODE_180 to Version_170
---
.../main/java/org/apache/geode/internal/cache/TXCommitMessage.java | 2 +-
.../apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java | 4 ++--
.../geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
index 9a3a1e4..5ff142b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
@@ -927,7 +927,7 @@ public class TXCommitMessage extends PooledDistributionMessage
}
private boolean hasFlagsField(final Version version) {
- return version.compareTo(Version.GEODE_180) >= 0;
+ return version.compareTo(Version.GEODE_170) >= 0;
}
private boolean useShadowKey() {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
index 69f0d89..6e3e8a0 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
@@ -290,11 +290,11 @@ public class LuceneIndexCommands extends InternalGfshCommand {
// Get members >= Geode 1.8 (when the new destroy code path went into the product)
Set<DistributedMember> validVersionMembers =
- getNormalMembersWithSameOrNewerVersion(Version.GEODE_180);
+ getNormalMembersWithSameOrNewerVersion(Version.GEODE_170);
if (validVersionMembers.isEmpty()) {
return ResultBuilder.createInfoResult(CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
- Version.GEODE_180));
+ Version.GEODE_170));
}
// Execute the destroy index function
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
index e9129f5..b0e4db8 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
@@ -434,7 +434,7 @@ public class LuceneIndexCommandsJUnitTest {
final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
String expectedStatus = CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
- new Object[] {Version.GEODE_180}) + LINE_SEPARATOR;
+ new Object[] {Version.GEODE_170}) + LINE_SEPARATOR;
cliFunctionResults.add(new CliFunctionResult("member0"));
doReturn(Collections.emptySet()).when(commands).getNormalMembersWithSameOrNewerVersion(any());
CommandResult result = (CommandResult) commands.destroyIndex("index", "regionPath");
@@ -484,7 +484,7 @@ public class LuceneIndexCommandsJUnitTest {
final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
String expectedStatus = CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
- new Object[] {Version.GEODE_180}) + LINE_SEPARATOR;
+ new Object[] {Version.GEODE_170}) + LINE_SEPARATOR;
cliFunctionResults.add(new CliFunctionResult("member0"));
CommandResult result = (CommandResult) commands.destroyIndex(null, "regionPath");
verifyDestroyIndexCommandResult(result, cliFunctionResults, expectedStatus);
[geode] 07/07: GEODE-5695: Update Gemfile.lock to Sprockets 3.7.2
Posted by nn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch release/1.7.0
in repository https://gitbox.apache.org/repos/asf/geode.git
commit d07244df106c6787a6b0dbef3b814029225a084c
Author: joeymcallister <jm...@pivotal.io>
AuthorDate: Wed Sep 5 11:24:05 2018 -0700
GEODE-5695: Update Gemfile.lock to Sprockets 3.7.2
---
geode-book/Gemfile.lock | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/geode-book/Gemfile.lock b/geode-book/Gemfile.lock
index ddb7145..6f4503d 100644
--- a/geode-book/Gemfile.lock
+++ b/geode-book/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
- backports (3.11.3)
+ backports (3.11.4)
bookbindery (10.1.14)
ansi (~> 1.4)
css_parser
@@ -51,13 +51,13 @@ GEM
contracts (0.13.0)
css_parser (1.6.0)
addressable
- dotenv (2.4.0)
- elasticsearch (6.0.2)
- elasticsearch-api (= 6.0.2)
- elasticsearch-transport (= 6.0.2)
- elasticsearch-api (6.0.2)
+ dotenv (2.5.0)
+ elasticsearch (6.1.0)
+ elasticsearch-api (= 6.1.0)
+ elasticsearch-transport (= 6.1.0)
+ elasticsearch-api (6.1.0)
multi_json
- elasticsearch-transport (6.0.2)
+ elasticsearch-transport (6.1.0)
faraday
multi_json
em-websocket (0.5.1)
@@ -81,8 +81,8 @@ GEM
builder
excon (~> 0.58)
formatador (~> 0.2)
- fog-json (1.0.2)
- fog-core (~> 1.0)
+ fog-json (1.2.0)
+ fog-core
multi_json (~> 1.10)
fog-xml (0.1.3)
fog-core
@@ -96,7 +96,7 @@ GEM
tilt
hamster (3.0.0)
concurrent-ruby (~> 1.0)
- hashie (3.5.7)
+ hashie (3.6.0)
http_parser.rb (0.6.0)
i18n (0.7.0)
ipaddress (0.8.3)
@@ -165,8 +165,8 @@ GEM
padrino-support (0.13.3.4)
activesupport (>= 3.1)
parallel (1.12.1)
- public_suffix (3.0.2)
- puma (3.11.4)
+ public_suffix (3.0.3)
+ puma (3.12.0)
rack (1.6.10)
rack-livereload (0.3.17)
rack
@@ -179,7 +179,7 @@ GEM
rouge (1.11.1)
sass (3.4.25)
servolux (0.13.0)
- sprockets (3.7.1)
+ sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
temple (0.8.0)
[geode] 02/07: Revert "Adding 1.8 as a version in Version.java"
Posted by nn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch release/1.7.0
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0936c9fa41aa1e70a381df2aef6dde4be028c8d2
Author: nabarun <na...@cs.wisc.edu>
AuthorDate: Fri Aug 31 15:56:17 2018 -0700
Revert "Adding 1.8 as a version in Version.java"
This reverts commit ca0f662
---
geode-core/src/main/java/org/apache/geode/internal/Version.java | 9 ++-------
.../geode/internal/cache/tier/sockets/CommandInitializer.java | 1 -
2 files changed, 2 insertions(+), 8 deletions(-)
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
index c8721e0..f60e9bb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -56,7 +56,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 = 90;
private static final Version[] VALUES = new Version[HIGHEST_VERSION + 1];
@@ -220,18 +220,13 @@ public class Version implements Comparable<Version> {
public static final Version GEODE_170 =
new Version("GEODE", "1.7.0", (byte) 1, (byte) 7, (byte) 0, (byte) 0, GEODE_170_ORDINAL);
- private static final byte GEODE_180_ORDINAL = 95;
-
- public static final Version GEODE_180 =
- new Version("GEODE", "1.8.0", (byte) 1, (byte) 8, (byte) 0, (byte) 0, GEODE_180_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_170;
/**
* A lot of versioning code needs access to the current version's ordinal
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
index 70857c7..08e76b7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -329,7 +329,6 @@ public class CommandInitializer {
ALL_COMMANDS.put(Version.GEODE_150, commands);
ALL_COMMANDS.put(Version.GEODE_160, commands);
ALL_COMMANDS.put(Version.GEODE_170, commands);
- ALL_COMMANDS.put(Version.GEODE_180, commands);
}