SGF-584 - Upgrade Dependencies.

2017-01-06 09:34:43 -08:00
parent 18fef68355
commit 5b50fd246f
6 changed files with 259 additions and 162 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -84,7 +84,7 @@ tasks.withType(Test).all {
 }

 repositories {
-    maven { url "https://repo.spring.io/libs-release" }
+    maven { url "https://repo.spring.io/libs-milestone" }
    maven { url "https://repo.spring.io/plugins-release"}
    maven { url "https://repository.apache.org/content/repositories/snapshots" }
 }
@@ -114,8 +114,7 @@ dependencies {
    }
    compile("org.apache.geode:geode-cq:$gemfireVersion")
    compile("org.apache.geode:geode-wan:$gemfireVersion")
-    optional "org.apache.shiro:shiro-spring:$shiroVersion"
-    optional("com.google.code.findbugs:annotations:$googleCodeFindbugsVersion")
+    optional"org.apache.shiro:shiro-spring:$shiroVersion"
    runtime("antlr:antlr:$antlrVersion")

    // 3rd Party Dependencies
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,8 @@
 antlrVersion=2.7.7
 aspectjVersion=1.8.9
-assertjVersion=3.5.2
+assertjVersion=3.6.1
 cdiVersion=1.0
-gemfireVersion=1.1.0-incubating-SNAPSHOT
-googleCodeFindbugsVersion=2.0.2
+gemfireVersion=1.1.0-SNAPSHOT
 hamcrestVersion=1.3
 jacksonVersion=2.7.6
 junitVersion=4.12
@@ -14,9 +13,9 @@ openwebbeansVersion=1.2.8
 servletApiVersion=2.5
 shiroVersion=1.3.1
 slf4jVersion=1.7.21
-spring.range="[4.0.0, 5.0.0)"
-springVersion=4.3.4.RELEASE
-springDataBuildVersion=1.8.5.RELEASE
-springDataCommonsVersion=1.12.5.RELEASE
+spring.range="[5.0.0, 6.0.0)"
+springVersion=5.0.0.M3
+springDataBuildVersion=2.0.0.M1
+springDataCommonsVersion=2.0.0.M1
 springShellVersion=1.2.0.RELEASE
-version=1.1.0.INCUBATING-SNAPSHOT
+version=1.1.0.SNAPSHOT
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.8.5.RELEASE</version>
+		<version>2.0.0.M1</version>
 	</parent>

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-geode</artifactId>
-	<version>1.1.0.INCUBATING-SNAPSHOT</version>
+	<version>1.1.0.SNAPSHOT</version>

 	<name>Spring Data Geode</name>

@@ -21,21 +21,19 @@
 		<dist.key>SGF</dist.key>
 		<antlr.version>2.7.7</antlr.version>
 		<apache-shiro.version>1.3.1</apache-shiro.version>
-		<assertj.version>3.5.2</assertj.version>
-		<gemfire.version>1.1.0-incubating-SNAPSHOT</gemfire.version>
-		<google-code-findbugs.version>2.0.2</google-code-findbugs.version>
+		<assertj.version>3.6.1</assertj.version>
+		<gemfire.version>1.1.0-SNAPSHOT</gemfire.version>
 		<multithreadedtc.version>1.01</multithreadedtc.version>
 		<servlet-api.version>2.5</servlet-api.version>
-		<spring>4.3.4.RELEASE</spring>
-		<springdata.commons>1.12.5.RELEASE</springdata.commons>
+		<spring-data-commons.version>2.0.0.M1</spring-data-commons.version>
 		<spring-shell.version>1.2.0.RELEASE</spring-shell.version>
 		<source.level>1.8</source.level>
 	</properties>

 	<repositories>
 		<repository>
-			<id>spring-libs-release</id>
-			<url>https://repo.spring.io/libs-release</url>
+			<id>spring-libs-milestone</id>
+			<url>https://repo.spring.io/libs-milestone</url>
 		</repository>
 		<repository>
 			<id>apache-snapshots</id>
@@ -73,7 +71,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons</artifactId>
-			<version>${springdata.commons}</version>
+			<version>${spring-data-commons.version}</version>
 		</dependency>

 		<dependency>
@@ -125,13 +123,6 @@
 			<version>${jackson}</version>
 		</dependency>

-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>annotations</artifactId>
-			<version>${google-code-findbugs.version}</version>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-spring</artifactId>
--- a/src/main/asciidoc/appendix/appendix-schema.adoc
+++ b/src/main/asciidoc/appendix/appendix-schema.adoc
@@ -7,13 +7,13 @@

 [source,xml]
 ----
