This is an automated email from the ASF dual-hosted git repository. prhomberg pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-examples.git
The following commit(s) were added to refs/heads/develop by this push: new e78ce03 GEODE-5964 run geode-examples with java11 (#70) e78ce03 is described below commit e78ce032ac95db8dddb51dc8fc630cd0f7a91efc Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Mon Dec 10 10:29:44 2018 -0800 GEODE-5964 run geode-examples with java11 (#70) * updates to gradle5 to support Java 11 (4.10.2 does not work) * update mockito to support Java 11 * fix classpath due to directory layout change in newer gradle * update examples to gradle 5.0 Co-authored-by: Jacob Barrett <jbarr...@pivotal.io> Co-authored-by: Owen Nichols <onich...@pivotal.io> --- clientSecurity/scripts/start.gfsh | 4 ++-- cq/scripts/start.gfsh | 4 ++-- eviction/scripts/start.gfsh | 4 ++-- expiration/scripts/start.gfsh | 4 ++-- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- indexes/scripts/start.gfsh | 4 ++-- listener/scripts/start.gfsh | 4 ++-- loader/scripts/start.gfsh | 4 ++-- .../src/test/java/org/apache/geode/examples/loader/ExampleTest.java | 2 +- lucene/scripts/start.gfsh | 4 ++-- partitioned/scripts/start.gfsh | 4 ++-- queries/scripts/start.gfsh | 4 ++-- transaction/scripts/start.gfsh | 4 ++-- wan/scripts/start-ln.gfsh | 4 ++-- wan/scripts/start-ny.gfsh | 4 ++-- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/clientSecurity/scripts/start.gfsh b/clientSecurity/scripts/start.gfsh index 080d5b4..42a81e6 100644 --- a/clientSecurity/scripts/start.gfsh +++ b/clientSecurity/scripts/start.gfsh @@ -29,12 +29,12 @@ start locator --name=locator --bind-address=127.0.0.1 --connect=false\ # Note that we can start a server with any user with CLUSTER:MANAGE permissions start server --name=server1 --locators=127.0.0.1[10334]\ - --classpath=../build/resources/main/:../build/classes/main/\ + --classpath=../build/resources/main/:../build/classes/java/main/\ --security-properties-file=./example_security.properties --server-port=0\ --user=superUser --password=123 start server --name=server2 --locators=127.0.0.1[10334]\ - --classpath=../build/resources/main/:../build/classes/main/\ + --classpath=../build/resources/main/:../build/classes/java/main/\ --security-properties-file=./example_security.properties --server-port=0\ --user=superUser --password=123 diff --git a/cq/scripts/start.gfsh b/cq/scripts/start.gfsh index 71eeeeb..68cf433 100755 --- a/cq/scripts/start.gfsh +++ b/cq/scripts/start.gfsh @@ -16,8 +16,8 @@ # start locator --name=locator --bind-address=127.0.0.1 -start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main -start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main +start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main +start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main list members create region --name=example-region --type=REPLICATE diff --git a/eviction/scripts/start.gfsh b/eviction/scripts/start.gfsh index 163aae9..9fe74a1 100755 --- a/eviction/scripts/start.gfsh +++ b/eviction/scripts/start.gfsh @@ -16,8 +16,8 @@ # start locator --name=locator --bind-address=127.0.0.1 -start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main -start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main +start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main +start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main list members create region --name=example-region --type=REPLICATE --skip-if-exists=true \ diff --git a/expiration/scripts/start.gfsh b/expiration/scripts/start.gfsh index e06d1d2..e25a2e9 100755 --- a/expiration/scripts/start.gfsh +++ b/expiration/scripts/start.gfsh @@ -16,8 +16,8 @@ # start locator --name=locator --bind-address=127.0.0.1 -start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main -start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main +start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main +start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main list members create region --name=example-region --type=REPLICATE --skip-if-exists=true \ diff --git a/gradle.properties b/gradle.properties index c06c21e..b8763b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,6 +26,6 @@ geodeReleaseUrl = assertjVersion = 3.6.2 awaitilityVersion = 1.7.0 junitVersion = 4.12 -mockitocoreVersion = 1.10.19 +mockitocoreVersion = 2.19.1 log4jVersion = 2.11.0 systemrulesVersion = 1.16.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5ecb5df..21818fa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip diff --git a/indexes/scripts/start.gfsh b/indexes/scripts/start.gfsh index 1a2e3ae..671a19e 100644 --- a/indexes/scripts/start.gfsh +++ b/indexes/scripts/start.gfsh @@ -16,8 +16,8 @@ # start locator --name=locator --bind-address=127.0.0.1 -start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main -start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main +start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main +start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main list members create region --name=example-region --type=REPLICATE --skip-if-exists=true diff --git a/listener/scripts/start.gfsh b/listener/scripts/start.gfsh index f3005b4..e80ff16 100755 --- a/listener/scripts/start.gfsh +++ b/listener/scripts/start.gfsh @@ -16,8 +16,8 @@ # start locator --name=locator --bind-address=127.0.0.1 -start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main -start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main +start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main +start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main list members create region --name=example-region --type=REPLICATE --cache-listener=org.apache.geode_examples.listener.ExampleCacheListener diff --git a/loader/scripts/start.gfsh b/loader/scripts/start.gfsh index a36577d..ed58658 100644 --- a/loader/scripts/start.gfsh +++ b/loader/scripts/start.gfsh @@ -16,8 +16,8 @@ # start locator --name=locator --bind-address=127.0.0.1 -start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main -start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main +start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main +start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main create region --name=example-region --type=REPLICATE --cache-loader=org.apache.geode_examples.loader.QuoteLoader diff --git a/loader/src/test/java/org/apache/geode/examples/loader/ExampleTest.java b/loader/src/test/java/org/apache/geode/examples/loader/ExampleTest.java index f79b8f4..7da5f2c 100644 --- a/loader/src/test/java/org/apache/geode/examples/loader/ExampleTest.java +++ b/loader/src/test/java/org/apache/geode/examples/loader/ExampleTest.java @@ -41,7 +41,7 @@ public class ExampleTest { Map<String, String> region = Mockito.spy(new HashMap<>()); when(region.get(any())).then(inv -> { - String key = inv.getArgumentAt(0, String.class); + String key = inv.getArgument(0); LoaderHelper<String, String> helper = mock(LoaderHelper.class); when(helper.getKey()).thenReturn(key); diff --git a/lucene/scripts/start.gfsh b/lucene/scripts/start.gfsh index b3d17bd..4363a72 100644 --- a/lucene/scripts/start.gfsh +++ b/lucene/scripts/start.gfsh @@ -16,8 +16,8 @@ # start locator --name=locator --bind-address=localhost -start server --name=server1 --locators=localhost[10334] --server-port=0 --classpath=../build/classes/main --enable-time-statistics --statistic-archive-file=lucene1.gfs -start server --name=server2 --locators=localhost[10334] --server-port=0 --classpath=../build/classes/main --enable-time-statistics --statistic-archive-file=lucene2.gfs +start server --name=server1 --locators=localhost[10334] --server-port=0 --classpath=../build/classes/java/main --enable-time-statistics --statistic-archive-file=lucene1.gfs +start server --name=server2 --locators=localhost[10334] --server-port=0 --classpath=../build/classes/java/main --enable-time-statistics --statistic-archive-file=lucene2.gfs ## simpleIndex uses default Lucene StandardAnalyzer create lucene index --name=simpleIndex --region=example-region --field=firstName,lastName diff --git a/partitioned/scripts/start.gfsh b/partitioned/scripts/start.gfsh index 84f95a7..915b54c 100644 --- a/partitioned/scripts/start.gfsh +++ b/partitioned/scripts/start.gfsh @@ -16,8 +16,8 @@ # start locator --name=locator --bind-address=127.0.0.1 -start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main -start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main +start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main +start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main create region --name=example-region --type=PARTITION diff --git a/queries/scripts/start.gfsh b/queries/scripts/start.gfsh index 5757be1..49db54f 100644 --- a/queries/scripts/start.gfsh +++ b/queries/scripts/start.gfsh @@ -16,8 +16,8 @@ # start locator --name=locator --bind-address=127.0.0.1 -start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main -start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main +start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main +start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main create region --name=example-region --type=PARTITION diff --git a/transaction/scripts/start.gfsh b/transaction/scripts/start.gfsh index 94e14a5..fdfe69a 100755 --- a/transaction/scripts/start.gfsh +++ b/transaction/scripts/start.gfsh @@ -16,8 +16,8 @@ # start locator --name=locator --bind-address=127.0.0.1 -start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main -start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/main +start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main +start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --classpath=../build/classes/java/main list members create region --name=example-region --type=REPLICATE --skip-if-exists=true diff --git a/wan/scripts/start-ln.gfsh b/wan/scripts/start-ln.gfsh index 59ce76f..0b1cddf 100644 --- a/wan/scripts/start-ln.gfsh +++ b/wan/scripts/start-ln.gfsh @@ -23,13 +23,13 @@ start locator --name=locator-ln --port=10332 --locators=localhost[10332] --mcast start server --name=server-ln-1 --locators=localhost[10332] --mcast-port=0 --log-level=config \ --enable-time-statistics=true --statistic-archive-file=cacheserver.gfs --server-port=0 \ - --classpath=../build/classes/main --J=-Dgemfire.statistic-sampling-enabled=true \ + --classpath=../build/classes/java/main --J=-Dgemfire.statistic-sampling-enabled=true \ --J=-Dgemfire.distributed-system-id=2 --J=-Dgemfire.conserve-sockets=false \ --J=-Dgemfire.log-file=cacheserver.log start server --name=server-ln-2 --locators=localhost[10332] --mcast-port=0 --log-level=config \ --enable-time-statistics=true --statistic-archive-file=cacheserver.gfs --server-port=0 \ - --classpath=../build/classes/main --J=-Dgemfire.statistic-sampling-enabled=true \ + --classpath=../build/classes/java/main --J=-Dgemfire.statistic-sampling-enabled=true \ --J=-Dgemfire.distributed-system-id=2 --J=-Dgemfire.conserve-sockets=false \ --J=-Dgemfire.log-file=cacheserver.log diff --git a/wan/scripts/start-ny.gfsh b/wan/scripts/start-ny.gfsh index 5b8e9e8..8c52c58 100644 --- a/wan/scripts/start-ny.gfsh +++ b/wan/scripts/start-ny.gfsh @@ -23,13 +23,13 @@ start locator --name=locator-ny --port=10331 --locators=localhost[10331] --mcast start server --name=server-ny-1 --locators=localhost[10331] --mcast-port=0 --log-level=config \ --enable-time-statistics=true --statistic-archive-file=cacheserver.gfs --server-port=0 \ - --classpath=../build/classes/main --J=-Dgemfire.statistic-sampling-enabled=true \ + --classpath=../build/classes/java/main --J=-Dgemfire.statistic-sampling-enabled=true \ --J=-Dgemfire.distributed-system-id=1 --J=-Dgemfire.conserve-sockets=false \ --J=-Dgemfire.log-file=cacheserver.log start server --name=server-ny-2 --locators=localhost[10331] --mcast-port=0 --log-level=config \ --enable-time-statistics=true --statistic-archive-file=cacheserver.gfs --server-port=0 \ - --classpath=../build/classes/main --J=-Dgemfire.statistic-sampling-enabled=true \ + --classpath=../build/classes/java/main --J=-Dgemfire.statistic-sampling-enabled=true \ --J=-Dgemfire.distributed-system-id=1 --J=-Dgemfire.conserve-sockets=false \ --J=-Dgemfire.log-file=cacheserver.log