[geode] branch develop updated (77ef0b7 -> b5f36eb)
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 77ef0b7 GEODE-8496: bump dependencies again (#5919) add b5f36eb GEODE-8849: Improve failure output when running stress tests in CI (#5923) No new revisions were added by this update. Summary of changes: ci/scripts/repeat-new-tests.sh | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-)
[geode-native] branch develop updated: GEODE-8562: Add new C# classaskey Example (#725)
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new e9076f5 GEODE-8562: Add new C# classaskey Example (#725)
e9076f5 is described below
commit e9076f5cfeaedc6fa7951a33bf4ea32f09f7fafc
Author: Michael Martell
AuthorDate: Tue Jan 19 16:28:46 2021 -0800
GEODE-8562: Add new C# classaskey Example (#725)
* Add System.Drawing for classaskey example
* Use DateTime in the key and add stopserver
* Use smaller dataset to minimize output
* Switch to CacheableDate for consistency
Co-authored-by: Dave Barnes
---
clicache/src/CacheableString.hpp | 2 +-
examples/dotnet/CMakeLists.txt | 3 +
examples/dotnet/CMakeLists.txt.dotnet_example.in | 2 +-
examples/dotnet/CMakeLists.txt.in | 1 +
.../CMakeLists.txt}| 10 +-
examples/dotnet/classaskey/PhotosKey.cs| 117
examples/dotnet/classaskey/PhotosValue.cs | 121
examples/dotnet/classaskey/Program.cs | 212 +
examples/dotnet/classaskey/README.md | 95 +
examples/dotnet/classaskey/startserver.ps1 | 45 +
.../stopserver.ps1}| 37 ++--
.../utilities/InstantiateDataSerializable.java | 52 +
examples/utilities/PhotosKey.java | 93 +
13 files changed, 769 insertions(+), 21 deletions(-)
diff --git a/clicache/src/CacheableString.hpp b/clicache/src/CacheableString.hpp
index c15d7f3..b4f1c37 100644
--- a/clicache/src/CacheableString.hpp
+++ b/clicache/src/CacheableString.hpp
@@ -40,7 +40,7 @@ namespace Apache
/// An immutable string wrapper that can serve as a distributable
/// key object for caching as well as being a string value.
///
- ref class CacheableString
+ public ref class CacheableString
: public IDataSerializablePrimitive, public CacheableKey
{
public:
diff --git a/examples/dotnet/CMakeLists.txt b/examples/dotnet/CMakeLists.txt
index fba2374..11ef580 100644
--- a/examples/dotnet/CMakeLists.txt
+++ b/examples/dotnet/CMakeLists.txt
@@ -49,6 +49,9 @@ endfunction()
add_example(NAME authinitialize
SOURCE ExampleAuthInitialize.cs Program.cs)
+add_example(NAME classaskey
+ SOURCE PhotosKey.cs PhotosValue.cs Program.cs)
+
add_example(NAME continuousquery
SOURCE Order.cs MyCqListener.cs Program.cs)
diff --git a/examples/dotnet/CMakeLists.txt.dotnet_example.in
b/examples/dotnet/CMakeLists.txt.dotnet_example.in
index 978a013..f845522 100644
--- a/examples/dotnet/CMakeLists.txt.dotnet_example.in
+++ b/examples/dotnet/CMakeLists.txt.dotnet_example.in
@@ -31,4 +31,4 @@ target_link_libraries(${PROJECT_NAME}
set_target_properties(${PROJECT_NAME} PROPERTIES
VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
-VS_DOTNET_REFERENCES "System;${@PRODUCT_NAME_NOSPACE@_DOTNET_LIBRARY}")
+VS_DOTNET_REFERENCES
"System;System.Drawing;${@PRODUCT_NAME_NOSPACE@_DOTNET_LIBRARY}")
diff --git a/examples/dotnet/CMakeLists.txt.in
b/examples/dotnet/CMakeLists.txt.in
index 19935c2..69ec90d 100644
--- a/examples/dotnet/CMakeLists.txt.in
+++ b/examples/dotnet/CMakeLists.txt.in
@@ -18,6 +18,7 @@ cmake_minimum_required(VERSION 3.10)
project(@PRODUCT_DLL_NAME@.DotNet.Examples LANGUAGES NONE)
add_subdirectory(authinitialize)
+add_subdirectory(classaskey)
add_subdirectory(continuousquery)
add_subdirectory(dataserializable)
add_subdirectory(functionexecution)
diff --git a/examples/dotnet/CMakeLists.txt.dotnet_example.in
b/examples/dotnet/classaskey/CMakeLists.txt
similarity index 80%
copy from examples/dotnet/CMakeLists.txt.dotnet_example.in
copy to examples/dotnet/classaskey/CMakeLists.txt
index 978a013..87365ed 100644
--- a/examples/dotnet/CMakeLists.txt.dotnet_example.in
+++ b/examples/dotnet/classaskey/CMakeLists.txt
@@ -15,20 +15,20 @@
cmake_minimum_required(VERSION 3.10)
-project(dotnet-@ADD_EXAMPLE_NAME@ LANGUAGES CSharp)
+project(dotnet-classaskey LANGUAGES CSharp)
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
-find_package(@PRODUCT_NAME_NOSPACE@ REQUIRED COMPONENTS dotnet)
+find_package(GeodeNative REQUIRED COMPONENTS dotnet)
-add_executable(${PROJECT_NAME} @ADD_EXAMPLE_SOURCE@)
+add_executable(${PROJECT_NAME} PhotosKey.cs;PhotosValue.cs;Program.cs)
configure_file("startserver.ps1" ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
configure_file("stopserver.ps1" ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
target_link_libraries(${PROJECT_NAME}
-@PRODUCT_NAME_NOSPACE@::dotnet)
+GeodeNative::dotnet)
set_target_properties(${PROJECT_NAME} PROPERTIES
VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
-VS_DOTNET_REFERENCES
[geode] 02/02: GEODE-8496: update cached dependencies on changes to dependencies
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit f6bfe2fd0bf70a0f8c94ec72082547426c6ed9ae
Author: Owen Nichols
AuthorDate: Tue Jan 19 10:45:13 2021 -0800
GEODE-8496: update cached dependencies on changes to dependencies
(cherry picked from commit 834090159e2a4d42e2a7ccbac2ce1d2695ecb905)
---
ci/pipelines/images/jinja.template.yml | 13 +
1 file changed, 13 insertions(+)
diff --git a/ci/pipelines/images/jinja.template.yml
b/ci/pipelines/images/jinja.template.yml
index 954580d..d0c6b7a 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -155,6 +155,15 @@ resources:
password: ((docker-password))
repository: gcr.io/((gcp-project))/((pipeline-prefix))metric-tools
+- name: geode-dependencies
+ type: git
+ source:
+{{ github_access() | indent(4) }}
+branch: ((geode-build-branch))
+depth: 1
+paths:
+-
"buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy"
+
- name: gce-instances-resource-dockerfile
type: git
source:
@@ -196,6 +205,8 @@ jobs:
trigger: true
- get: build-concourse-dockerfile
trigger: true
+- get: geode-dependencies
+ trigger: true
- put: build-concourse-docker-image
params:
build: build-concourse-dockerfile/ci/docker
@@ -215,6 +226,8 @@ jobs:
passed: [build-alpine-tools-docker-image]
- get: linux-base-family
trigger: true
+- get: geode-dependencies
+ trigger: true
- task: build-image
timeout: 1h
image: alpine-tools-docker-image
[geode] branch support/1.12 updated (1bb094c -> f6bfe2f)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch support/1.12 in repository https://gitbox.apache.org/repos/asf/geode.git. from 1bb094c GEODE-8798: Improve output from export logs command (#5863) new 8159b53 GEODE-8834: pin docker version since we can't update to testcontainers 1.15 yet (#5917) new f6bfe2f GEODE-8496: update cached dependencies on changes to dependencies The 2 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. Summary of changes: ci/images/google-geode-builder/scripts/setup.sh | 4 +++- ci/pipelines/images/jinja.template.yml | 13 + 2 files changed, 16 insertions(+), 1 deletion(-)
[geode] 01/02: GEODE-8834: pin docker version since we can't update to testcontainers 1.15 yet (#5917)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch support/1.12 in repository https://gitbox.apache.org/repos/asf/geode.git commit 8159b53d43db3fb3efa05a123c5fa63f236980cc Author: Sean Goller AuthorDate: Fri Jan 15 16:44:59 2021 -0800 GEODE-8834: pin docker version since we can't update to testcontainers 1.15 yet (#5917) * Use docker 19.03.14 because of breaking API changes. (cherry picked from commit 52934a6d6ae558323024f2de93d53074d6edf73f) --- ci/images/google-geode-builder/scripts/setup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/images/google-geode-builder/scripts/setup.sh b/ci/images/google-geode-builder/scripts/setup.sh index 5198d21..5416685 100755 --- a/ci/images/google-geode-builder/scripts/setup.sh +++ b/ci/images/google-geode-builder/scripts/setup.sh @@ -40,7 +40,9 @@ apt-get install -y --no-install-recommends \ ca-certificates \ cgroupfs-mount \ docker-compose \ -docker-ce \ +containerd.io \ +docker-ce="5:19.03.14~3-0~ubuntu-bionic" \ +docker-ce-cli="5:19.03.14~3-0~ubuntu-bionic" \ git \ google-chrome-stable \ htop \
[geode] 01/02: GEODE-8834: pin docker version since we can't update to testcontainers 1.15 yet (#5917)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch support/1.13 in repository https://gitbox.apache.org/repos/asf/geode.git commit 52934a6d6ae558323024f2de93d53074d6edf73f Author: Sean Goller AuthorDate: Fri Jan 15 16:44:59 2021 -0800 GEODE-8834: pin docker version since we can't update to testcontainers 1.15 yet (#5917) * Use docker 19.03.14 because of breaking API changes. --- ci/images/google-geode-builder/scripts/setup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/images/google-geode-builder/scripts/setup.sh b/ci/images/google-geode-builder/scripts/setup.sh index 5198d21..5416685 100755 --- a/ci/images/google-geode-builder/scripts/setup.sh +++ b/ci/images/google-geode-builder/scripts/setup.sh @@ -40,7 +40,9 @@ apt-get install -y --no-install-recommends \ ca-certificates \ cgroupfs-mount \ docker-compose \ -docker-ce \ +containerd.io \ +docker-ce="5:19.03.14~3-0~ubuntu-bionic" \ +docker-ce-cli="5:19.03.14~3-0~ubuntu-bionic" \ git \ google-chrome-stable \ htop \
[geode] branch support/1.13 updated (ac11ccf -> cf35b3d)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch support/1.13 in repository https://gitbox.apache.org/repos/asf/geode.git. from ac11ccf GEODE-8798: Improve output from export logs command (#5863) new 52934a6 GEODE-8834: pin docker version since we can't update to testcontainers 1.15 yet (#5917) new cf35b3d GEODE-8496: update cached dependencies on changes to dependencies The 2 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. Summary of changes: ci/images/google-geode-builder/scripts/setup.sh | 4 +++- ci/pipelines/images/jinja.template.yml | 13 + 2 files changed, 16 insertions(+), 1 deletion(-)
[geode] 02/02: GEODE-8496: update cached dependencies on changes to dependencies
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
commit cf35b3d85d7746735668724167e1ec58bb8a4ef6
Author: Owen Nichols
AuthorDate: Tue Jan 19 10:45:13 2021 -0800
GEODE-8496: update cached dependencies on changes to dependencies
(cherry picked from commit 834090159e2a4d42e2a7ccbac2ce1d2695ecb905)
---
ci/pipelines/images/jinja.template.yml | 13 +
1 file changed, 13 insertions(+)
diff --git a/ci/pipelines/images/jinja.template.yml
b/ci/pipelines/images/jinja.template.yml
index c0b9bbe..ec29682 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -155,6 +155,15 @@ resources:
password: ((docker-password))
repository: gcr.io/((gcp-project))/((pipeline-prefix))metric-tools
+- name: geode-dependencies
+ type: git
+ source:
+{{ github_access() | indent(4) }}
+branch: ((geode-build-branch))
+depth: 1
+paths:
+-
"buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy"
+
- name: gce-instances-resource-dockerfile
type: git
source:
@@ -223,6 +232,8 @@ jobs:
trigger: true
- get: build-concourse-dockerfile
trigger: true
+- get: geode-dependencies
+ trigger: true
- put: build-concourse-docker-image
params:
build: build-concourse-dockerfile/ci/docker
@@ -242,6 +253,8 @@ jobs:
passed: [build-alpine-tools-docker-image]
- get: linux-base-family
trigger: true
+- get: geode-dependencies
+ trigger: true
- task: build-image
timeout: 1h
image: alpine-tools-docker-image
[geode] branch develop updated: GEODE-8496: bump dependencies again (#5919)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 77ef0b7 GEODE-8496: bump dependencies again (#5919)
77ef0b7 is described below
commit 77ef0b71d8b98cdac5b6de35a68c20ccba22126e
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Tue Jan 19 11:44:55 2021 -0800
GEODE-8496: bump dependencies again (#5919)
* Bump spring from 5.3.1/5.3.2 to 5.3.3
* Bump spring-boot-starter from 2.4.1 to 2.4.2
* Bump mockito-core from 3.7.0 to 3.7.7
* Bump lettuce-core from 6.0.1.RELEASE to 6.0.2.RELEASE
* Bump netty-all from 4.1.56.Final to 4.1.58.Final
* Bump micrometer-core from 1.6.2 to 1.6.3
* Bump mysql-connector-java from 8.0.22 to 8.0.23
* Bump dependency-management from 1.0.10.RELEASE to 1.0.11.RELEASE
* Bump sonarqube from 3.0 to 3.1
* Bump buildSrc's commons-lang3 from 3.3.2 to 3.11
* Bump maven-artifact from 3.3.3 to 3.6.3
* Bump docker-java from 3.0.14 to 3.2.7
* update image (cached dependencies) on changes to dependencies
---
.../src/test/resources/expected-pom.xml| 36 +++---
build.gradle | 4 +--
buildSrc/build.gradle | 6 ++--
.../gradle/plugins/DependencyConstraints.groovy| 17 +-
ci/pipelines/images/jinja.template.yml | 13
.../integrationTest/resources/assembly_content.txt | 14 -
.../resources/dependency_classpath.txt | 8 ++---
geode-connectors/build.gradle | 2 +-
.../cli/CreateDataSourceCommandDUnitTest.java | 2 +-
.../cli/DeregisterDriverCommandDUnitTest.java | 2 +-
.../internal/cli/ListDriversCommandDUnitTest.java | 4 +--
.../cli/RegisterDriverCommandDUnitTest.java| 2 +-
12 files changed, 60 insertions(+), 50 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml
b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index e1f5a2b..b7d881e 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -238,13 +238,13 @@
io.micrometer
micrometer-core
-1.6.2
+1.6.3
compile
io.netty
netty-all
-4.1.56.Final
+4.1.58.Final
compile
@@ -472,7 +472,7 @@
org.mockito
mockito-core
-3.7.0
+3.7.7
compile
@@ -544,7 +544,7 @@
io.lettuce
lettuce-core
-6.0.1.RELEASE
+6.0.2.RELEASE
compile
@@ -790,85 +790,85 @@
org.springframework
spring-aspects
-5.3.2
+5.3.3
compile
org.springframework
spring-beans
-5.3.2
+5.3.3
compile
org.springframework
spring-context
-5.3.2
+5.3.3
compile
org.springframework
spring-core
-5.3.2
+5.3.3
compile
org.springframework
spring-expression
-5.3.2
+5.3.3
compile
org.springframework
spring-oxm
-5.3.2
+5.3.3
compile
org.springframework
spring-test
-5.3.1
+5.3.3
compile
org.springframework
spring-tx
-5.3.2
+5.3.3
compile
org.springframework
spring-web
-5.3.2
+5.3.3
compile
org.springframework
spring-webmvc
-5.3.2
+5.3.3
compile
org.springframework.boot
spring-boot-starter
-2.4.1
+2.4.2
compile
org.springframework.boot
spring-boot-starter-jetty
-2.4.1
+2.4.2
compile
org.springframework.boot
spring-boot-starter-web
-2.4.1
+2.4.2
compile
org.springframework.boot
spring-boot-starter-data-redis
-2.4.1
+2.4.2
compile
diff --git a/build.gradle b/build.gradle
index 98a557e..9c47258 100755
--- a/build.gradle
+++ b/build.gradle
@@ -25,10 +25,10 @@ plugins {
id "com.github.ben-manes.versions" version "0.36.0" apply false
id "nebula.lint" version "16.17.0" apply false
id "com.palantir.docker" version "0.22.1" apply false
- id "io.spring.dependency-management" version "1.0.10.RELEASE" apply false
+ id "io.spring.dependency-management"
[geode] branch develop updated (c89ef45 -> 6c7219c)
This is an automated email from the ASF dual-hosted git repository. smgoller pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from c89ef45 Revert upgrade to Ubuntu 20.04. (#5920) add 6c7219c Fix package names. (#5922) No new revisions were added by this update. Summary of changes: ci/images/google-geode-builder/scripts/setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode] branch develop updated (7d23e28 -> c89ef45)
This is an automated email from the ASF dual-hosted git repository. smgoller pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 7d23e28 GEODE-8839: Remove unneeded links from docs pages (#5912) add c89ef45 Revert upgrade to Ubuntu 20.04. (#5920) No new revisions were added by this update. Summary of changes: ci/pipelines/images/deploy_images_pipeline.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[geode] branch develop updated (c34d5c2 -> 7d23e28)
This is an automated email from the ASF dual-hosted git repository. kmiller pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from c34d5c2 GEODE-8838: Provide some ability to launch ChildVM with specific port for RemoteDUnitVM stub (#5909) add 7d23e28 GEODE-8839: Remove unneeded links from docs pages (#5912) No new revisions were added by this update. Summary of changes: .../events/configure_client_server_event_messaging.html.md.erb | 7 --- .../events/configuring_highly_available_servers.html.md.erb| 3 --- .../events/tune_client_server_event_messaging.html.md.erb | 7 --- 3 files changed, 17 deletions(-)