-include::{resourcesDir}/org/springframework/data/gemfire/config/spring-gemfire-1.8.xsd[]
+include::{resourcesDir}/org/springframework/data/gemfire/config/spring-gemfire-1.0.xsd[]
 ----

 == Spring Data GemFire Data Access Schema (gfe-data)

 [source,xml]
 ----
-include::{resourcesDir}/org/springframework/data/gemfire/config/spring-data-gemfire-1.8.xsd[]
+include::{resourcesDir}/org/springframework/data/gemfire/config/spring-data-gemfire-1.0.xsd[]
 ----

--- a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderWrapper.java
+++ b/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderWrapper.java
@@ -22,6 +22,9 @@ import org.apache.geode.cache.wan.GatewayTransportFilter;
 import org.springframework.util.Assert;

 /**
+ * {@link GatewaySenderWrapper} is an Adapter around a {@link GatewaySender} providing the ability to control
+ * manual start and stop.
+ *
 * @author David Turanski
 * @author John Blum
 * @see org.apache.geode.cache.util.Gateway
@@ -33,163 +36,268 @@ public class GatewaySenderWrapper implements GatewaySender {

    private final GatewaySender delegate;

-	public GatewaySenderWrapper(final GatewaySender gatewaySender) {
-		Assert.notNull(gatewaySender, "The target Gateway Sender must not be null.");
+	/**
+	 * Constructs an instance of {@link GatewaySenderWrapper} initialized with the given {@link GatewaySender} to adapt.
+	 *
+	 * @param gatewaySender {@link GatewaySender} to adapt.
+	 * @throws IllegalArgumentException if {@link GatewaySender} is {@literal null}.
+	 * @see org.apache.geode.cache.wan.GatewaySender
+	 */
+	public GatewaySenderWrapper(GatewaySender gatewaySender) {
+		Assert.notNull(gatewaySender, "GatewaySender must not be null");
 		this.delegate = gatewaySender;
 	}

-    @Override
-    public void start() {
-        delegate.start();
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public boolean isBatchConflationEnabled() {
+		return this.delegate.isBatchConflationEnabled();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public boolean isDiskSynchronous() {
+		return this.delegate.isDiskSynchronous();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public boolean isManualStart() {
+		return this.manualStart;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public boolean isParallel() {
+		return this.delegate.isParallel();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public boolean isPaused() {
+		return this.delegate.isPaused();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public boolean isPersistenceEnabled() {
+		return this.delegate.isPersistenceEnabled();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+    public boolean isRunning() {
+        return this.delegate.isRunning();
    }

+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public int getAlertThreshold() {
+		return this.delegate.getAlertThreshold();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public int getBatchSize() {
+		return this.delegate.getBatchSize();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public int getBatchTimeInterval() {
+		return this.delegate.getBatchTimeInterval();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public String getDiskStoreName() {
+		return this.delegate.getDiskStoreName();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public int getDispatcherThreads() {
+		return delegate.getDispatcherThreads();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public List<GatewayEventFilter> getGatewayEventFilters() {
+		return this.delegate.getGatewayEventFilters();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public GatewayEventSubstitutionFilter getGatewayEventSubstitutionFilter() {
+		return this.delegate.getGatewayEventSubstitutionFilter();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public List<GatewayTransportFilter> getGatewayTransportFilters() {
+		return this.delegate.getGatewayTransportFilters();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
    @Override
-    public void stop() {
-        delegate.stop();
+    public String getId() {
+        return this.delegate.getId();
    }

+	public void setManualStart(boolean manualStart) {
+		this.manualStart = manualStart;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public int getMaxParallelismForReplicatedRegion() {
+		return this.delegate.getMaxParallelismForReplicatedRegion();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public int getMaximumQueueMemory() {
+		return this.delegate.getMaximumQueueMemory();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	@SuppressWarnings("deprecation")
+	public GatewaySender.OrderPolicy getOrderPolicy() {
+		return delegate.getOrderPolicy();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
    @Override
-    public void pause() {
-        delegate.pause();
+    public int getRemoteDSId() {
+        return this.delegate.getRemoteDSId();
    }

+	/**
+	 * @inheritDoc
+	 */
    @Override
-    public void resume() {
-        delegate.resume();
+    public int getSocketBufferSize() {
+        return this.delegate.getSocketBufferSize();
    }

+	/**
+	 * @inheritDoc
+	 */
+    @Override
+    public int getSocketReadTimeout() {
+        return this.delegate.getSocketReadTimeout();
+    }
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public void addGatewayEventFilter(GatewayEventFilter filter) {
+		delegate.addGatewayEventFilter(filter);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public void removeGatewayEventFilter(GatewayEventFilter filter) {
+		delegate.removeGatewayEventFilter(filter);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public void destroy() {
+		this.delegate.destroy();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public void pause() {
+		delegate.pause();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
 	@Override
 	public void rebalance() {
 		delegate.rebalance();
 	}

+	/**
+	 * @inheritDoc
+	 */
 	@Override
-    public boolean isRunning() {
-        return delegate.isRunning();
-    }
-
-    @Override
-    public boolean isPaused() {
-        return delegate.isPaused();
-    }
-
-    @Override
-    public void addGatewayEventFilter(GatewayEventFilter filter) {
-         delegate.addGatewayEventFilter(filter);
-    }
-
-    @Override
-    public void removeGatewayEventFilter(GatewayEventFilter filter) {
-        delegate.removeGatewayEventFilter(filter);
-    }
-
-    @Override
-    public String getId() {
-        return delegate.getId();
-    }
-
-    @Override
-    public int getRemoteDSId() {
-        return delegate.getRemoteDSId();
-    }
-
-    @Override
-    public int getSocketBufferSize() {
-        return delegate.getSocketBufferSize();
-    }
-
-    @Override
-    public int getSocketReadTimeout() {
-        return delegate.getSocketReadTimeout();
-    }
-
-    @Override
-    public String getDiskStoreName() {
-        return delegate.getDiskStoreName();
-    }
-
-    @Override
-    public int getMaximumQueueMemory() {
-        return delegate.getMaximumQueueMemory();
-    }
-
-    @Override
-    public int getBatchSize() {
-        return delegate.getBatchSize();
-    }
-
-    @Override
-    public int getBatchTimeInterval() {
-        return delegate.getBatchTimeInterval();
-    }
-
-    @Override
-    public boolean isBatchConflationEnabled() {
-        return delegate.isBatchConflationEnabled();
-    }
-
-    @Override
-    public boolean isPersistenceEnabled() {
-        return delegate.isPersistenceEnabled();
-    }
-
-    @Override
-    public int getAlertThreshold() {
-        return delegate.getAlertThreshold();
-    }
-
-    @Override
-    public List<GatewayEventFilter> getGatewayEventFilters() {
-        return delegate.getGatewayEventFilters();
-    }
-
-	public GatewayEventSubstitutionFilter getGatewayEventSubstitutionFilter() {
-		return delegate.getGatewayEventSubstitutionFilter();
+	public void resume() {
+		delegate.resume();
 	}

+	/**
+	 * @inheritDoc
+	 */
 	@Override
-    public List<GatewayTransportFilter> getGatewayTransportFilters() {
-        return delegate.getGatewayTransportFilters();
-    }
-
-    @Override
-    public boolean isDiskSynchronous() {
-        return delegate.isDiskSynchronous();
-    }
-
-    @Override
-    public boolean isManualStart() {
-        return this.manualStart;
-    }
-
-    @Override
-    public boolean isParallel() {
-        return delegate.isParallel();
-    }
-
-    @Override
-    public int getDispatcherThreads() {
-        return delegate.getDispatcherThreads();
-    }
-
-    @Override
-	@SuppressWarnings("deprecation")
-    public GatewaySender.OrderPolicy getOrderPolicy() {
-        return delegate.getOrderPolicy();
-    }
-
-    public void setManualStart(boolean manualStart) {
-        this.manualStart = manualStart;
-    }
-
-	@Override
-	public int getMaxParallelismForReplicatedRegion() {
-		return delegate.getMaxParallelismForReplicatedRegion();
+	public void start() {
+		delegate.start();
 	}

+	/**
+	 * @inheritDoc
+	 */
+	@Override
+	public void stop() {
+		delegate.stop();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
 	@Override
 	public String toString() {
 		return this.delegate.toString();
 	}
-
 }
--- a/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java
@@ -180,7 +180,7 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT

 			serverOnePool.setMaxConnections(2);
 			serverOnePool.setPingInterval(TimeUnit.SECONDS.toMillis(5));
-			serverOnePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(20)).intValue());
+			serverOnePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(30)).intValue());
 			serverOnePool.setRetryAttempts(1);
 			serverOnePool.setServerGroup("serverOne");
 			serverOnePool.setLocators(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 11235)));
@@ -194,7 +194,7 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT

 			serverOnePool.setMaxConnections(2);
 			serverOnePool.setPingInterval(TimeUnit.SECONDS.toMillis(5));
-			serverOnePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(20)).intValue());
+			serverOnePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(30)).intValue());
 			serverOnePool.setRetryAttempts(1);
 			serverOnePool.setServerGroup("serverTwo");
 			serverOnePool.setLocators(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 11235)));