[geode] branch develop updated (bc38eef -> 55a548c)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from bc38eef GEODE-8895: processChunkResponse encountering broken socket should throw IOException to retrty (#5979) add 55a548c GEODE-8496: bump deps again (#5983) No new revisions were added by this update. Summary of changes: .../src/test/resources/expected-pom.xml| 18 +- build.gradle | 4 ++-- .../gradle/plugins/DependencyConstraints.groovy| 16 .../session/tests/GenericAppServerInstall.java | 2 +- .../integrationTest/resources/assembly_content.txt | 22 +++--- .../resources/dependency_classpath.txt | 22 +++--- 6 files changed, 42 insertions(+), 42 deletions(-)
[geode] branch develop updated (dafd288 -> 61a5d2d)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from dafd288 GEODE-8867: Add tests for HLEN (#5955) add 61a5d2d GEODE-8880: skip Redis PR check in 1.13 and older support branches which do not have it (#5964) No new revisions were added by this update. Summary of changes: ci/scripts/execute_tests.sh | 5 + 1 file changed, 5 insertions(+)
[geode] branch develop updated (85d340e -> ff41e49)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 85d340e GEODE-8852: Add additional tests for Redis HVALS command (#5931) add ff41e49 GEODE-8824: fix some rule overlap and unintended singleton codeowners (#5934) No new revisions were added by this update. Summary of changes: CODEOWNERS | 34 +++--- 1 file changed, 15 insertions(+), 19 deletions(-)
[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"
[geode] branch develop updated: GEODE-8841: Add version ordinals for GEODE_1_12_1 and GEODE_1_13_1 (#5914)
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 3a57b95 GEODE-8841: Add version ordinals for GEODE_1_12_1 and
GEODE_1_13_1 (#5914)
3a57b95 is described below
commit 3a57b956acc098dce083129334bbc2403d626176
Author: Jens Deppe
AuthorDate: Fri Jan 15 18:02:14 2021 -0800
GEODE-8841: Add version ordinals for GEODE_1_12_1 and GEODE_1_13_1 (#5914)
Authored-by: Jens Deppe
---
.../internal/cache/tier/sockets/CommandInitializer.java| 2 ++
.../cache/tier/sockets/CommandInitializerJUnitTest.java| 2 +-
.../apache/geode/internal/serialization/KnownVersion.java | 14 ++
3 files changed, 17 insertions(+), 1 deletion(-)
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 cbce1b2..aa9053b 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
@@ -340,7 +340,9 @@ public class CommandInitializer {
allCommands.put(KnownVersion.GEODE_1_10_0, geode18Commands);
allCommands.put(KnownVersion.GEODE_1_11_0, geode18Commands);
allCommands.put(KnownVersion.GEODE_1_12_0, geode18Commands);
+allCommands.put(KnownVersion.GEODE_1_12_1, geode18Commands);
allCommands.put(KnownVersion.GEODE_1_13_0, geode18Commands);
+allCommands.put(KnownVersion.GEODE_1_13_1, geode18Commands);
allCommands.put(KnownVersion.GEODE_1_14_0, geode18Commands);
return Collections.unmodifiableMap(allCommands);
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializerJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializerJUnitTest.java
index 6a28398..cf549a8 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializerJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializerJUnitTest.java
@@ -24,7 +24,7 @@ public class CommandInitializerJUnitTest {
public void testCommandMapContainsAllVersions() {
for (KnownVersion version : KnownVersion.getAllVersions()) {
org.junit.Assert.assertNotNull(
- "Please add a commnd set for " + version + " of Geode to
CommandInitializer",
+ "Please add a command set for " + version + " of Geode to
CommandInitializer",
CommandInitializer.getCommands(version));
}
}
diff --git
a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
index b4675b7..d3edbd5 100644
---
a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
+++
b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
@@ -285,6 +285,13 @@ public class KnownVersion extends AbstractVersion {
new KnownVersion("GEODE", "1.12.0", (byte) 1, (byte) 12, (byte) 0,
(byte) 0,
GEODE_1_12_0_ORDINAL);
+ private static final short GEODE_1_12_1_ORDINAL = 116;
+
+ @Immutable
+ public static final KnownVersion GEODE_1_12_1 =
+ new KnownVersion("GEODE", "1.12.1", (byte) 1, (byte) 12, (byte) 1,
(byte) 0,
+ GEODE_1_12_1_ORDINAL);
+
private static final short GEODE_1_13_0_ORDINAL = 120;
@Immutable
@@ -292,6 +299,13 @@ public class KnownVersion extends AbstractVersion {
new KnownVersion("GEODE", "1.13.0", (byte) 1, (byte) 13, (byte) 0,
(byte) 0,
GEODE_1_13_0_ORDINAL);
+ private static final short GEODE_1_13_1_ORDINAL = 121;
+
+ @Immutable
+ public static final KnownVersion GEODE_1_13_1 =
+ new KnownVersion("GEODE", "1.13.1", (byte) 1, (byte) 13, (byte) 1,
(byte) 0,
+ GEODE_1_13_1_ORDINAL);
+
private static final short GEODE_1_14_0_ORDINAL = 125;
@Immutable
[geode] branch develop updated: GEODE-8334: OS changes (#5917)
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 a921254 GEODE-8334: OS changes (#5917)
a921254 is described below
commit a921254fdd2b468d5255cb59e99cdfcd66d3d87f
Author: Sean Goller
AuthorDate: Fri Jan 15 16:44:59 2021 -0800
GEODE-8334: OS changes (#5917)
* Update Ubuntu to 20.04
* Use docker 19.03.14 because of breaking API changes.
---
ci/images/google-geode-builder/scripts/setup.sh | 4 +++-
ci/pipelines/images/deploy_images_pipeline.sh | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ci/images/google-geode-builder/scripts/setup.sh
b/ci/images/google-geode-builder/scripts/setup.sh
index 78b0f47..1aca957 100755
--- a/ci/images/google-geode-builder/scripts/setup.sh
+++ b/ci/images/google-geode-builder/scripts/setup.sh
@@ -40,7 +40,9 @@ DEBIAN_FRONTEND=noninteractive 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-focal" \
+docker-ce-cli="5:19.03.14~3-0~ubuntu-focal" \
git \
google-chrome-stable \
htop \
diff --git a/ci/pipelines/images/deploy_images_pipeline.sh
b/ci/pipelines/images/deploy_images_pipeline.sh
index a6f5c4d..3ee1327 100755
--- a/ci/pipelines/images/deploy_images_pipeline.sh
+++ b/ci/pipelines/images/deploy_images_pipeline.sh
@@ -72,7 +72,7 @@ pipeline-prefix: "${PIPELINE_PREFIX}"
public-pipelines: ${PUBLIC_PIPELINES}
gcp-project: ${GCP_PROJECT}
windows-base-family: windows-2016
-linux-base-family: ubuntu-minimal-1804-lts
+linux-base-family: ubuntu-minimal-2004-lts
YML
[geode] branch support/1.13 updated: GEODE-8590: Cleanup dependencies in the session state modules and GEODE-8732: Update Tomcat9 module to publish to Maven (#5903)
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
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 66b40f2 GEODE-8590: Cleanup dependencies in the session state modules
and GEODE-8732: Update Tomcat9 module to publish to Maven (#5903)
66b40f2 is described below
commit 66b40f22868d2f474bca05d35d13a49c4d30c8d5
Author: Sarah
AuthorDate: Fri Jan 15 19:29:45 2021 -0500
GEODE-8590: Cleanup dependencies in the session state modules and
GEODE-8732: Update Tomcat9 module to publish to Maven (#5903)
* GEODE-8590: Cleanup dependencies in the session state modules and
GEODE-8732: Update Tomcat9 module to publish to Maven
* Fixes Geode session state dependencies.
* Fixes module manifest project detection.
* Adds geode-junit dependency back to test module
Co-authored-by: Jacob Barrett
---
.../src/test/resources/expected-pom.xml| 18 +
.../geode-modules-session-internal/build.gradle| 22 ++-
extensions/geode-modules-test/build.gradle | 40 ---
extensions/geode-modules-tomcat7/build.gradle | 59 +
extensions/geode-modules-tomcat8/build.gradle | 77 +++---
.../src/test/resources/expected-pom.xml| 60 +
extensions/geode-modules-tomcat9/build.gradle | 52 ++-
.../src/test/resources/expected-pom.xml| 60 +
extensions/geode-modules/build.gradle | 54 ++-
.../src/test/resources/expected-pom.xml| 75 +
gradle/publish-java.gradle | 47 +
11 files changed, 359 insertions(+), 205 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 884c648..4e5d8b2 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -1065,6 +1065,24 @@
org.apache.geode
+geode-modules
+${version}
+compile
+
+
+org.apache.geode
+geode-modules-tomcat8
+${version}
+compile
+
+
+org.apache.geode
+geode-modules-tomcat9
+${version}
+compile
+
+
+org.apache.geode
geode-lucene-test
${version}
compile
diff --git a/extensions/geode-modules-session-internal/build.gradle
b/extensions/geode-modules-session-internal/build.gradle
index 55c7980..f34e326 100644
--- a/extensions/geode-modules-session-internal/build.gradle
+++ b/extensions/geode-modules-session-internal/build.gradle
@@ -1,5 +1,3 @@
-import org.apache.geode.gradle.plugins.DependencyConstraints
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -19,21 +17,11 @@ import org.apache.geode.gradle.plugins.DependencyConstraints
apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
-
-
dependencies {
- compile(platform(project(':boms:geode-all-bom')))
- compile(project(':extensions:geode-modules'))
- compile(project(':geode-core'))
- implementation(project(':geode-logging'))
+ // main
+ implementation(platform(project(':boms:geode-all-bom')))
+ implementation(project(':extensions:geode-modules'))
- implementation('javax.servlet:javax.servlet-api')
- implementation('mx4j:mx4j')
- implementation('org.apache.tomcat:servlet-api:' +
DependencyConstraints.get('tomcat6.version'))
- implementation('org.slf4j:slf4j-api')
+ compileOnly(platform(project(':boms:geode-all-bom')))
+ compileOnly('javax.servlet:javax.servlet-api')
}
-
-jar {
- baseName = 'geode-modules-session-internal'
-}
-
diff --git a/extensions/geode-modules-test/build.gradle
b/extensions/geode-modules-test/build.gradle
index 9b9ee95..47d42c6 100644
--- a/extensions/geode-modules-test/build.gradle
+++ b/extensions/geode-modules-test/build.gradle
@@ -1,5 +1,3 @@
-import org.apache.geode.gradle.plugins.DependencyConstraints
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -17,38 +15,24 @@ import org.apache.geode.gradle.plugins.DependencyConstraints
* limitations under the License.
*/
+import org.apache.geode.gradle.plugins.DependencyConstraints
+
apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+dependencies {
+ // main
+ implementation(platform(project(':boms:geode-all-bom')))
+ implementation(project(':geode-dunit'))
+ implementation('org.springframework:spring-core')
+ implementation('org.httpunit:httpunit')
+ implementation('pl.pragmatists:JU
[geode] branch support/1.12 updated: GEODE-8590: Cleanup dependencies in the session state modules and GEODE-8732: Update Tomcat9 module to publish to Maven (#5906)
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
The following commit(s) were added to refs/heads/support/1.12 by this push:
new e2c8b66 GEODE-8590: Cleanup dependencies in the session state modules
and GEODE-8732: Update Tomcat9 module to publish to Maven (#5906)
e2c8b66 is described below
commit e2c8b66b81170e51dce7e187ca225b3a7385f430
Author: Sarah
AuthorDate: Fri Jan 15 19:29:29 2021 -0500
GEODE-8590: Cleanup dependencies in the session state modules and
GEODE-8732: Update Tomcat9 module to publish to Maven (#5906)
* GEODE-8590: Cleanup dependencies in the session state modules and
GEODE-8732: Update Tomcat9 module to publish to Maven
* Fix duplicate jar issue
Co-authored-by: Jacob Barrett
---
.../src/test/resources/expected-pom.xml| 18 +
.../geode-modules-session-internal/build.gradle| 22 ++
extensions/geode-modules-test/build.gradle | 37 --
extensions/geode-modules-tomcat7/build.gradle | 68 +++---
extensions/geode-modules-tomcat8/build.gradle | 81 +++---
.../src/test/resources/expected-pom.xml| 60
extensions/geode-modules-tomcat9/build.gradle | 61 +++-
.../src/test/resources/expected-pom.xml| 60
extensions/geode-modules/build.gradle | 68 --
.../src/test/resources/expected-pom.xml| 75
gradle/publish-java.gradle | 47 +
11 files changed, 381 insertions(+), 216 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 5d604b6..2a2923f2 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -969,6 +969,24 @@
org.apache.geode
+geode-modules
+${version}
+compile
+
+
+org.apache.geode
+geode-modules-tomcat8
+${version}
+compile
+
+
+org.apache.geode
+geode-modules-tomcat9
+${version}
+compile
+
+
+org.apache.geode
geode-lucene-test
${version}
compile
diff --git a/extensions/geode-modules-session-internal/build.gradle
b/extensions/geode-modules-session-internal/build.gradle
index 02bfdf6..f34e326 100644
--- a/extensions/geode-modules-session-internal/build.gradle
+++ b/extensions/geode-modules-session-internal/build.gradle
@@ -1,5 +1,3 @@
-import org.apache.geode.gradle.plugins.DependencyConstraints
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -19,21 +17,11 @@ import org.apache.geode.gradle.plugins.DependencyConstraints
apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
-
-
dependencies {
- compile(platform(project(':boms:geode-all-bom')))
- compile(project(':extensions:geode-modules'))
- compile(project(':geode-core'))
- implementation(project(':geode-logging'))
+ // main
+ implementation(platform(project(':boms:geode-all-bom')))
+ implementation(project(':extensions:geode-modules'))
- compile('javax.servlet:javax.servlet-api')
- compile('mx4j:mx4j')
- compile('org.apache.tomcat:servlet-api:' +
DependencyConstraints.get('tomcat6.version'))
- compile('org.slf4j:slf4j-api')
+ compileOnly(platform(project(':boms:geode-all-bom')))
+ compileOnly('javax.servlet:javax.servlet-api')
}
-
-jar {
- baseName = 'geode-modules-session-internal'
-}
-
diff --git a/extensions/geode-modules-test/build.gradle
b/extensions/geode-modules-test/build.gradle
index 6d9fef3..47d42c6 100644
--- a/extensions/geode-modules-test/build.gradle
+++ b/extensions/geode-modules-test/build.gradle
@@ -1,5 +1,3 @@
-import org.apache.geode.gradle.plugins.DependencyConstraints
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -17,35 +15,24 @@ import org.apache.geode.gradle.plugins.DependencyConstraints
* limitations under the License.
*/
+import org.apache.geode.gradle.plugins.DependencyConstraints
+
apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+dependencies {
+ // main
+ implementation(platform(project(':boms:geode-all-bom')))
+ implementation(project(':geode-dunit'))
+ implementation('org.springframework:spring-core')
+ implementation('org.httpunit:httpunit')
+ implementation('pl.pragmatists:JUnitParams')
+ api(project(':extensions:geode-modules'))
-dependencies {
- compile(platform(project(':boms:geode-all-bom')))
- compile(projec
[geode] branch support/1.13 updated: [GEODE-8321] backport liberica changes to 1.12. (#5479)
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
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 0333dad [GEODE-8321] backport liberica changes to 1.12. (#5479)
0333dad is described below
commit 0333dadf166a34dd95b4042b01f3931679f94119
Author: Sean Goller
AuthorDate: Wed Aug 26 13:15:44 2020 -0700
[GEODE-8321] backport liberica changes to 1.12. (#5479)
* First pass at switching to liberica jdk. (#5312) (#5458)
Authored-by: Sean Goller
(cherry picked from commit be9a2329d1e06f1ae67baaaf875b6ff20b2922cf)
* Change all tests to use liberica instead of openjdk. (#5474)
(cherry picked from commit 43a783bcff70964ecf9cbe3e64db405945bba17c)
(cherry picked from commit cdf6846eab061def60f4dbd78f673a0919aa122b)
---
ci/docker/Dockerfile | 4 +++-
ci/images/alpine-tools/Dockerfile| 2 +-
ci/images/google-geode-builder/scripts/cache_dependencies.sh | 2 +-
ci/images/google-geode-builder/scripts/setup.sh | 6 +-
ci/images/google-windows-geode-builder/packer.json | 8 ++--
ci/images/test-container/Dockerfile | 6 ++
ci/pipelines/images/jinja.template.yml | 2 +-
ci/pipelines/shared/jinja.variables.yml | 2 +-
ci/scripts/execute_build.sh | 3 ++-
ci/scripts/execute_build_examples.sh | 3 ++-
ci/scripts/execute_publish.sh| 3 ++-
ci/scripts/execute_tests.sh | 8 ++--
ci/scripts/rsync_code_down.sh| 3 ++-
dev-tools/docker/base/Dockerfile | 2 +-
docker/Dockerfile| 3 ++-
docker/README.md | 2 +-
geode-assembly/Dockerfile| 3 ++-
gradle/docker.gradle | 2 +-
18 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile
index c37eee2..ff71a41 100644
--- a/ci/docker/Dockerfile
+++ b/ci/docker/Dockerfile
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM openjdk:8
+FROM bellsoft/liberica-openjdk-debian:8
ENTRYPOINT []
ARG CHROME_DRIVER_VERSION=2.35
@@ -33,6 +33,7 @@ RUN chmod +x /usr/local/bin/tini \
&& apt-get install -y --no-install-recommends \
apt-transport-https \
lsb-release \
+gnupg2 \
&& echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable
main" > /etc/apt/sources.list.d/google-chrome.list \
&& echo "deb http://packages.cloud.google.com/apt cloud-sdk-$(lsb_release -c
-s) main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \
&& echo "deb [arch=amd64] https://download.docker.com/linux/debian
$(lsb_release -cs) stable" | tee -a
/etc/apt/sources.list.d/google-cloud-sdk.list \
@@ -47,6 +48,7 @@ RUN chmod +x /usr/local/bin/tini \
cgroupfs-mount \
docker-ce \
docker-compose \
+git \
golang \
google-chrome-stable \
google-cloud-sdk \
diff --git a/ci/images/alpine-tools/Dockerfile
b/ci/images/alpine-tools/Dockerfile
index 5bb41da..912d6fb 100644
--- a/ci/images/alpine-tools/Dockerfile
+++ b/ci/images/alpine-tools/Dockerfile
@@ -21,7 +21,7 @@ RUN apk --no-cache add \
musl-dev \
&& go get -v github.com/masterzen/winrm-cli
-FROM openjdk:8-jdk-alpine
+FROM bellsoft/liberica-openjdk-alpine:8
COPY --from=winrm-builder /root/go/bin/winrm-cli /usr/local/bin/winrm
COPY --from=google/cloud-sdk:alpine /google-cloud-sdk /google-cloud-sdk
diff --git a/ci/images/google-geode-builder/scripts/cache_dependencies.sh
b/ci/images/google-geode-builder/scripts/cache_dependencies.sh
index e401ff8..31d7a52 100644
--- a/ci/images/google-geode-builder/scripts/cache_dependencies.sh
+++ b/ci/images/google-geode-builder/scripts/cache_dependencies.sh
@@ -19,7 +19,7 @@ set -e
WORK_DIR=$(mktemp -d)
-export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64
+export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64
echo "JAVA_HOME is [${JAVA_HOME}]"
if [ -z ${JAVA_HOME} ]; then
diff --git a/ci/images/google-geode-builder/scripts/setup.sh
b/ci/images/google-geode-builder/scripts/setup.sh
index 16a38f4..5198d21 100755
--- a/ci/images/google-geode-builder/scripts/setup.sh
+++ b/ci/images/google-geode-builder/scripts/setup.sh
@@ -29,8 +29,10 @@ apt-get install -y --no-install-recommends \
echo "deb [arch=amd6
[geode] branch develop updated: GEODE-8832: reduce mass test runs from 200/wk to 100/wk (#5902)
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 81dc39e GEODE-8832: reduce mass test runs from 200/wk to 100/wk (#5902) 81dc39e is described below commit 81dc39eb60f48af451f6a4b30e8a545cc4788620 Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Wed Jan 13 17:02:12 2021 -0800 GEODE-8832: reduce mass test runs from 200/wk to 100/wk (#5902) --- ci/pipelines/shared/jinja.variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml index 79f2f99..d9bc3aa 100644 --- a/ci/pipelines/shared/jinja.variables.yml +++ b/ci/pipelines/shared/jinja.variables.yml @@ -73,7 +73,7 @@ java_test_versions: metadata: initial_version: 1.14.0-((semver-prerelease-token)).0 - mass_test_run_iterations: 200 + mass_test_run_iterations: 100 publish_artifacts: CPUS: '8'
[geode] branch develop updated: GEODE-8496: Bump dependencies once more (#5883)
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 dc5dfef GEODE-8496: Bump dependencies once more (#5883)
dc5dfef is described below
commit dc5dfef2c98c99d57a4857bfbabed5c8beff6924
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Thu Jan 7 21:20:08 2021 -0800
GEODE-8496: Bump dependencies once more (#5883)
* Bump mockito from 3.6.28 to 3.7.0
* Bump bouncycastle from 1.67 to 1.68
* Bump cargo from 1.8.3 to 1.8.4
* Bump jedis from 3.4.0 to 3.4.1
* Bump spotless from 5.8.2 to 5.9.0
* Bump nebula.lint from 16.15.9 to 16.17.0
---
boms/geode-all-bom/src/test/resources/expected-pom.xml| 8
build.gradle | 4 ++--
.../org/apache/geode/gradle/plugins/DependencyConstraints.groovy | 8
dev-tools/dependencies/bump.sh| 2 +-
4 files changed, 11 insertions(+), 11 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 acab8be..e1f5a2b 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -424,13 +424,13 @@
org.bouncycastle
bcpkix-jdk15on
-1.67
+1.68
compile
org.codehaus.cargo
cargo-core-uberjar
-1.8.3
+1.8.4
compile
@@ -472,7 +472,7 @@
org.mockito
mockito-core
-3.6.28
+3.7.0
compile
@@ -538,7 +538,7 @@
redis.clients
jedis
-3.4.0
+3.4.1
compile
diff --git a/build.gradle b/build.gradle
index 14cf918..98a557e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -21,9 +21,9 @@ plugins {
id "base"
id "idea"
id "eclipse"
- id "com.diffplug.spotless" version "5.8.2" apply false
+ id "com.diffplug.spotless" version "5.9.0" apply false
id "com.github.ben-manes.versions" version "0.36.0" apply false
- id "nebula.lint" version "16.15.9" 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 "org.ajoberstar.grgit" version "4.1.0" apply false
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index dd6575b..79f3fad 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -149,15 +149,15 @@ class DependencyConstraints implements Plugin {
api(group: 'org.apache.shiro', name: 'shiro-core', version:
get('shiro.version'))
api(group: 'org.assertj', name: 'assertj-core', version: '3.18.1')
api(group: 'org.awaitility', name: 'awaitility', version: '4.0.3')
-api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.67')
-api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version:
'1.8.3')
+api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.68')
+api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version:
'1.8.4')
api(group: 'org.eclipse.jetty', name: 'jetty-server', version:
get('jetty.version'))
api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version:
get('jetty.version'))
api(group: 'org.eclipse.persistence', name: 'javax.persistence',
version: '2.2.1')
api(group: 'org.httpunit', name: 'httpunit', version: '1.7.3')
api(group: 'org.iq80.snappy', name: 'snappy', version: '0.4')
api(group: 'org.jgroups', name: 'jgroups', version:
get('jgroups.version'))
-api(group: 'org.mockito', name: 'mockito-core', version: '3.6.28')
+api(group: 'org.mockito', name: 'mockito-core', version: '3.7.0')
api(group: 'org.mortbay.jetty', name: 'servlet-api', version:
'3.0.20100224')
api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.26')
api(group: 'org.postgresql', name: 'postgresql', version: '42.2.8')
@@ -168,7 +168,7 @@ class DependencyConstraints implements Plugin {
api(group: 'org.springframework.shell', name: 'spring-shell', version:
'1.2.0.RELEASE')
api(group: 'org.testconta
[geode] branch develop updated (5f2a1fa -> b7774f4)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 5f2a1fa GEODE-8813: fix the flaky test by not using the same region name in multiple tests (#5884) add b7774f4 GEODE-8819: StressNewTestHelper should handle non org.apache.geode changed files (#5885) No new revisions were added by this update. Summary of changes: .../main/java/org/apache/geode/test/util/StressNewTestHelper.java | 8 +++- .../java/org/apache/geode/test/util/WhatExtendsJUnitTest.java | 6 ++ 2 files changed, 13 insertions(+), 1 deletion(-)
[geode-examples] branch develop updated: GEODE-8496: Bump gradle from 5.4 to 5.5 to match geode
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-examples.git The following commit(s) were added to refs/heads/develop by this push: new 15e25f7 GEODE-8496: Bump gradle from 5.4 to 5.5 to match geode 15e25f7 is described below commit 15e25f7c6a0e1d3f8a1993416d5d77d0d61f4e1c Author: Owen Nichols AuthorDate: Thu Jan 7 12:32:53 2021 -0800 GEODE-8496: Bump gradle from 5.4 to 5.5 to match geode --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e36600c..f7186c7 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-5.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
[geode] branch develop updated (8785b84 -> 4e59f8f)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 8785b84 GEODE-8795: Lucene queries should utilize post-processing if enabled (#5858) add 4e59f8f GEODE-8496: Bump spring from 5.3.1 to 5.3.2 (#5873) No new revisions were added by this update. Summary of changes: boms/geode-all-bom/src/test/resources/expected-pom.xml | 18 +- .../geode/gradle/plugins/DependencyConstraints.groovy | 7 +-- .../src/integrationTest/resources/assembly_content.txt | 10 +- .../integrationTest/resources/dependency_classpath.txt | 4 ++-- 4 files changed, 21 insertions(+), 18 deletions(-)
[geode-examples] branch develop updated: GEODE-8737: Create new geode example about rest api (#104)
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-examples.git The following commit(s) were added to refs/heads/develop by this push: new 54839ae GEODE-8737: Create new geode example about rest api (#104) 54839ae is described below commit 54839ae0d58f746cb153f33b72a021948183d746 Author: Ashish Choudhary AuthorDate: Tue Jan 5 04:34:38 2021 +0530 GEODE-8737: Create new geode example about rest api (#104) --- README.md | 1 + rest/README.md | 42 rest/scripts/start.gfsh| 25 +++ rest/scripts/stop.gfsh | 18 + .../org/apache/geode_examples/rest/Example.java| 78 ++ settings.gradle| 1 + 6 files changed, 165 insertions(+) diff --git a/README.md b/README.md index 53c796c..bc97af5 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ tutorial. * [Security & SSL](clientSecurity/README.md) * [Colocation](colocation/README.md) * Off-heap +* [Rest](rest/README.md) ### Advanced diff --git a/rest/README.md b/rest/README.md new file mode 100644 index 000..272a9ae --- /dev/null +++ b/rest/README.md @@ -0,0 +1,42 @@ + + +# Geode REST API example + +This is a simple example that demonstrates putting values into a +replicated region and retrieving the values using the Geode REST API. For enabling the REST API you can follow the official [document](https://geode.apache.org/docs/guide/19/rest_apps/setup_config.html#setup_config_enabling_rest). + +This example assumes you have installed Java and Geode. + +## Steps + +1. From the `geode-examples/rest` directory, build the example and + run unit tests + +$ ../gradlew build + +2. Next start the locator and two servers + +$ gfsh run --file=scripts/start.gfsh + +3. Run the example to create and get entries using HTTP Java Client from the region + +$ ../gradlew run + +4. Shut down the system: + +$ gfsh run --file=scripts/stop.gfsh diff --git a/rest/scripts/start.gfsh b/rest/scripts/start.gfsh new file mode 100644 index 000..45ea96e --- /dev/null +++ b/rest/scripts/start.gfsh @@ -0,0 +1,25 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +start locator --name=locator --bind-address=127.0.0.1 + +start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 --start-rest-api --http-service-bind-address=127.0.0.1 --http-service-port=8080 +start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 --start-rest-api --http-service-bind-address=127.0.0.1 --http-service-port=8081 + +create region --name=example-region --type=REPLICATE + +list members +describe region --name=example-region diff --git a/rest/scripts/stop.gfsh b/rest/scripts/stop.gfsh new file mode 100644 index 000..9281b31 --- /dev/null +++ b/rest/scripts/stop.gfsh @@ -0,0 +1,18 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +connect --locator=127.0.0.1[10334] +shutdown --include-locators=true \ No newline at end of file diff --git a/rest/src/main/java/org/apache/geode_examples/rest/Example.java b/rest/src/main/java/org/apache/geode_examples/rest/Example.java new file mode 100644 index 000..66bcd39 --- /dev/null +++ b/rest/src/main/java/org/apache/ge
[geode-examples] branch develop updated: GEODE-8751: geode compression example (#106)
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-examples.git The following commit(s) were added to refs/heads/develop by this push: new f0d604c GEODE-8751: geode compression example (#106) f0d604c is described below commit f0d604ceb66c42b667157ce57473ea339ba06ecd Author: Ashish Choudhary AuthorDate: Mon Jan 4 11:37:59 2021 +0530 GEODE-8751: geode compression example (#106) --- README.md | 2 +- compression/README.md | 42 +++ compression/scripts/start.gfsh | 25 + compression/scripts/stop.gfsh | 18 +++ .../apache/geode_examples/compression/Example.java | 62 ++ settings.gradle| 1 + 6 files changed, 149 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9046cf3..53c796c 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ tutorial. * Delta propagation * Network partition detection * D-lock -* Compression +* [Compression](compression/README.md) * Resource manager * PDX Advanced diff --git a/compression/README.md b/compression/README.md new file mode 100644 index 000..cf757bd --- /dev/null +++ b/compression/README.md @@ -0,0 +1,42 @@ + + +# Geode Compression example + +This is a simple example that demonstrates enabling Compression in a +replicated region. The Default compression algorithm included with Geode is Snappy. Additionally, you can specify your own compressor algorithm as well by implementing `org.apache.geode.compression.Compression` Interface. For enabling compression on a Geode region you can follow the official [document](https://geode.apache.org/docs/guide/113/managing/region_compression.html#topic_inm_whc_gl). + +This example assumes you have installed Java and Geode. + +## Steps + +1. From the `geode-examples/compression` directory, build the example and + run unit tests + +$ ../gradlew build + +2. Next start the locator, two servers and create replicated region `example-region` with `compression` enabled. + +$ gfsh run --file=scripts/start.gfsh + +3. Run the example to create and get entries using Geode Java Client from the region + +$ ../gradlew run + +4. Shut down the system: + +$ gfsh run --file=scripts/stop.gfsh diff --git a/compression/scripts/start.gfsh b/compression/scripts/start.gfsh new file mode 100644 index 000..aa0ed5f --- /dev/null +++ b/compression/scripts/start.gfsh @@ -0,0 +1,25 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +start locator --name=locator --bind-address=127.0.0.1 + +start server --name=server1 --locators=127.0.0.1[10334] --server-port=0 +start server --name=server2 --locators=127.0.0.1[10334] --server-port=0 + +create region --name=example-region --type=REPLICATE --compressor=org.apache.geode.compression.SnappyCompressor + +list members +describe region --name=example-region diff --git a/compression/scripts/stop.gfsh b/compression/scripts/stop.gfsh new file mode 100644 index 000..9281b31 --- /dev/null +++ b/compression/scripts/stop.gfsh @@ -0,0 +1,18 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +connect --locator=127.0.0.1[10334] +shutdown --include-locators=true \ No newline at end of file diff --git
[geode] branch develop updated (f416515 -> 5fc2a0c)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from f416515 Add tools.jar to integrationTest classpath for geode-core (#5871) add 5fc2a0c GEODE-8496: more dependency bumps (#5869) No new revisions were added by this update. Summary of changes: .../src/test/resources/expected-pom.xml| 30 +++--- buildSrc/build.gradle | 2 +- .../gradle/plugins/DependencyConstraints.groovy| 26 +-- .../apache/geode/session/tests/TomcatInstall.java | 4 +-- .../integrationTest/resources/assembly_content.txt | 4 +-- .../resources/dependency_classpath.txt | 4 +-- 6 files changed, 35 insertions(+), 35 deletions(-)
[geode] branch develop updated (0bdd1e6 -> f416515)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 0bdd1e6 GEODE-8496: Bump nebula-facets plugin. Fix deprecated gradle configuration use. (#5865) add f416515 Add tools.jar to integrationTest classpath for geode-core (#5871) No new revisions were added by this update. Summary of changes: geode-core/build.gradle | 2 ++ 1 file changed, 2 insertions(+)
[geode] branch develop updated: GEODE-8763: run benchmark tests up to 5 times (#5864)
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 941aa50 GEODE-8763: run benchmark tests up to 5 times (#5864)
941aa50 is described below
commit 941aa509b31649d3554d835e5aeaf82d775219d6
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Thu Dec 17 18:59:31 2020 -0800
GEODE-8763: run benchmark tests up to 5 times (#5864)
* run benchmark tests up to 5 times, this time correctly reporting failure
if still didn't pass on the 5th try
* increase benchmark timeouts
* run benchmarks on every commit even when multiple commits come in close
together
---
ci/pipelines/geode-build/jinja.template.yml | 2 ++
ci/pipelines/shared/jinja.variables.yml | 4 ++--
ci/scripts/run_benchmarks.sh| 4
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index 9ada84d..3e5b03d 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -34,6 +34,7 @@
trigger: true
passed:
- Build
+version: every
{% endmacro %}
{%- macro deep_merge(a, b): %}
@@ -476,6 +477,7 @@ jobs:
- get: geode-build-version
trigger: true
passed: *benchmark-inputs
+ version: every
- put: concourse-metadata-resource
- do:
- task: run_benchmarks{{ run_var.title }}
diff --git a/ci/pipelines/shared/jinja.variables.yml
b/ci/pipelines/shared/jinja.variables.yml
index eebb29b..79f2f99 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -29,12 +29,12 @@ benchmarks:
flag: '-PwithSsl -PtestJVM=/usr/lib/jvm/bellsoft-java11-amd64'
options: '--tests=*GetBenchmark --tests=*PutBenchmark'
max_in_flight: 1
-timeout: 3h
+timeout: 8h
- title: '_with_security_manager'
flag: '-PwithSecurityManager'
options: '--tests=Partitioned*'
max_in_flight: 2
-timeout: 5h
+timeout: 12h
build_test:
ARTIFACT_SLUG: build
diff --git a/ci/scripts/run_benchmarks.sh b/ci/scripts/run_benchmarks.sh
index 05156f5..3314bf3 100755
--- a/ci/scripts/run_benchmarks.sh
+++ b/ci/scripts/run_benchmarks.sh
@@ -85,10 +85,14 @@ do
./run_on_cluster.sh -t ${CLUSTER_TAG} -- rm /home/geode/locator10334view.dat;
if ./run_against_baseline.sh -t ${CLUSTER_TAG} -b ${GEODE_SHA} -r
${GEODE_REPO} -p ${BENCHMARKS_REPO} ${BASELINE_OPTION} -e ${BENCHMARKS_BRANCH}
-o ${RESULTS_DIR} -m
"'source':'geode-ci',${METADATA_BASELINE},'baseline_branch':'${BASELINE_BRANCH}','geode_branch':'${GEODE_SHA}'"
--ci -- ${FLAGS} ${TEST_OPTIONS} ; then
+STATUS=0
break
+ else
+STATUS=1
fi
set -e
done
popd
+exit $STATUS
\ No newline at end of file
[geode] branch develop updated (ccb032e -> b73d30e)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from ccb032e GEODE-8745: Handle race between batch destroy msg and sec event. (#5821) add b73d30e GEODE-8763: run benchmark tests up to 5 times (#5835) No new revisions were added by this update. Summary of changes: ci/scripts/run_benchmarks.sh | 18 ++ 1 file changed, 6 insertions(+), 12 deletions(-)
[geode] 01/01: GEODE-8660: Remove mavenLocal from build.gradle. (#5675)
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 06ac246c2d8374381d8b337e63dbdfb58f02cf31
Author: Udo Kohlmeyer
AuthorDate: Wed Oct 28 06:09:55 2020 +1100
GEODE-8660: Remove mavenLocal from build.gradle. (#5675)
(cherry picked from commit 5312335b532ff34778b3015db068d64d0bd2cb72)
---
build.gradle | 1 -
1 file changed, 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 67fdec4..24011dc 100755
--- a/build.gradle
+++ b/build.gradle
@@ -63,7 +63,6 @@ allprojects {
}
repositories {
-mavenLocal()
mavenCentral()
maven { url "https://repo.spring.io/release; }
}
[geode] branch support/1.12 updated (d298595 -> 06ac246)
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 d298595 GEODE-8764: Lucene Functions should request data read permission only on the specified region (#5809) add 15f16da GEODE-8774: Bump jackson-databind from 2.10.0 to 2.10.5.1 new 06ac246 GEODE-8660: Remove mavenLocal from build.gradle. (#5675) The 1 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: boms/geode-all-bom/src/test/resources/expected-pom.xml| 8 build.gradle | 1 - .../org/apache/geode/gradle/plugins/DependencyConstraints.groovy | 7 +-- geode-assembly/src/integrationTest/resources/assembly_content.txt | 6 +++--- .../src/integrationTest/resources/dependency_classpath.txt| 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-)
[geode] 01/01: GEODE-8660: Remove mavenLocal from build.gradle. (#5675)
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 8f65c5a2c81d0f96c45cc6a36317abae842bc822
Author: Udo Kohlmeyer
AuthorDate: Wed Oct 28 06:09:55 2020 +1100
GEODE-8660: Remove mavenLocal from build.gradle. (#5675)
(cherry picked from commit 5312335b532ff34778b3015db068d64d0bd2cb72)
---
build.gradle | 1 -
1 file changed, 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 2ccfb5b..0ab7e32 100755
--- a/build.gradle
+++ b/build.gradle
@@ -50,7 +50,6 @@ allprojects {
}
repositories {
-mavenLocal()
mavenCentral()
}
[geode] branch support/1.13 updated (5192620 -> 8f65c5a)
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 5192620 GEODE-8764: Lucene Functions should request data read permission only on the specified region (#5809) add 65f664e GEODE-8774: Bump jackson-databind from 2.10.1 to 2.10.5.1 new 8f65c5a GEODE-8660: Remove mavenLocal from build.gradle. (#5675) The 1 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: boms/geode-all-bom/src/test/resources/expected-pom.xml | 6 +++--- build.gradle| 1 - .../org/apache/geode/gradle/plugins/DependencyConstraints.groovy| 5 - geode-assembly/src/integrationTest/resources/assembly_content.txt | 6 +++--- .../src/integrationTest/resources/dependency_classpath.txt | 6 +++--- 5 files changed, 13 insertions(+), 11 deletions(-)
[geode] branch develop updated: GEODE-8763: run benchmark tests up to 5 times (#5806)
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 b0e06b7 GEODE-8763: run benchmark tests up to 5 times (#5806)
b0e06b7 is described below
commit b0e06b7ab5a0b70254e6752dbda8c4e4d44c3982
Author: Hale Bales
AuthorDate: Tue Dec 8 19:22:33 2020 -0800
GEODE-8763: run benchmark tests up to 5 times (#5806)
---
ci/scripts/run_benchmarks.sh | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/ci/scripts/run_benchmarks.sh b/ci/scripts/run_benchmarks.sh
index 4d32eff..580cdba 100755
--- a/ci/scripts/run_benchmarks.sh
+++ b/ci/scripts/run_benchmarks.sh
@@ -71,10 +71,6 @@ do
rm ${input}
fi
- if [[ ${i} != 5 ]]; then
-set +e
- fi
-
if [ -z "${BASELINE_VERSION}" ]; then
BASELINE_OPTION="-B ${BASELINE_BRANCH} -R ${BASELINE_REPO}"
METADATA_BASELINE="'benchmark_branch':'${BASELINE_BRANCH}'"
@@ -85,6 +81,11 @@ do
./run_on_cluster.sh -t ${CLUSTER_TAG} -- pkill -9 java
./run_on_cluster.sh -t ${CLUSTER_TAG} -- rm /home/geode/locator10334view.dat;
+
+ if [[ ${i} != 5 ]]; then
+set +e
+ fi
+
./run_against_baseline.sh -t ${CLUSTER_TAG} -b ${GEODE_SHA} -r ${GEODE_REPO}
-p ${BENCHMARKS_REPO} ${BASELINE_OPTION} -e ${BENCHMARKS_BRANCH} -o
${RESULTS_DIR} -m
"'source':'geode-ci',${METADATA_BASELINE},'baseline_branch':'${BASELINE_BRANCH}','geode_branch':'${GEODE_SHA}'"
--ci -- ${FLAGS} ${TEST_OPTIONS}
if [[ $? -eq 0 ]]; then
[geode] branch develop updated: GEODE-8496: dependency updates (#5822)
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 424cd72 GEODE-8496: dependency updates (#5822)
424cd72 is described below
commit 424cd7282e91d4af07a00f663db6affc0610035a
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Tue Dec 8 18:14:32 2020 -0800
GEODE-8496: dependency updates (#5822)
* Bump spring-security from 5.4.1 to 5.4.2
* Bump archunit from 0.12.0 to 0.14.1
* Bump fastutil from 8.4.3 to 8.4.4
* Bump httpcore from 4.4.13 to 4.4.14
* Bump istack-commons from 3.0.11 to 4.0.0
* Bump lettuce from 5.3.5.RELEASE to 6.0.1.RELEASE
* Bump dependencyUpdates from 0.28.0 to 0.36.0
* Bump nebula-lint from 16.4.0 to 16.15.9
* Bump dependency-management from 1.0.9.RELEASE to 1.0.10.RELEASE
* Bump grgit from 4.0.1 to 4.1.0
* Bump sonarqube from "2.8" to "3.0"
* Bump nebula.facet from 6.0.2 to 6.2.0
* Bump spotless from 3.28.0 to 5.8.2
* remove unused dependency jackson-module-scala_2.10
* update bump exclusions and readme
---
.../src/test/resources/expected-pom.xml| 32 +-
build.gradle | 14 +-
.../gradle/plugins/DependencyConstraints.groovy| 13 -
dev-tools/dependencies/README.md | 27 +-
dev-tools/dependencies/bump.sh | 16 ---
.../integrationTest/resources/assembly_content.txt | 6 ++--
.../resources/dependency_classpath.txt | 6 ++--
geode-assembly/src/main/dist/LICENSE | 2 +-
.../managing/logging/how_logging_works.html.md.erb | 4 +--
geode-web-api/build.gradle | 1 -
geode-web-management/build.gradle | 1 -
gradle/spotless.gradle | 2 +-
12 files changed, 49 insertions(+), 75 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 a4a3fa6..d8fec55 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -74,12 +74,6 @@
compile
-com.fasterxml.jackson.module
-jackson-module-scala_2.10
-2.11.3
-compile
-
-
com.github.davidmoten
geo
0.7.7
@@ -148,7 +142,7 @@
com.sun.istack
istack-commons-runtime
-3.0.11
+4.0.0
compile
@@ -166,7 +160,7 @@
com.tngtech.archunit
archunit-junit4
-0.12.0
+0.14.1
compile
@@ -262,7 +256,7 @@
it.unimi.dsi
fastutil
-8.4.3
+8.4.4
compile
@@ -406,7 +400,7 @@
org.apache.httpcomponents
httpcore
-4.4.13
+4.4.14
compile
@@ -550,7 +544,7 @@
io.lettuce
lettuce-core
-5.3.5.RELEASE
+6.0.1.RELEASE
compile
@@ -748,49 +742,49 @@
org.springframework.security
spring-security-config
-5.4.1
+5.4.2
compile
org.springframework.security
spring-security-core
-5.4.1
+5.4.2
compile
org.springframework.security
spring-security-ldap
-5.4.1
+5.4.2
compile
org.springframework.security
spring-security-test
-5.4.1
+5.4.2
compile
org.springframework.security
spring-security-web
-5.4.1
+5.4.2
compile
org.springframework.security
spring-security-oauth2-core
-5.4.1
+5.4.2
compile
org.springframework.security
spring-security-oauth2-client
-5.4.1
+5.4.2
compile
org.springframework.security
spring-security-oauth2-jose
-5.4.1
+5.4.2
compile
diff --git a/build.gradle b/build.gradle
index adb2afd..a3913a6 100755
--- a/build.gradle
+++ b/build.gradle
@@ -17,18 +17,18 @@
plugins {
id "wrapper"
- id "nebula.facet" version "6.0.2" apply false
+ id "nebula.facet" version "6.2.0" apply false
id "base"
id "idea"
id "eclipse"
- id "com.diffplug.gradle.spotless" version "3.28.0" apply false
- id "com.github.ben-manes.versions" version "0.28.0" apply fal
[geode] branch feature/introduce-codeowners updated: nominate myself as codeowner for dependency, license, and release scripts (#5802)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch feature/introduce-codeowners in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/introduce-codeowners by this push: new 99a03d5 nominate myself as codeowner for dependency, license, and release scripts (#5802) 99a03d5 is described below commit 99a03d51a6ef764531ed9cb101edb8b67720ed02 Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Mon Dec 7 16:53:14 2020 -0800 nominate myself as codeowner for dependency, license, and release scripts (#5802) --- CODEOWNERS | 29 +++-- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 4b4115c..54fc390 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # # CODEOWNERS and .asf.yml - owned by everyone # @@ -268,10 +284,11 @@ CODEOWNERS @apache/geode-committers #etc/** #build.gradle #buildSrc/** -#ci/** -#dev-tools/** -#docker/** -#etc/** +buildSrc/**/DependencyConstraints.groovy @onichols-pivotal +ci/** @onichols-pivotal +dev-tools/** @onichols-pivotal +docker/** @onichols-pivotal +geode-management/src/test/script/update-management-wiki.sh @onichols-pivotal #boms/** #*gradle* #static-analysis/** @@ -286,7 +303,7 @@ CODEOWNERS @apache/geode-committers #geode-docs/** #BUILDING.md #CODE_OF_CONDUCT.md -#LICENSE -#NOTICE +LICENSE @onichols-pivotal +NOTICE @onichols-pivotal #README.md #TESTING.md
[geode] branch support/1.13 updated: GEODE-8736: change docs product_version to 3 digits
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 The following commit(s) were added to refs/heads/support/1.13 by this push: new 192d709 GEODE-8736: change docs product_version to 3 digits 192d709 is described below commit 192d7096fb77d477530cdd9f2e45259011804a08 Author: Owen Nichols AuthorDate: Thu Dec 3 10:54:08 2020 -0800 GEODE-8736: change docs product_version to 3 digits --- geode-book/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geode-book/config.yml b/geode-book/config.yml index a11e805..338d164 100644 --- a/geode-book/config.yml +++ b/geode-book/config.yml @@ -27,7 +27,7 @@ sections: template_variables: product_name_long: Apache Geode product_name: Geode - product_version: '1.13' + product_version: '1.13.2' product_version_nodot: '113' product_version_geode: '1.13' min_java_version: '8'
[geode] branch support/1.12 updated: GEODE-8704: many CI failures in Jetty9CachingClientServerTest (#5754)
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
The following commit(s) were added to refs/heads/support/1.12 by this push:
new dedf644 GEODE-8704: many CI failures in Jetty9CachingClientServerTest
(#5754)
dedf644 is described below
commit dedf644d83b9e8c507bfe0404ba53e060fcd77fa
Author: Sarah <41928668+sabbe...@users.noreply.github.com>
AuthorDate: Tue Nov 17 13:07:11 2020 -0500
GEODE-8704: many CI failures in Jetty9CachingClientServerTest (#5754)
(cherry picked from commit 9a2c0d4c0ce63de678f6921e64b1444ddfc76c52)
(cherry picked from commit e4decfdc1e13d24ec87fcf5524d29b5aa11aad0a)
---
.../session/internal/filter/attributes/AbstractSessionAttributes.java | 4
.../src/main/java/org/apache/geode/session/tests/ServerContainer.java | 1 +
2 files changed, 5 insertions(+)
diff --git
a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
index aebb29e..fb9a7d6 100644
---
a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
+++
b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
@@ -68,6 +68,10 @@ public abstract class AbstractSessionAttributes implements
SessionAttributes {
private long creationTime;
+ public AbstractSessionAttributes() {
+lastAccessedTime = System.currentTimeMillis();
+ }
+
/**
* {@inheritDoc}
*/
diff --git
a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ServerContainer.java
b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ServerContainer.java
index c1cff82..e96dff8 100644
---
a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ServerContainer.java
+++
b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ServerContainer.java
@@ -202,6 +202,7 @@ public abstract class ServerContainer {
" --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED" +
" --add-opens java.base/jdk.internal.misc=ALL-UNNAMED" +
" --add-opens java.base/jdk.internal.ref=ALL-UNNAMED" +
+ " --add-opens java.base/jdk.internal.platform.cgroupv1=ALL-UNNAMED" +
" --add-opens
jdk.management/com.sun.management.internal=ALL-UNNAMED";
}
config.setProperty(GeneralPropertySet.START_JVMARGS, jvmArgs);
[geode] branch support/1.13 updated: GEODE-8704: many CI failures in Jetty9CachingClientServerTest (#5754)
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
The following commit(s) were added to refs/heads/support/1.13 by this push:
new e4decfd GEODE-8704: many CI failures in Jetty9CachingClientServerTest
(#5754)
e4decfd is described below
commit e4decfdc1e13d24ec87fcf5524d29b5aa11aad0a
Author: Sarah <41928668+sabbe...@users.noreply.github.com>
AuthorDate: Tue Nov 17 13:07:11 2020 -0500
GEODE-8704: many CI failures in Jetty9CachingClientServerTest (#5754)
(cherry picked from commit 9a2c0d4c0ce63de678f6921e64b1444ddfc76c52)
---
.../session/internal/filter/attributes/AbstractSessionAttributes.java | 4
.../src/main/java/org/apache/geode/session/tests/ServerContainer.java | 1 +
2 files changed, 5 insertions(+)
diff --git
a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
index aebb29e..fb9a7d6 100644
---
a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
+++
b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
@@ -68,6 +68,10 @@ public abstract class AbstractSessionAttributes implements
SessionAttributes {
private long creationTime;
+ public AbstractSessionAttributes() {
+lastAccessedTime = System.currentTimeMillis();
+ }
+
/**
* {@inheritDoc}
*/
diff --git
a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ServerContainer.java
b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ServerContainer.java
index c1cff82..e96dff8 100644
---
a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ServerContainer.java
+++
b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ServerContainer.java
@@ -202,6 +202,7 @@ public abstract class ServerContainer {
" --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED" +
" --add-opens java.base/jdk.internal.misc=ALL-UNNAMED" +
" --add-opens java.base/jdk.internal.ref=ALL-UNNAMED" +
+ " --add-opens java.base/jdk.internal.platform.cgroupv1=ALL-UNNAMED" +
" --add-opens
jdk.management/com.sun.management.internal=ALL-UNNAMED";
}
config.setProperty(GeneralPropertySet.START_JVMARGS, jvmArgs);
[geode] branch develop updated (cff59ed -> 4a3ac92)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from cff59ed GEODE-8736: maintain geode version for native and docs (#5765) add 4a3ac92 GEODE-8740: increase test job timeouts (#5771) No new revisions were added by this update. Summary of changes: ci/pipelines/geode-build/jinja.template.yml | 2 +- ci/pipelines/shared/jinja.variables.yml | 7 +-- 2 files changed, 6 insertions(+), 3 deletions(-)
[geode] branch support/1.13 updated: GEODE-8744: fix multiple versions of json-smart (#5776)
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
The following commit(s) were added to refs/heads/support/1.13 by this push:
new a53be62 GEODE-8744: fix multiple versions of json-smart (#5776)
a53be62 is described below
commit a53be62e1390d6032d2e077829a904d29fa42040
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Mon Nov 30 16:43:23 2020 -0800
GEODE-8744: fix multiple versions of json-smart (#5776)
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 6 ++
.../org/apache/geode/gradle/plugins/DependencyConstraints.groovy| 1 +
2 files changed, 7 insertions(+)
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 4e3dcb9..625f2d8 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -344,6 +344,12 @@
compile
+net.minidev
+json-smart
+2.3
+compile
+
+
net.openhft
compiler
2.3.5
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 3295d8e..985f534 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -135,6 +135,7 @@ class DependencyConstraints implements Plugin {
api(group: 'mysql', name: 'mysql-connector-java', version: '5.1.46')
api(group: 'net.java.dev.jna', name: 'jna', version: '5.5.0')
api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.5.0')
+api(group: 'net.minidev', name: 'json-smart', version: '2.3')
api(group: 'net.openhft', name: 'compiler', version: '2.3.5')
api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4')
api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.22.0')
[geode] branch develop updated (790af0d -> cff59ed)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 790af0d GEODE-8734: Parse netstat file to ensure correct stats are retrieved (#5764) add cff59ed GEODE-8736: maintain geode version for native and docs (#5765) No new revisions were added by this update. Summary of changes: dev-tools/release/create_support_branches.sh | 4 +- dev-tools/release/deploy_rc_pipeline.sh | 12 +++-- dev-tools/release/prepare_rc.sh | 1 + dev-tools/release/promote_rc.sh | 67 +--- dev-tools/release/set_versions.sh| 17 +-- 5 files changed, 87 insertions(+), 14 deletions(-)
[geode] branch develop updated: GEODE-8496: top up dependency updates (#5772)
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 217be41 GEODE-8496: top up dependency updates (#5772) 217be41 is described below commit 217be41f087072026ea3b411b89107700edfb5f7 Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Wed Nov 25 14:51:43 2020 -0800 GEODE-8496: top up dependency updates (#5772) * Bump jetty from 9.4.34.v20201102 to 9.4.35.v20201120 * Bump netty-all from 4.1.53.Final to 4.1.54.Final * Bump lettuce-core from 5.3.4.RELEASE to 5.3.5.RELEASE * Bump fastutil from 8.4.2 to 8.4.3 * Bump pmd from 6.28.0 to 6.29.0 * Bump tomcat9 from 9.0.39 to 9.0.40 * Bump tomcat8 from 8.5.59 to 8.5.60 * Bump tomcat7 from 7.0.106 to 7.0.107 * Bump bcpkix-jdk15on from 1.66 to 1.67 * Bump spring-boot from 2.3.4.RELEASE to 2.4.0 * Bump spring-hateoas from 1.1.2.RELEASE to 1.2.1 * Bump spring-session-data-redis from 2.3.1.RELEASE to 2.4.1 * Bump spring from 5.2.9.RELEASE to 5.3.1 * Bump junit-quickcheck from 0.9.5 to 1.0 * Bump assertj from 3.17.2 to 3.18.1 * Bump micrometer from 1.5.5 to 1.6.1 * Bump testcontainers from 1.14.3 to 1.15.0 * Bump powermock from 2.0.7 to 2.0.9 * Bump mockito from 3.5.15 to 3.6.28 * Bump log4j from 2.13.3 to 2.14.0 --- .../src/test/resources/expected-pom.xml| 76 +++--- .../gradle/plugins/DependencyConstraints.groovy| 42 ++-- .../apache/geode/session/tests/TomcatInstall.java | 6 +- .../session/tests/GenericAppServerInstall.java | 2 +- .../integrationTest/resources/assembly_content.txt | 43 ++-- .../resources/dependency_classpath.txt | 37 ++- .../integrationTest/resources/expected_jars.txt| 1 + .../cli/remote/OnlineCommandProcessor.java | 3 +- .../org/apache/geode/cache/util/AutoBalancer.java | 17 +++-- geode-wan/build.gradle | 2 +- .../support/RestServersResultCollector.java| 4 +- .../support/LoginHandlerInterceptor.java | 12 ++-- 12 files changed, 128 insertions(+), 117 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 6f52548..235c75f 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -244,13 +244,13 @@ io.micrometer micrometer-core -1.5.5 +1.6.1 compile io.netty netty-all -4.1.53.Final +4.1.54.Final compile @@ -262,7 +262,7 @@ it.unimi.dsi fastutil -8.4.2 +8.4.3 compile @@ -358,13 +358,13 @@ net.sourceforge.pmd pmd-java -6.28.0 +6.29.0 compile net.sourceforge.pmd pmd-test -6.28.0 +6.29.0 compile @@ -418,7 +418,7 @@ org.assertj assertj-core -3.17.2 +3.18.1 compile @@ -430,7 +430,7 @@ org.bouncycastle bcpkix-jdk15on -1.66 +1.67 compile @@ -442,13 +442,13 @@ org.eclipse.jetty jetty-server -9.4.34.v20201102 +9.4.35.v20201120 compile org.eclipse.jetty jetty-webapp -9.4.34.v20201102 +9.4.35.v20201120 compile @@ -478,7 +478,7 @@ org.mockito mockito-core -3.5.15 +3.6.28 compile @@ -514,7 +514,7 @@ org.springframework.hateoas spring-hateoas -1.1.2.RELEASE +1.2.1 compile @@ -532,7 +532,7 @@ org.testcontainers testcontainers -1.14.3 +1.15.0 compile @@ -550,7 +550,7 @@ io.lettuce lettuce-core -5.3.4.RELEASE +5.3.5.RELEASE compile @@ -604,13 +604,13 @@ com.pholser junit-quickcheck-core -0.9.5 +1.0 compile com.pholser junit-quickcheck-generators -0.9.5 +1.0 compile @@ -640,31 +640,31 @@ org.apache.logging.log4j log4j-api -2.13.3 +2.14.0 compile org.apache.logging.log4j log4j-core -2.13.3 +2.14.0 compile org.apache.logging.log4j log
[geode] branch develop updated (c92a91e -> 6a29ffb)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from c92a91e GEODE-8656: Fix ping only sent to one gateway receiver when several r… (#5670) add 6a29ffb add 1.13.1 to old versions on develop (#5759) No new revisions were added by this update. Summary of changes: settings.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[geode] branch support/1.12 updated: GEODE-8725: Bump jetty from 9.4.33.v20201020 to 9.4.34.v20201102
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
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 1d0cd58 GEODE-8725: Bump jetty from 9.4.33.v20201020 to
9.4.34.v20201102
1d0cd58 is described below
commit 1d0cd586730ce094caae2a574f2660873994ad86
Author: Sarah <41928668+sabbe...@users.noreply.github.com>
AuthorDate: Thu Nov 19 09:18:41 2020 -0500
GEODE-8725: Bump jetty from 9.4.33.v20201020 to 9.4.34.v20201102
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 4 ++--
.../geode/gradle/plugins/DependencyConstraints.groovy| 2 +-
.../geode/session/tests/GenericAppServerInstall.java | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 16
.../integrationTest/resources/dependency_classpath.txt | 16
5 files changed, 20 insertions(+), 20 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 a11e9ee..2741ba8 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -376,13 +376,13 @@
org.eclipse.jetty
jetty-webapp
-9.4.33.v20201020
+9.4.34.v20201102
compile
org.eclipse.jetty
jetty-server
-9.4.33.v20201020
+9.4.34.v20201102
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 6619edd..8d08eff 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -57,7 +57,7 @@ class DependencyConstraints implements Plugin {
// The jetty version is also hard-coded in geode-assembly:test
// at o.a.g.sessions.tests.GenericAppServerInstall.java
-deps.put("jetty.version", "9.4.33.v20201020")
+deps.put("jetty.version", "9.4.34.v20201102")
// These version numbers are consumed by protobuf configurations that are
plugin-specific and not
// part of the typical Gradle dependency configurations.
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
index 69e1333..01aa5a8 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
@@ -33,7 +33,7 @@ import java.util.function.IntSupplier;
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
- private static final String JETTY_VERSION = "9.4.33.v20201020";
+ private static final String JETTY_VERSION = "9.4.34.v20201102";
/**
* Get the version number, download URL, and container name of a generic app
server using
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 677163d..91ad576 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1013,14 +1013,14 @@ lib/javax.servlet-api-3.1.0.jar
lib/javax.transaction-api-1.3.jar
lib/jaxb-api-2.3.1.jar
lib/jaxb-impl-2.3.2.jar
-lib/jetty-http-9.4.33.v20201020.jar
-lib/jetty-io-9.4.33.v20201020.jar
-lib/jetty-security-9.4.33.v20201020.jar
-lib/jetty-server-9.4.33.v20201020.jar
-lib/jetty-servlet-9.4.33.v20201020.jar
-lib/jetty-util-9.4.33.v20201020.jar
-lib/jetty-webapp-9.4.33.v20201020.jar
-lib/jetty-xml-9.4.33.v20201020.jar
+lib/jetty-http-9.4.34.v20201102.jar
+lib/jetty-io-9.4.34.v20201102.jar
+lib/jetty-security-9.4.34.v20201102.jar
+lib/jetty-server-9.4.34.v20201102.jar
+lib/jetty-servlet-9.4.34.v20201102.jar
+lib/jetty-util-9.4.34.v20201102.jar
+lib/jetty-webapp-9.4.34.v20201102.jar
+lib/jetty-xml-9.4.34.v20201102.jar
lib/jgroups-3.6.14.Final.jar
lib/jline-2.12.jar
lib/jna-5.5.0.jar
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 54a693a..d2f7280 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -45,10 +45,10 @@ classgraph-4.8.52.jar
micrometer-core-1.2.1.jar
fastutil-8.3.0.jar
javax.resource-api-
[geode] branch support/1.13 updated: GEODE-8725: Bump jetty from 9.4.33.v20201020 to 9.4.34.v20201102
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
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 5bf6674 GEODE-8725: Bump jetty from 9.4.33.v20201020 to
9.4.34.v20201102
5bf6674 is described below
commit 5bf66742157b0195df1f4f01923a9000d3ea323c
Author: Sarah <41928668+sabbe...@users.noreply.github.com>
AuthorDate: Thu Nov 19 09:18:41 2020 -0500
GEODE-8725: Bump jetty from 9.4.33.v20201020 to 9.4.34.v20201102
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 4 ++--
.../geode/gradle/plugins/DependencyConstraints.groovy| 2 +-
.../geode/session/tests/GenericAppServerInstall.java | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 16
.../integrationTest/resources/dependency_classpath.txt | 16
5 files changed, 20 insertions(+), 20 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 f0bcf74..4e3dcb9 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -442,13 +442,13 @@
org.eclipse.jetty
jetty-server
-9.4.33.v20201020
+9.4.34.v20201102
compile
org.eclipse.jetty
jetty-webapp
-9.4.33.v20201020
+9.4.34.v20201102
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 65ed75c..3295d8e 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -57,7 +57,7 @@ class DependencyConstraints implements Plugin {
// The jetty version is also hard-coded in geode-assembly:test
// at o.a.g.sessions.tests.GenericAppServerInstall.java
-deps.put("jetty.version", "9.4.33.v20201020")
+deps.put("jetty.version", "9.4.34.v20201102")
// These version numbers are consumed by protobuf configurations that are
plugin-specific and not
// part of the typical Gradle dependency configurations.
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
index 69e1333..01aa5a8 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
@@ -33,7 +33,7 @@ import java.util.function.IntSupplier;
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
- private static final String JETTY_VERSION = "9.4.33.v20201020";
+ private static final String JETTY_VERSION = "9.4.34.v20201102";
/**
* Get the version number, download URL, and container name of a generic app
server using
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 97b5e96..9d85183 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1027,14 +1027,14 @@ lib/javax.servlet-api-3.1.0.jar
lib/javax.transaction-api-1.3.jar
lib/jaxb-api-2.3.1.jar
lib/jaxb-impl-2.3.2.jar
-lib/jetty-http-9.4.33.v20201020.jar
-lib/jetty-io-9.4.33.v20201020.jar
-lib/jetty-security-9.4.33.v20201020.jar
-lib/jetty-server-9.4.33.v20201020.jar
-lib/jetty-servlet-9.4.33.v20201020.jar
-lib/jetty-util-9.4.33.v20201020.jar
-lib/jetty-webapp-9.4.33.v20201020.jar
-lib/jetty-xml-9.4.33.v20201020.jar
+lib/jetty-http-9.4.34.v20201102.jar
+lib/jetty-io-9.4.34.v20201102.jar
+lib/jetty-security-9.4.34.v20201102.jar
+lib/jetty-server-9.4.34.v20201102.jar
+lib/jetty-servlet-9.4.34.v20201102.jar
+lib/jetty-util-9.4.34.v20201102.jar
+lib/jetty-webapp-9.4.34.v20201102.jar
+lib/jetty-xml-9.4.34.v20201102.jar
lib/jgroups-3.6.14.Final.jar
lib/jline-2.12.jar
lib/jna-5.5.0.jar
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 6251862..aad0b5b 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -48,10 +48,10 @@ micrometer-core-1.4.1.jar
swagger-annotations-1.5.23.jar
fastutil-8.3.1.jar
java
[geode] 02/02: cache 1.13 dependencies (not develop) for 1.13 images
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 d9a37156d150799eaef485c6a1f89042b9ebbbe6
Author: Owen Nichols
AuthorDate: Fri Nov 20 01:53:07 2020 -0800
cache 1.13 dependencies (not develop) for 1.13 images
---
ci/docker/cache_dependencies.sh | 2 +-
ci/images/google-geode-builder/scripts/cache_dependencies.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ci/docker/cache_dependencies.sh b/ci/docker/cache_dependencies.sh
index e9eba6a..ae14f0d 100644
--- a/ci/docker/cache_dependencies.sh
+++ b/ci/docker/cache_dependencies.sh
@@ -20,7 +20,7 @@ set -e
WORK_DIR=$(mktemp -d)
pushd ${WORK_DIR}
- git clone -b support/1.12 --depth 1 https://github.com/apache/geode.git geode
+ git clone -b support/1.13 --depth 1 https://github.com/apache/geode.git geode
pushd geode
./gradlew --no-daemon resolveDependencies
diff --git a/ci/images/google-geode-builder/scripts/cache_dependencies.sh
b/ci/images/google-geode-builder/scripts/cache_dependencies.sh
index bfbb8d0..e401ff8 100644
--- a/ci/images/google-geode-builder/scripts/cache_dependencies.sh
+++ b/ci/images/google-geode-builder/scripts/cache_dependencies.sh
@@ -28,7 +28,7 @@ if [ -z ${JAVA_HOME} ]; then
fi
pushd ${WORK_DIR}
- git clone -b support/1.12 --depth 1 https://github.com/apache/geode.git geode
+ git clone -b support/1.13 --depth 1 https://github.com/apache/geode.git geode
pushd geode
./gradlew --no-daemon resolveDependencies
[geode] 01/02: cache 1.12 dependencies (not develop) for 1.12 images
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 ede1fb49fe59c1839d7ffae6fd00fe8d3d5542f2
Author: Owen Nichols
AuthorDate: Fri Nov 20 01:52:08 2020 -0800
cache 1.12 dependencies (not develop) for 1.12 images
---
ci/docker/cache_dependencies.sh | 2 +-
ci/images/google-geode-builder/scripts/cache_dependencies.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ci/docker/cache_dependencies.sh b/ci/docker/cache_dependencies.sh
index 4e78223..e9eba6a 100644
--- a/ci/docker/cache_dependencies.sh
+++ b/ci/docker/cache_dependencies.sh
@@ -20,7 +20,7 @@ set -e
WORK_DIR=$(mktemp -d)
pushd ${WORK_DIR}
- git clone -b develop --depth 1 https://github.com/apache/geode.git geode
+ git clone -b support/1.12 --depth 1 https://github.com/apache/geode.git geode
pushd geode
./gradlew --no-daemon resolveDependencies
diff --git a/ci/images/google-geode-builder/scripts/cache_dependencies.sh
b/ci/images/google-geode-builder/scripts/cache_dependencies.sh
index bca4da1..bfbb8d0 100644
--- a/ci/images/google-geode-builder/scripts/cache_dependencies.sh
+++ b/ci/images/google-geode-builder/scripts/cache_dependencies.sh
@@ -28,7 +28,7 @@ if [ -z ${JAVA_HOME} ]; then
fi
pushd ${WORK_DIR}
- git clone -b develop --depth 1 https://github.com/apache/geode.git geode
+ git clone -b support/1.12 --depth 1 https://github.com/apache/geode.git geode
pushd geode
./gradlew --no-daemon resolveDependencies
[geode] branch support/1.13 updated (5ccc899 -> d9a3715)
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 5ccc899 Update exmples CI to use the builder_image (#5685) new ede1fb4 cache 1.12 dependencies (not develop) for 1.12 images new d9a3715 cache 1.13 dependencies (not develop) for 1.13 images 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/docker/cache_dependencies.sh | 2 +- ci/images/google-geode-builder/scripts/cache_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[geode] branch support/1.12 updated: cache 1.12 dependencies (not develop) for 1.12 images
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
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 080c45d cache 1.12 dependencies (not develop) for 1.12 images
080c45d is described below
commit 080c45dfc8ea9075d0bcb142d4b6867291366d2b
Author: Owen Nichols
AuthorDate: Fri Nov 20 01:52:08 2020 -0800
cache 1.12 dependencies (not develop) for 1.12 images
---
ci/docker/cache_dependencies.sh | 2 +-
ci/images/google-geode-builder/scripts/cache_dependencies.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ci/docker/cache_dependencies.sh b/ci/docker/cache_dependencies.sh
index 4e78223..e9eba6a 100644
--- a/ci/docker/cache_dependencies.sh
+++ b/ci/docker/cache_dependencies.sh
@@ -20,7 +20,7 @@ set -e
WORK_DIR=$(mktemp -d)
pushd ${WORK_DIR}
- git clone -b develop --depth 1 https://github.com/apache/geode.git geode
+ git clone -b support/1.12 --depth 1 https://github.com/apache/geode.git geode
pushd geode
./gradlew --no-daemon resolveDependencies
diff --git a/ci/images/google-geode-builder/scripts/cache_dependencies.sh
b/ci/images/google-geode-builder/scripts/cache_dependencies.sh
index 97c06c5..5071459 100644
--- a/ci/images/google-geode-builder/scripts/cache_dependencies.sh
+++ b/ci/images/google-geode-builder/scripts/cache_dependencies.sh
@@ -28,7 +28,7 @@ if [ -z ${JAVA_HOME} ]; then
fi
pushd ${WORK_DIR}
- git clone -b develop --depth 1 https://github.com/apache/geode.git geode
+ git clone -b support/1.12 --depth 1 https://github.com/apache/geode.git geode
pushd geode
./gradlew --no-daemon resolveDependencies
[geode-native] branch support/1.12 updated: parameterize GEODE_VERSION so that Geode release scripts can maintain this going forward
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-native.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 3478d98 parameterize GEODE_VERSION so that Geode release scripts can
maintain this going forward
3478d98 is described below
commit 3478d98a49936d314dcc522634543beddb53ea4a
Author: Owen Nichols
AuthorDate: Thu Nov 19 19:12:17 2020 -0800
parameterize GEODE_VERSION so that Geode release scripts can maintain this
going forward
---
.lgtm.yml | 5 +++--
.travis.yml | 2 +-
docker/Dockerfile | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.lgtm.yml b/.lgtm.yml
index 652e079..1e379cb 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -2,11 +2,12 @@ extraction:
cpp:
configure:
command:
+- GEODE_VERSION=1.12.0
- mkdir _lgtm_build_dir
- cd _lgtm_build_dir
-- wget -O apache-geode.tgz
http://mirror.transip.net/apache/geode/1.12.0/apache-geode-1.12.0.tgz
+- wget -O apache-geode.tgz
https://downloads.apache.org/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz
- tar xzf apache-geode.tgz
-- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.12.0" ..
+- cmake -DGEODE_ROOT="`pwd`/apache-geode-${GEODE_VERSION}" ..
- cd dependencies && cmake --build . -- -j2
index:
build_command:
diff --git a/.travis.yml b/.travis.yml
index 37758cf..5016ccb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ services:
env:
global:
- DOCKER_ARGS="--rm --volume=${TRAVIS_BUILD_DIR}:/geode-native"
-- DOCKER_IMAGE="apachegeode/geode-native-build:latest"
+- DOCKER_IMAGE="apachegeode/geode-native-build:1.12.0"
- SOURCE_DIR="/geode-native"
matrix:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5311272..e50127f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,6 +21,7 @@ ENV TZ=US/Pacific
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ENV CLANG_VERSION 6.0
+ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y \
libc++-dev \
@@ -46,7 +47,7 @@ RUN apt-get update && \
update-alternatives --install /usr/bin/clang-format clang-format
/usr/bin/clang-format-${CLANG_VERSION} 999
ENV GEODE_VERSION 1.12.0
-RUN wget
"https://www.apache.org/dist/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz;
--quiet -O - | \
+RUN wget
"https://downloads.apache.org/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz;
--quiet -O - | \
tar xzf -
ENV RAT_VERSION 0.13
[geode-native] branch support/1.13 updated: parameterize GEODE_VERSION so that Geode release scripts can maintain this going forward
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-native.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 6e372e5 parameterize GEODE_VERSION so that Geode release scripts can
maintain this going forward
6e372e5 is described below
commit 6e372e5c57c4ad63efb3025ae975db232a224c1e
Author: Owen Nichols
AuthorDate: Thu Nov 19 19:07:01 2020 -0800
parameterize GEODE_VERSION so that Geode release scripts can maintain this
going forward
---
.lgtm.yml | 5 +++--
.travis.yml | 2 +-
docker/Dockerfile | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.lgtm.yml b/.lgtm.yml
index 70b0840..070db64 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -2,11 +2,12 @@ extraction:
cpp:
configure:
command:
+- GEODE_VERSION=1.13.1
- mkdir _lgtm_build_dir
- cd _lgtm_build_dir
-- wget -O apache-geode.tgz
http://mirror.transip.net/apache/geode/1.13.1/apache-geode-1.13.1.tgz
+- wget -O apache-geode.tgz
https://downloads.apache.org/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz
- tar xzf apache-geode.tgz
-- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.13.1" ..
+- cmake -DGEODE_ROOT="`pwd`/apache-geode-${GEODE_VERSION}" ..
- cd dependencies && cmake --build . -- -j2
index:
build_command:
diff --git a/.travis.yml b/.travis.yml
index 37758cf..55f3686 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ services:
env:
global:
- DOCKER_ARGS="--rm --volume=${TRAVIS_BUILD_DIR}:/geode-native"
-- DOCKER_IMAGE="apachegeode/geode-native-build:latest"
+- DOCKER_IMAGE="apachegeode/geode-native-build:1.13.1"
- SOURCE_DIR="/geode-native"
matrix:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 260a11d..90fb2a8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,6 +21,7 @@ ENV TZ=US/Pacific
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ENV CLANG_VERSION 6.0
+ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y \
libc++-dev \
[geode-native] branch develop updated: parameterize GEODE_VERSION so that Geode release scripts can maintain this going forward
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-native.git
The following commit(s) were added to refs/heads/develop by this push:
new fcf95b3 parameterize GEODE_VERSION so that Geode release scripts can
maintain this going forward
fcf95b3 is described below
commit fcf95b32773783e86976e34c0ccfc9987fa63fec
Author: Owen Nichols
AuthorDate: Thu Nov 19 19:01:58 2020 -0800
parameterize GEODE_VERSION so that Geode release scripts can maintain this
going forward
---
.lgtm.yml | 5 +++--
docker/Dockerfile | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.lgtm.yml b/.lgtm.yml
index 70b0840..070db64 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -2,11 +2,12 @@ extraction:
cpp:
configure:
command:
+- GEODE_VERSION=1.13.1
- mkdir _lgtm_build_dir
- cd _lgtm_build_dir
-- wget -O apache-geode.tgz
http://mirror.transip.net/apache/geode/1.13.1/apache-geode-1.13.1.tgz
+- wget -O apache-geode.tgz
https://downloads.apache.org/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz
- tar xzf apache-geode.tgz
-- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.13.1" ..
+- cmake -DGEODE_ROOT="`pwd`/apache-geode-${GEODE_VERSION}" ..
- cd dependencies && cmake --build . -- -j2
index:
build_command:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index cfc4ddb..43860c8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -46,12 +46,12 @@ RUN apt-get update && \
update-alternatives --install /usr/bin/clang-tidyclang-tidy
/usr/bin/clang-tidy-${CLANG_VERSION} 999 && \
update-alternatives --install /usr/bin/clang-format clang-format
/usr/bin/clang-format-${CLANG_VERSION} 999
-ENV GEODE_VERSION 1.12.0
-RUN wget
"https://www.apache.org/dyn/closer.cgi?action=download=geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz;
--quiet -O - | \
+ENV GEODE_VERSION 1.13.1
+RUN wget
"https://downloads.apache.org/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz;
--quiet -O - | \
tar xzf -
ENV RAT_VERSION 0.13
-RUN wget
"https://www.apache.org/dyn/closer.cgi?action=download=creadur/apache-rat-${RAT_VERSION}/apache-rat-${RAT_VERSION}-bin.tar.gz;
--quiet -O - | \
+RUN wget
"https://archive.apache.org/dist/creadur/apache-rat-${RAT_VERSION}/apache-rat-${RAT_VERSION}-bin.tar.gz;
--quiet -O - | \
tar xzf -
ENV CMAKE_VERSION 3.16.8
[geode] 01/02: [GEODE-8661] Use version provided by *-builder-image-family. (#5681)
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 ed4644f93043b6e460b45387cbb6fd6ad43ac516
Author: Sean Goller
AuthorDate: Wed Oct 28 08:48:13 2020 -0700
[GEODE-8661] Use version provided by *-builder-image-family. (#5681)
(cherry picked from commit 828e84dec4be132314f4f99b3644c377fae1171b)
(cherry picked from commit 3728eb2efa6abb71287a42c668f1d9a0077dd2f2)
---
ci/pipelines/geode-build/jinja.template.yml | 8 +++-
ci/pipelines/pull-request/jinja.template.yml | 4
ci/scripts/create_instance.sh| 9 -
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index 7adefcc..79ae842 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -278,7 +278,7 @@ jobs:
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
JAVA_BUILD_VERSION: {{ java_build_version.version }}
- IMAGE_FAMILY_NAME: ((pipeline-prefix))linux-geode-builder
+ IMAGE_FAMILY_NAME: ((pipeline-prefix)){{ build_test.PLATFORM
}}-geode-builder
run:
path: geode-ci/ci/scripts/create_instance.sh
inputs:
@@ -287,6 +287,8 @@ jobs:
- name: concourse-metadata-resource
- name: geode
- name: geode-ci
+- name: {{ build_test.PLATFORM }}-builder-image-family
+ path: builder-image
outputs:
- name: attempts-log
path: new
@@ -563,6 +565,8 @@ jobs:
- name: geode
- name: attempts-log
path: old
+ - name: linux-builder-image-family
+path: builder-image
outputs:
- name: instance-data
- name: attempts-log
@@ -650,6 +654,8 @@ jobs:
- name: geode
- name: attempts-log
path: old
+ - name: {{ test.PLATFORM}}-builder-image-family
+path: builder-image
outputs:
- name: instance-data-{{java_test_version.name}}
path: instance-data
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index a4ee439..4733eea 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -135,6 +135,8 @@ jobs:
- name: geode-ci
- name: attempts-log
path: old
+- name: {{ test.PLATFORM}}-builder-image-family
+ path: builder-image
outputs:
- name: instance-data
- name: attempts-log
@@ -293,6 +295,8 @@ jobs:
- name: geode-ci
- name: attempts-log
path: old
+- name: {{ test.PLATFORM}}-builder-image-family
+ path: builder-image
outputs:
- name: instance-data
- name: attempts-log
diff --git a/ci/scripts/create_instance.sh b/ci/scripts/create_instance.sh
index b21ade0..c00a0cf 100755
--- a/ci/scripts/create_instance.sh
+++ b/ci/scripts/create_instance.sh
@@ -75,6 +75,13 @@
INSTANCE_NAME_STRING="${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-build${JAVA_BUILD
INSTANCE_NAME="heavy-lifter-$(uuidgen -n @dns -s -N "${INSTANCE_NAME_STRING}")"
echo "Hashed ${INSTANCE_NAME_STRING} (${#INSTANCE_NAME_STRING} chars) ->
${INSTANCE_NAME} (${#INSTANCE_NAME} chars)"
+IMAGE_SELF_LINK=$(cat builder-image/output.json | jq -r '.selfLink')
+IMAGE_NAME=$(cat builder-image/output.json | jq -r '.name')
+
+if [[ -z "${IMAGE_NAME}" ]]; then
+ echo "Unable to determine proper heavy lifter image to use. Aborting!"
+ exit 1
+fi
MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
@@ -121,7 +128,7 @@ INSTANCE_INFORMATION=$(gcloud compute
--project=${GCP_PROJECT} instances create
--min-cpu-platform=Intel\ Skylake \
--network="${GCP_NETWORK}" \
--subnet="${GCP_SUBNETWORK}" \
- --image-family="${IMAGE_FAMILY_NAME}" \
+ --image="${IMAGE_NAME}" \
--boot-disk-size=100GB \
--boot-disk-type=pd-ssd \
--labels="${LABELS}" \
[geode] 02/02: Update exmples CI to use the builder_image (#5685)
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 c9795c3582955c39dacc5f9e8573c55e08009e61 Author: Robert Houghton AuthorDate: Wed Oct 28 15:30:51 2020 -0700 Update exmples CI to use the builder_image (#5685) (cherry picked from commit 5953aad1edc659660ab0772d262cd48ca5ec11ce) (cherry picked from commit 5ccc89934bcd788e14cc94c626ceec0e916cca1f) --- ci/pipelines/examples/jinja.template.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/pipelines/examples/jinja.template.yml b/ci/pipelines/examples/jinja.template.yml index eb4ec1a..cd9ff8e 100644 --- a/ci/pipelines/examples/jinja.template.yml +++ b/ci/pipelines/examples/jinja.template.yml @@ -141,6 +141,8 @@ jobs: - name: geode-ci - name: attempts-log path: old + - name: linux-builder-image-family +path: builder-image outputs: - name: instance-data - name: attempts-log
[geode] branch support/1.12 updated (3d92903 -> c9795c3)
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 3d92903 GEODE-8718: Bump shiro from 1.6.0 to 1.7.0 new ed4644f [GEODE-8661] Use version provided by *-builder-image-family. (#5681) new c9795c3 Update exmples CI to use the builder_image (#5685) 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/pipelines/examples/jinja.template.yml | 2 ++ ci/pipelines/geode-build/jinja.template.yml | 8 +++- ci/pipelines/pull-request/jinja.template.yml | 4 ci/scripts/create_instance.sh| 9 - 4 files changed, 21 insertions(+), 2 deletions(-)
[geode] 02/02: Update exmples CI to use the builder_image (#5685)
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 5ccc89934bcd788e14cc94c626ceec0e916cca1f Author: Robert Houghton AuthorDate: Wed Oct 28 15:30:51 2020 -0700 Update exmples CI to use the builder_image (#5685) (cherry picked from commit 5953aad1edc659660ab0772d262cd48ca5ec11ce) --- ci/pipelines/examples/jinja.template.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/pipelines/examples/jinja.template.yml b/ci/pipelines/examples/jinja.template.yml index eb4ec1a..cd9ff8e 100644 --- a/ci/pipelines/examples/jinja.template.yml +++ b/ci/pipelines/examples/jinja.template.yml @@ -141,6 +141,8 @@ jobs: - name: geode-ci - name: attempts-log path: old + - name: linux-builder-image-family +path: builder-image outputs: - name: instance-data - name: attempts-log
[geode] branch support/1.13 updated (3728eb2 -> 5ccc899)
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 3728eb2 [GEODE-8661] Use version provided by *-builder-image-family. (#5681) new 5067d04 dependency on repo.spring.io is not needed new 5ccc899 Update exmples CI to use the builder_image (#5685) 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: build.gradle | 1 - ci/pipelines/examples/jinja.template.yml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)
[geode] 01/02: dependency on repo.spring.io is not needed
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 5067d0470bc75c6cdf0fe97dab274efcfeef4cba
Author: Owen Nichols
AuthorDate: Thu Nov 19 02:41:43 2020 -0800
dependency on repo.spring.io is not needed
---
build.gradle | 1 -
1 file changed, 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index a1865fb..2ccfb5b 100755
--- a/build.gradle
+++ b/build.gradle
@@ -52,7 +52,6 @@ allprojects {
repositories {
mavenLocal()
mavenCentral()
-maven { url "https://repo.spring.io/release; }
}
buildRoot = buildRoot.trim()
[geode-native] branch develop updated (9fdb183 -> 0f4a3be)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git. from 9fdb183 GEODE-2484: Removes ACE_DLL (#591) add 0f4a3be fix Geode pairing No new revisions were added by this update. Summary of changes: .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode-native] branch support/1.13 updated: fix Geode pairing
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-native.git The following commit(s) were added to refs/heads/support/1.13 by this push: new 40bf062 fix Geode pairing 40bf062 is described below commit 40bf0626a9a349121b4d59979bef14af7e53f750 Author: Owen Nichols AuthorDate: Thu Nov 19 03:23:18 2020 -0800 fix Geode pairing --- .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index 652e079..70b0840 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -4,9 +4,9 @@ extraction: command: - mkdir _lgtm_build_dir - cd _lgtm_build_dir -- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.12.0/apache-geode-1.12.0.tgz +- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.13.1/apache-geode-1.13.1.tgz - tar xzf apache-geode.tgz -- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.12.0" .. +- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.13.1" .. - cd dependencies && cmake --build . -- -j2 index: build_command:
[geode-native] branch support/1.12 updated: fix Geode pairing
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-native.git The following commit(s) were added to refs/heads/support/1.12 by this push: new 96137e9 fix Geode pairing 96137e9 is described below commit 96137e90e527c6eed626c5c56f4b397c505b8fa9 Author: Owen Nichols AuthorDate: Thu Nov 19 03:21:51 2020 -0800 fix Geode pairing --- .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index cda763f..652e079 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -4,9 +4,9 @@ extraction: command: - mkdir _lgtm_build_dir - cd _lgtm_build_dir -- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.10.0/apache-geode-1.10.0.tgz +- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.12.0/apache-geode-1.12.0.tgz - tar xzf apache-geode.tgz -- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.10.0" .. +- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.12.0" .. - cd dependencies && cmake --build . -- -j2 index: build_command:
[geode-native] branch support/1.12 updated: fix Geode pairing
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-native.git The following commit(s) were added to refs/heads/support/1.12 by this push: new 96137e9 fix Geode pairing 96137e9 is described below commit 96137e90e527c6eed626c5c56f4b397c505b8fa9 Author: Owen Nichols AuthorDate: Thu Nov 19 03:21:51 2020 -0800 fix Geode pairing --- .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index cda763f..652e079 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -4,9 +4,9 @@ extraction: command: - mkdir _lgtm_build_dir - cd _lgtm_build_dir -- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.10.0/apache-geode-1.10.0.tgz +- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.12.0/apache-geode-1.12.0.tgz - tar xzf apache-geode.tgz -- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.10.0" .. +- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.12.0" .. - cd dependencies && cmake --build . -- -j2 index: build_command:
[geode-native] branch develop updated (9fdb183 -> 0f4a3be)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git. from 9fdb183 GEODE-2484: Removes ACE_DLL (#591) add 0f4a3be fix Geode pairing No new revisions were added by this update. Summary of changes: .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode-native] branch support/1.13 updated: fix Geode pairing
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-native.git The following commit(s) were added to refs/heads/support/1.13 by this push: new 40bf062 fix Geode pairing 40bf062 is described below commit 40bf0626a9a349121b4d59979bef14af7e53f750 Author: Owen Nichols AuthorDate: Thu Nov 19 03:23:18 2020 -0800 fix Geode pairing --- .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index 652e079..70b0840 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -4,9 +4,9 @@ extraction: command: - mkdir _lgtm_build_dir - cd _lgtm_build_dir -- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.12.0/apache-geode-1.12.0.tgz +- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.13.1/apache-geode-1.13.1.tgz - tar xzf apache-geode.tgz -- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.12.0" .. +- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.13.1" .. - cd dependencies && cmake --build . -- -j2 index: build_command:
[geode-native] branch develop updated (9fdb183 -> 0f4a3be)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git. from 9fdb183 GEODE-2484: Removes ACE_DLL (#591) add 0f4a3be fix Geode pairing No new revisions were added by this update. Summary of changes: .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode-native] branch support/1.13 updated: fix Geode pairing
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-native.git The following commit(s) were added to refs/heads/support/1.13 by this push: new 40bf062 fix Geode pairing 40bf062 is described below commit 40bf0626a9a349121b4d59979bef14af7e53f750 Author: Owen Nichols AuthorDate: Thu Nov 19 03:23:18 2020 -0800 fix Geode pairing --- .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index 652e079..70b0840 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -4,9 +4,9 @@ extraction: command: - mkdir _lgtm_build_dir - cd _lgtm_build_dir -- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.12.0/apache-geode-1.12.0.tgz +- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.13.1/apache-geode-1.13.1.tgz - tar xzf apache-geode.tgz -- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.12.0" .. +- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.13.1" .. - cd dependencies && cmake --build . -- -j2 index: build_command:
[geode-native] branch support/1.12 updated: fix Geode pairing
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-native.git The following commit(s) were added to refs/heads/support/1.12 by this push: new 96137e9 fix Geode pairing 96137e9 is described below commit 96137e90e527c6eed626c5c56f4b397c505b8fa9 Author: Owen Nichols AuthorDate: Thu Nov 19 03:21:51 2020 -0800 fix Geode pairing --- .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index cda763f..652e079 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -4,9 +4,9 @@ extraction: command: - mkdir _lgtm_build_dir - cd _lgtm_build_dir -- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.10.0/apache-geode-1.10.0.tgz +- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.12.0/apache-geode-1.12.0.tgz - tar xzf apache-geode.tgz -- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.10.0" .. +- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.12.0" .. - cd dependencies && cmake --build . -- -j2 index: build_command:
[geode-native] branch develop updated (9fdb183 -> 0f4a3be)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git. from 9fdb183 GEODE-2484: Removes ACE_DLL (#591) add 0f4a3be fix Geode pairing No new revisions were added by this update. Summary of changes: .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode-native] branch support/1.13 updated: fix Geode pairing
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-native.git The following commit(s) were added to refs/heads/support/1.13 by this push: new 40bf062 fix Geode pairing 40bf062 is described below commit 40bf0626a9a349121b4d59979bef14af7e53f750 Author: Owen Nichols AuthorDate: Thu Nov 19 03:23:18 2020 -0800 fix Geode pairing --- .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index 652e079..70b0840 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -4,9 +4,9 @@ extraction: command: - mkdir _lgtm_build_dir - cd _lgtm_build_dir -- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.12.0/apache-geode-1.12.0.tgz +- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.13.1/apache-geode-1.13.1.tgz - tar xzf apache-geode.tgz -- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.12.0" .. +- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.13.1" .. - cd dependencies && cmake --build . -- -j2 index: build_command:
[geode-native] branch support/1.12 updated: fix Geode pairing
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-native.git The following commit(s) were added to refs/heads/support/1.12 by this push: new 96137e9 fix Geode pairing 96137e9 is described below commit 96137e90e527c6eed626c5c56f4b397c505b8fa9 Author: Owen Nichols AuthorDate: Thu Nov 19 03:21:51 2020 -0800 fix Geode pairing --- .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index cda763f..652e079 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -4,9 +4,9 @@ extraction: command: - mkdir _lgtm_build_dir - cd _lgtm_build_dir -- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.10.0/apache-geode-1.10.0.tgz +- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.12.0/apache-geode-1.12.0.tgz - tar xzf apache-geode.tgz -- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.10.0" .. +- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.12.0" .. - cd dependencies && cmake --build . -- -j2 index: build_command:
[geode-native] branch develop updated (9fdb183 -> 0f4a3be)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git. from 9fdb183 GEODE-2484: Removes ACE_DLL (#591) add 0f4a3be fix Geode pairing No new revisions were added by this update. Summary of changes: .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode-native] branch support/1.13 updated: fix Geode pairing
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-native.git The following commit(s) were added to refs/heads/support/1.13 by this push: new 40bf062 fix Geode pairing 40bf062 is described below commit 40bf0626a9a349121b4d59979bef14af7e53f750 Author: Owen Nichols AuthorDate: Thu Nov 19 03:23:18 2020 -0800 fix Geode pairing --- .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index 652e079..70b0840 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -4,9 +4,9 @@ extraction: command: - mkdir _lgtm_build_dir - cd _lgtm_build_dir -- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.12.0/apache-geode-1.12.0.tgz +- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.13.1/apache-geode-1.13.1.tgz - tar xzf apache-geode.tgz -- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.12.0" .. +- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.13.1" .. - cd dependencies && cmake --build . -- -j2 index: build_command:
[geode-native] branch support/1.12 updated: fix Geode pairing
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-native.git The following commit(s) were added to refs/heads/support/1.12 by this push: new 96137e9 fix Geode pairing 96137e9 is described below commit 96137e90e527c6eed626c5c56f4b397c505b8fa9 Author: Owen Nichols AuthorDate: Thu Nov 19 03:21:51 2020 -0800 fix Geode pairing --- .lgtm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index cda763f..652e079 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -4,9 +4,9 @@ extraction: command: - mkdir _lgtm_build_dir - cd _lgtm_build_dir -- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.10.0/apache-geode-1.10.0.tgz +- wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.12.0/apache-geode-1.12.0.tgz - tar xzf apache-geode.tgz -- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.10.0" .. +- cmake -DGEODE_ROOT="`pwd`/apache-geode-1.12.0" .. - cd dependencies && cmake --build . -- -j2 index: build_command:
[geode] branch support/1.13 updated: [GEODE-8661] Use version provided by *-builder-image-family. (#5681)
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
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 3728eb2 [GEODE-8661] Use version provided by *-builder-image-family.
(#5681)
3728eb2 is described below
commit 3728eb2efa6abb71287a42c668f1d9a0077dd2f2
Author: Sean Goller
AuthorDate: Wed Oct 28 08:48:13 2020 -0700
[GEODE-8661] Use version provided by *-builder-image-family. (#5681)
(cherry picked from commit 828e84dec4be132314f4f99b3644c377fae1171b)
---
ci/pipelines/geode-build/jinja.template.yml | 8 +++-
ci/pipelines/pull-request/jinja.template.yml | 4
ci/scripts/create_instance.sh| 9 -
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index afa27d9..d19eb33 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -278,7 +278,7 @@ jobs:
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
JAVA_BUILD_VERSION: {{ java_build_version.version }}
- IMAGE_FAMILY_NAME: ((pipeline-prefix))linux-geode-builder
+ IMAGE_FAMILY_NAME: ((pipeline-prefix)){{ build_test.PLATFORM
}}-geode-builder
run:
path: geode-ci/ci/scripts/create_instance.sh
inputs:
@@ -287,6 +287,8 @@ jobs:
- name: concourse-metadata-resource
- name: geode
- name: geode-ci
+- name: {{ build_test.PLATFORM }}-builder-image-family
+ path: builder-image
outputs:
- name: attempts-log
path: new
@@ -563,6 +565,8 @@ jobs:
- name: geode
- name: attempts-log
path: old
+ - name: linux-builder-image-family
+path: builder-image
outputs:
- name: instance-data
- name: attempts-log
@@ -650,6 +654,8 @@ jobs:
- name: geode
- name: attempts-log
path: old
+ - name: {{ test.PLATFORM}}-builder-image-family
+path: builder-image
outputs:
- name: instance-data-{{java_test_version.name}}
path: instance-data
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index fe42139..9d99526 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -140,6 +140,8 @@ jobs:
- name: geode-ci
- name: attempts-log
path: old
+- name: {{ test.PLATFORM}}-builder-image-family
+ path: builder-image
outputs:
- name: instance-data
- name: attempts-log
@@ -300,6 +302,8 @@ jobs:
- name: geode-ci
- name: attempts-log
path: old
+- name: {{ test.PLATFORM}}-builder-image-family
+ path: builder-image
outputs:
- name: instance-data
- name: attempts-log
diff --git a/ci/scripts/create_instance.sh b/ci/scripts/create_instance.sh
index 9f51d43..775a236 100755
--- a/ci/scripts/create_instance.sh
+++ b/ci/scripts/create_instance.sh
@@ -75,6 +75,13 @@
INSTANCE_NAME_STRING="${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-build${JAVA_BUILD
INSTANCE_NAME="heavy-lifter-$(uuidgen -n @dns -s -N "${INSTANCE_NAME_STRING}")"
echo "Hashed ${INSTANCE_NAME_STRING} (${#INSTANCE_NAME_STRING} chars) ->
${INSTANCE_NAME} (${#INSTANCE_NAME} chars)"
+IMAGE_SELF_LINK=$(cat builder-image/output.json | jq -r '.selfLink')
+IMAGE_NAME=$(cat builder-image/output.json | jq -r '.name')
+
+if [[ -z "${IMAGE_NAME}" ]]; then
+ echo "Unable to determine proper heavy lifter image to use. Aborting!"
+ exit 1
+fi
MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
@@ -121,7 +128,7 @@ INSTANCE_INFORMATION=$(gcloud compute
--project=${GCP_PROJECT} instances create
--min-cpu-platform=Intel\ Skylake \
--network="${GCP_NETWORK}" \
--subnet="${GCP_SUBNETWORK}" \
- --image-family="${IMAGE_FAMILY_NAME}" \
+ --image="${IMAGE_NAME}" \
--boot-disk-size=100GB \
--boot-disk-type=pd-ssd \
--labels="${LABELS}" \
[geode] branch support/1.13 updated: [GEODE-8661] Use version provided by *-builder-image-family. (#5681)
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
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 3728eb2 [GEODE-8661] Use version provided by *-builder-image-family.
(#5681)
3728eb2 is described below
commit 3728eb2efa6abb71287a42c668f1d9a0077dd2f2
Author: Sean Goller
AuthorDate: Wed Oct 28 08:48:13 2020 -0700
[GEODE-8661] Use version provided by *-builder-image-family. (#5681)
(cherry picked from commit 828e84dec4be132314f4f99b3644c377fae1171b)
---
ci/pipelines/geode-build/jinja.template.yml | 8 +++-
ci/pipelines/pull-request/jinja.template.yml | 4
ci/scripts/create_instance.sh| 9 -
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index afa27d9..d19eb33 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -278,7 +278,7 @@ jobs:
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
JAVA_BUILD_VERSION: {{ java_build_version.version }}
- IMAGE_FAMILY_NAME: ((pipeline-prefix))linux-geode-builder
+ IMAGE_FAMILY_NAME: ((pipeline-prefix)){{ build_test.PLATFORM
}}-geode-builder
run:
path: geode-ci/ci/scripts/create_instance.sh
inputs:
@@ -287,6 +287,8 @@ jobs:
- name: concourse-metadata-resource
- name: geode
- name: geode-ci
+- name: {{ build_test.PLATFORM }}-builder-image-family
+ path: builder-image
outputs:
- name: attempts-log
path: new
@@ -563,6 +565,8 @@ jobs:
- name: geode
- name: attempts-log
path: old
+ - name: linux-builder-image-family
+path: builder-image
outputs:
- name: instance-data
- name: attempts-log
@@ -650,6 +654,8 @@ jobs:
- name: geode
- name: attempts-log
path: old
+ - name: {{ test.PLATFORM}}-builder-image-family
+path: builder-image
outputs:
- name: instance-data-{{java_test_version.name}}
path: instance-data
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index fe42139..9d99526 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -140,6 +140,8 @@ jobs:
- name: geode-ci
- name: attempts-log
path: old
+- name: {{ test.PLATFORM}}-builder-image-family
+ path: builder-image
outputs:
- name: instance-data
- name: attempts-log
@@ -300,6 +302,8 @@ jobs:
- name: geode-ci
- name: attempts-log
path: old
+- name: {{ test.PLATFORM}}-builder-image-family
+ path: builder-image
outputs:
- name: instance-data
- name: attempts-log
diff --git a/ci/scripts/create_instance.sh b/ci/scripts/create_instance.sh
index 9f51d43..775a236 100755
--- a/ci/scripts/create_instance.sh
+++ b/ci/scripts/create_instance.sh
@@ -75,6 +75,13 @@
INSTANCE_NAME_STRING="${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-build${JAVA_BUILD
INSTANCE_NAME="heavy-lifter-$(uuidgen -n @dns -s -N "${INSTANCE_NAME_STRING}")"
echo "Hashed ${INSTANCE_NAME_STRING} (${#INSTANCE_NAME_STRING} chars) ->
${INSTANCE_NAME} (${#INSTANCE_NAME} chars)"
+IMAGE_SELF_LINK=$(cat builder-image/output.json | jq -r '.selfLink')
+IMAGE_NAME=$(cat builder-image/output.json | jq -r '.name')
+
+if [[ -z "${IMAGE_NAME}" ]]; then
+ echo "Unable to determine proper heavy lifter image to use. Aborting!"
+ exit 1
+fi
MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
@@ -121,7 +128,7 @@ INSTANCE_INFORMATION=$(gcloud compute
--project=${GCP_PROJECT} instances create
--min-cpu-platform=Intel\ Skylake \
--network="${GCP_NETWORK}" \
--subnet="${GCP_SUBNETWORK}" \
- --image-family="${IMAGE_FAMILY_NAME}" \
+ --image="${IMAGE_NAME}" \
--boot-disk-size=100GB \
--boot-disk-type=pd-ssd \
--labels="${LABELS}" \
[geode-native] branch support/1.13 updated: GEODE-8724: Fix compilation using docker image (#696)
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-native.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new ba85630 GEODE-8724: Fix compilation using docker image (#696)
ba85630 is described below
commit ba85630388e51a7ae7a73529dafa10172ca9d85a
Author: Mario Salazar de Torres
AuthorDate: Wed Nov 18 22:53:36 2020 +0100
GEODE-8724: Fix compilation using docker image (#696)
- As latest tag for ubuntu base image was recently change from 18.04 to
20.04 it seems that some libraries version changed, like for example
libc++.
- As it seems with this new version libc++ headers are either not
anymore located within /usr/include/c++/v1 or the symlink is missing.
- So in order to solve that a symlink is manually created to ensure
clang is able to find libc++ headers.
(cherry picked from commit 4e241ffe6f6bda0254f97cdfe18929ce81d04ace)
---
docker/Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 851bf48..260a11d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -37,6 +37,7 @@ RUN apt-get update && \
openjdk-8-jdk \
wget && \
rm -rf /var/lib/apt/lists/* && \
+ln -s /usr/lib/llvm-*/include/c++/v1/ /usr/include/c++/v1 && \
update-alternatives --install /usr/bin/clang clang
/usr/bin/clang-${CLANG_VERSION} 999 && \
update-alternatives --install /usr/bin/clang++ clang++
/usr/bin/clang++-${CLANG_VERSION} 999 && \
update-alternatives --install /usr/bin/cccc
/usr/bin/clang-${CLANG_VERSION} 999 && \
[geode-native] branch support/1.13 updated: GEODE-8724: Fix compilation using docker image (#696)
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-native.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new ba85630 GEODE-8724: Fix compilation using docker image (#696)
ba85630 is described below
commit ba85630388e51a7ae7a73529dafa10172ca9d85a
Author: Mario Salazar de Torres
AuthorDate: Wed Nov 18 22:53:36 2020 +0100
GEODE-8724: Fix compilation using docker image (#696)
- As latest tag for ubuntu base image was recently change from 18.04 to
20.04 it seems that some libraries version changed, like for example
libc++.
- As it seems with this new version libc++ headers are either not
anymore located within /usr/include/c++/v1 or the symlink is missing.
- So in order to solve that a symlink is manually created to ensure
clang is able to find libc++ headers.
(cherry picked from commit 4e241ffe6f6bda0254f97cdfe18929ce81d04ace)
---
docker/Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 851bf48..260a11d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -37,6 +37,7 @@ RUN apt-get update && \
openjdk-8-jdk \
wget && \
rm -rf /var/lib/apt/lists/* && \
+ln -s /usr/lib/llvm-*/include/c++/v1/ /usr/include/c++/v1 && \
update-alternatives --install /usr/bin/clang clang
/usr/bin/clang-${CLANG_VERSION} 999 && \
update-alternatives --install /usr/bin/clang++ clang++
/usr/bin/clang++-${CLANG_VERSION} 999 && \
update-alternatives --install /usr/bin/cccc
/usr/bin/clang-${CLANG_VERSION} 999 && \
[geode-native] branch support/1.12 updated: GEODE-8724: Fix compilation using docker image (#696)
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-native.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new c26387e GEODE-8724: Fix compilation using docker image (#696)
c26387e is described below
commit c26387e564412e259d154606caf84551a59c361f
Author: Mario Salazar de Torres
AuthorDate: Wed Nov 18 22:53:36 2020 +0100
GEODE-8724: Fix compilation using docker image (#696)
- As latest tag for ubuntu base image was recently change from 18.04 to
20.04 it seems that some libraries version changed, like for example
libc++.
- As it seems with this new version libc++ headers are either not
anymore located within /usr/include/c++/v1 or the symlink is missing.
- So in order to solve that a symlink is manually created to ensure
clang is able to find libc++ headers.
(cherry picked from commit 4e241ffe6f6bda0254f97cdfe18929ce81d04ace)
---
docker/Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 233cd8c..5311272 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -37,6 +37,7 @@ RUN apt-get update && \
openjdk-8-jdk \
wget && \
rm -rf /var/lib/apt/lists/* && \
+ln -s /usr/lib/llvm-*/include/c++/v1/ /usr/include/c++/v1 && \
update-alternatives --install /usr/bin/clang clang
/usr/bin/clang-${CLANG_VERSION} 999 && \
update-alternatives --install /usr/bin/clang++ clang++
/usr/bin/clang++-${CLANG_VERSION} 999 && \
update-alternatives --install /usr/bin/cccc
/usr/bin/clang-${CLANG_VERSION} 999 && \
[geode] branch support/1.12 updated (b027331 -> 3d92903)
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 b027331 GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733) new 741b0b4 GEODE-8682: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 new 3d92903 GEODE-8718: Bump shiro from 1.6.0 to 1.7.0 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: .../src/test/resources/expected-pom.xml| 6 ++-- .../gradle/plugins/DependencyConstraints.groovy| 4 +-- .../rest/ListIndexManagementDUnitTest.java | 3 +- .../session/tests/GenericAppServerInstall.java | 2 +- .../integrationTest/resources/assembly_content.txt | 34 +++--- .../resources/dependency_classpath.txt | 34 +++--- .../geode/management/configuration/Index.java | 4 ++- .../geode/management/configuration/IndexTest.java | 24 +++ 8 files changed, 56 insertions(+), 55 deletions(-)
[geode] 02/02: GEODE-8718: Bump shiro from 1.6.0 to 1.7.0
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 3d929034e9f06041e93b592b0fb18fb8a8e29c13
Author: Owen Nichols
AuthorDate: Tue Nov 17 21:18:01 2020 -0800
GEODE-8718: Bump shiro from 1.6.0 to 1.7.0
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 18 +-
.../integrationTest/resources/dependency_classpath.txt | 18 +-
4 files changed, 20 insertions(+), 20 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 df799d9..a11e9ee 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -346,7 +346,7 @@
org.apache.shiro
shiro-core
-1.6.0
+1.7.0
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 6cbd020..6619edd 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -42,7 +42,7 @@ class DependencyConstraints implements Plugin {
deps.put("jgroups.version", "3.6.14.Final")
deps.put("log4j.version", "2.12.1")
deps.put("micrometer.version", "1.2.1")
-deps.put("shiro.version", "1.6.0")
+deps.put("shiro.version", "1.7.0")
deps.put("slf4j-api.version", "1.7.28")
// These version numbers are used in testing various versions of tomcat
and are consumed explicitly
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index effda08..677163d 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1044,15 +1044,15 @@ lib/netty-all-4.1.48.Final.jar
lib/protobuf-java-3.10.0.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.6.0.jar
-lib/shiro-config-core-1.6.0.jar
-lib/shiro-config-ogdl-1.6.0.jar
-lib/shiro-core-1.6.0.jar
-lib/shiro-crypto-cipher-1.6.0.jar
-lib/shiro-crypto-core-1.6.0.jar
-lib/shiro-crypto-hash-1.6.0.jar
-lib/shiro-event-1.6.0.jar
-lib/shiro-lang-1.6.0.jar
+lib/shiro-cache-1.7.0.jar
+lib/shiro-config-core-1.7.0.jar
+lib/shiro-config-ogdl-1.7.0.jar
+lib/shiro-core-1.7.0.jar
+lib/shiro-crypto-cipher-1.7.0.jar
+lib/shiro-crypto-core-1.7.0.jar
+lib/shiro-crypto-hash-1.7.0.jar
+lib/shiro-event-1.7.0.jar
+lib/shiro-lang-1.7.0.jar
lib/slf4j-api-1.7.28.jar
lib/snappy-0.4.jar
lib/spring-beans-5.2.9.RELEASE.jar
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 5f99eb8..54a693a 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -34,8 +34,8 @@ antlr-2.7.7.jar
javax.activation-1.2.0.jar
istack-commons-runtime-3.0.9.jar
commons-validator-1.6.jar
-shiro-core-1.6.0.jar
-shiro-config-ogdl-1.6.0.jar
+shiro-core-1.7.0.jar
+shiro-config-ogdl-1.7.0.jar
commons-beanutils-1.9.4.jar
commons-collections-3.2.2.jar
commons-io-2.6.jar
@@ -56,13 +56,13 @@ jopt-simple-5.0.4.jar
httpcore-4.4.12.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.6.0.jar
-shiro-crypto-hash-1.6.0.jar
-shiro-crypto-cipher-1.6.0.jar
-shiro-config-core-1.6.0.jar
-shiro-event-1.6.0.jar
-shiro-crypto-core-1.6.0.jar
-shiro-lang-1.6.0.jar
+shiro-cache-1.7.0.jar
+shiro-crypto-hash-1.7.0.jar
+shiro-crypto-cipher-1.7.0.jar
+shiro-config-core-1.7.0.jar
+shiro-event-1.7.0.jar
+shiro-crypto-core-1.7.0.jar
+shiro-lang-1.7.0.jar
slf4j-api-1.7.28.jar
swagger-annotations-1.5.23.jar
spring-core-5.2.9.RELEASE.jar
[geode] 01/02: GEODE-8682: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020
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 741b0b462193c79fc5965a7789e14a86148d0ca2
Author: Owen Nichols
AuthorDate: Tue Nov 17 21:17:15 2020 -0800
GEODE-8682: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020
This reverts the previous revert commit
4060542d8162ca466b27269f52dc7a312a2ed257.
---
.../src/test/resources/expected-pom.xml| 4 ++--
.../gradle/plugins/DependencyConstraints.groovy| 2 +-
.../rest/ListIndexManagementDUnitTest.java | 3 ++-
.../session/tests/GenericAppServerInstall.java | 2 +-
.../integrationTest/resources/assembly_content.txt | 16 +++
.../resources/dependency_classpath.txt | 16 +++
.../geode/management/configuration/Index.java | 4 +++-
.../geode/management/configuration/IndexTest.java | 24 ++
8 files changed, 36 insertions(+), 35 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 9d5ed5d..df799d9 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -376,13 +376,13 @@
org.eclipse.jetty
jetty-webapp
-9.4.21.v20190926
+9.4.33.v20201020
compile
org.eclipse.jetty
jetty-server
-9.4.21.v20190926
+9.4.33.v20201020
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 08b4eb3..6cbd020 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -57,7 +57,7 @@ class DependencyConstraints implements Plugin {
// The jetty version is also hard-coded in geode-assembly:test
// at o.a.g.sessions.tests.GenericAppServerInstall.java
-deps.put("jetty.version", "9.4.21.v20190926")
+deps.put("jetty.version", "9.4.33.v20201020")
// These version numbers are consumed by protobuf configurations that are
plugin-specific and not
// part of the typical Gradle dependency configurations.
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
index 96d5ace..2573346 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
@@ -184,7 +184,8 @@ public class ListIndexManagementDUnitTest {
public void getIndex_fails_when_region_name_is_missing_from_filter() {
indexConfig.setName("index1");
assertThatThrownBy(() -> cms.get(indexConfig))
-.hasMessageContaining("Error while extracting response for type");
+.isInstanceOf(IllegalArgumentException.class)
+.hasMessageContaining("Unable to construct the URI with the current
configuration");
}
@Test
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
index a93e581..69e1333 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
@@ -33,7 +33,7 @@ import java.util.function.IntSupplier;
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
- private static final String JETTY_VERSION = "9.4.21.v20190926";
+ private static final String JETTY_VERSION = "9.4.33.v20201020";
/**
* Get the version number, download URL, and container name of a generic app
server using
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index eee6daa..effda08 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1013,14 +1013,14 @@ lib/javax.servlet-api-3.1.0.jar
lib/javax.transaction-api-1.3.jar
lib/jaxb-api-2.3.1.jar
lib/jaxb-impl-2.3.2.jar
-lib/jetty-http-9.4.21.v20190926.jar
-lib/jetty-io-9.4.21.v2019
[geode] 02/02: GEODE-8718: Bump shiro from 1.6.0 to 1.7.0
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 3d929034e9f06041e93b592b0fb18fb8a8e29c13
Author: Owen Nichols
AuthorDate: Tue Nov 17 21:18:01 2020 -0800
GEODE-8718: Bump shiro from 1.6.0 to 1.7.0
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 18 +-
.../integrationTest/resources/dependency_classpath.txt | 18 +-
4 files changed, 20 insertions(+), 20 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 df799d9..a11e9ee 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -346,7 +346,7 @@
org.apache.shiro
shiro-core
-1.6.0
+1.7.0
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 6cbd020..6619edd 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -42,7 +42,7 @@ class DependencyConstraints implements Plugin {
deps.put("jgroups.version", "3.6.14.Final")
deps.put("log4j.version", "2.12.1")
deps.put("micrometer.version", "1.2.1")
-deps.put("shiro.version", "1.6.0")
+deps.put("shiro.version", "1.7.0")
deps.put("slf4j-api.version", "1.7.28")
// These version numbers are used in testing various versions of tomcat
and are consumed explicitly
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index effda08..677163d 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1044,15 +1044,15 @@ lib/netty-all-4.1.48.Final.jar
lib/protobuf-java-3.10.0.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.6.0.jar
-lib/shiro-config-core-1.6.0.jar
-lib/shiro-config-ogdl-1.6.0.jar
-lib/shiro-core-1.6.0.jar
-lib/shiro-crypto-cipher-1.6.0.jar
-lib/shiro-crypto-core-1.6.0.jar
-lib/shiro-crypto-hash-1.6.0.jar
-lib/shiro-event-1.6.0.jar
-lib/shiro-lang-1.6.0.jar
+lib/shiro-cache-1.7.0.jar
+lib/shiro-config-core-1.7.0.jar
+lib/shiro-config-ogdl-1.7.0.jar
+lib/shiro-core-1.7.0.jar
+lib/shiro-crypto-cipher-1.7.0.jar
+lib/shiro-crypto-core-1.7.0.jar
+lib/shiro-crypto-hash-1.7.0.jar
+lib/shiro-event-1.7.0.jar
+lib/shiro-lang-1.7.0.jar
lib/slf4j-api-1.7.28.jar
lib/snappy-0.4.jar
lib/spring-beans-5.2.9.RELEASE.jar
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 5f99eb8..54a693a 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -34,8 +34,8 @@ antlr-2.7.7.jar
javax.activation-1.2.0.jar
istack-commons-runtime-3.0.9.jar
commons-validator-1.6.jar
-shiro-core-1.6.0.jar
-shiro-config-ogdl-1.6.0.jar
+shiro-core-1.7.0.jar
+shiro-config-ogdl-1.7.0.jar
commons-beanutils-1.9.4.jar
commons-collections-3.2.2.jar
commons-io-2.6.jar
@@ -56,13 +56,13 @@ jopt-simple-5.0.4.jar
httpcore-4.4.12.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.6.0.jar
-shiro-crypto-hash-1.6.0.jar
-shiro-crypto-cipher-1.6.0.jar
-shiro-config-core-1.6.0.jar
-shiro-event-1.6.0.jar
-shiro-crypto-core-1.6.0.jar
-shiro-lang-1.6.0.jar
+shiro-cache-1.7.0.jar
+shiro-crypto-hash-1.7.0.jar
+shiro-crypto-cipher-1.7.0.jar
+shiro-config-core-1.7.0.jar
+shiro-event-1.7.0.jar
+shiro-crypto-core-1.7.0.jar
+shiro-lang-1.7.0.jar
slf4j-api-1.7.28.jar
swagger-annotations-1.5.23.jar
spring-core-5.2.9.RELEASE.jar
[geode] 01/02: GEODE-8682: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020
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 741b0b462193c79fc5965a7789e14a86148d0ca2
Author: Owen Nichols
AuthorDate: Tue Nov 17 21:17:15 2020 -0800
GEODE-8682: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020
This reverts the previous revert commit
4060542d8162ca466b27269f52dc7a312a2ed257.
---
.../src/test/resources/expected-pom.xml| 4 ++--
.../gradle/plugins/DependencyConstraints.groovy| 2 +-
.../rest/ListIndexManagementDUnitTest.java | 3 ++-
.../session/tests/GenericAppServerInstall.java | 2 +-
.../integrationTest/resources/assembly_content.txt | 16 +++
.../resources/dependency_classpath.txt | 16 +++
.../geode/management/configuration/Index.java | 4 +++-
.../geode/management/configuration/IndexTest.java | 24 ++
8 files changed, 36 insertions(+), 35 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 9d5ed5d..df799d9 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -376,13 +376,13 @@
org.eclipse.jetty
jetty-webapp
-9.4.21.v20190926
+9.4.33.v20201020
compile
org.eclipse.jetty
jetty-server
-9.4.21.v20190926
+9.4.33.v20201020
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 08b4eb3..6cbd020 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -57,7 +57,7 @@ class DependencyConstraints implements Plugin {
// The jetty version is also hard-coded in geode-assembly:test
// at o.a.g.sessions.tests.GenericAppServerInstall.java
-deps.put("jetty.version", "9.4.21.v20190926")
+deps.put("jetty.version", "9.4.33.v20201020")
// These version numbers are consumed by protobuf configurations that are
plugin-specific and not
// part of the typical Gradle dependency configurations.
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
index 96d5ace..2573346 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
@@ -184,7 +184,8 @@ public class ListIndexManagementDUnitTest {
public void getIndex_fails_when_region_name_is_missing_from_filter() {
indexConfig.setName("index1");
assertThatThrownBy(() -> cms.get(indexConfig))
-.hasMessageContaining("Error while extracting response for type");
+.isInstanceOf(IllegalArgumentException.class)
+.hasMessageContaining("Unable to construct the URI with the current
configuration");
}
@Test
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
index a93e581..69e1333 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
@@ -33,7 +33,7 @@ import java.util.function.IntSupplier;
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
- private static final String JETTY_VERSION = "9.4.21.v20190926";
+ private static final String JETTY_VERSION = "9.4.33.v20201020";
/**
* Get the version number, download URL, and container name of a generic app
server using
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index eee6daa..effda08 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1013,14 +1013,14 @@ lib/javax.servlet-api-3.1.0.jar
lib/javax.transaction-api-1.3.jar
lib/jaxb-api-2.3.1.jar
lib/jaxb-impl-2.3.2.jar
-lib/jetty-http-9.4.21.v20190926.jar
-lib/jetty-io-9.4.21.v2019
[geode] branch support/1.12 updated (b027331 -> 3d92903)
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 b027331 GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733) new 741b0b4 GEODE-8682: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 new 3d92903 GEODE-8718: Bump shiro from 1.6.0 to 1.7.0 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: .../src/test/resources/expected-pom.xml| 6 ++-- .../gradle/plugins/DependencyConstraints.groovy| 4 +-- .../rest/ListIndexManagementDUnitTest.java | 3 +- .../session/tests/GenericAppServerInstall.java | 2 +- .../integrationTest/resources/assembly_content.txt | 34 +++--- .../resources/dependency_classpath.txt | 34 +++--- .../geode/management/configuration/Index.java | 4 ++- .../geode/management/configuration/IndexTest.java | 24 +++ 8 files changed, 56 insertions(+), 55 deletions(-)
[geode] 02/02: GEODE-8718: Bump shiro from 1.6.0 to 1.7.0
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 212386e2b53dbc18a647e0a40bd0846d3a250018
Author: Owen Nichols
AuthorDate: Tue Nov 17 21:15:27 2020 -0800
GEODE-8718: Bump shiro from 1.6.0 to 1.7.0
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 18 +-
.../integrationTest/resources/dependency_classpath.txt | 18 +-
4 files changed, 20 insertions(+), 20 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 75ae8fc..f0bcf74 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -412,7 +412,7 @@
org.apache.shiro
shiro-core
-1.6.0
+1.7.0
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 375ac4a..65ed75c 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -42,7 +42,7 @@ class DependencyConstraints implements Plugin {
deps.put("jgroups.version", "3.6.14.Final")
deps.put("log4j.version", "2.13.1")
deps.put("micrometer.version", "1.4.1")
-deps.put("shiro.version", "1.6.0")
+deps.put("shiro.version", "1.7.0")
deps.put("slf4j-api.version", "1.7.30")
// These version numbers are used in testing various versions of tomcat
and are consumed explicitly
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 48bd348..97b5e96 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1058,15 +1058,15 @@ lib/netty-all-4.1.48.Final.jar
lib/protobuf-java-3.11.4.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.6.0.jar
-lib/shiro-config-core-1.6.0.jar
-lib/shiro-config-ogdl-1.6.0.jar
-lib/shiro-core-1.6.0.jar
-lib/shiro-crypto-cipher-1.6.0.jar
-lib/shiro-crypto-core-1.6.0.jar
-lib/shiro-crypto-hash-1.6.0.jar
-lib/shiro-event-1.6.0.jar
-lib/shiro-lang-1.6.0.jar
+lib/shiro-cache-1.7.0.jar
+lib/shiro-config-core-1.7.0.jar
+lib/shiro-config-ogdl-1.7.0.jar
+lib/shiro-core-1.7.0.jar
+lib/shiro-crypto-cipher-1.7.0.jar
+lib/shiro-crypto-core-1.7.0.jar
+lib/shiro-crypto-hash-1.7.0.jar
+lib/shiro-event-1.7.0.jar
+lib/shiro-lang-1.7.0.jar
lib/slf4j-api-1.7.30.jar
lib/snappy-0.4.jar
lib/spring-beans-5.2.9.RELEASE.jar
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index a8d1174..6251862 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -36,8 +36,8 @@ javax.activation-1.2.0.jar
istack-commons-runtime-3.0.11.jar
jaxb-impl-2.3.2.jar
commons-validator-1.6.jar
-shiro-core-1.6.0.jar
-shiro-config-ogdl-1.6.0.jar
+shiro-core-1.7.0.jar
+shiro-config-ogdl-1.7.0.jar
commons-beanutils-1.9.4.jar
commons-codec-1.14.jar
commons-collections-3.2.2.jar
@@ -58,13 +58,13 @@ jna-5.5.0.jar
jopt-simple-5.0.4.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.6.0.jar
-shiro-crypto-hash-1.6.0.jar
-shiro-crypto-cipher-1.6.0.jar
-shiro-config-core-1.6.0.jar
-shiro-event-1.6.0.jar
-shiro-crypto-core-1.6.0.jar
-shiro-lang-1.6.0.jar
+shiro-cache-1.7.0.jar
+shiro-crypto-hash-1.7.0.jar
+shiro-crypto-cipher-1.7.0.jar
+shiro-config-core-1.7.0.jar
+shiro-event-1.7.0.jar
+shiro-crypto-core-1.7.0.jar
+shiro-lang-1.7.0.jar
slf4j-api-1.7.30.jar
spring-core-5.2.9.RELEASE.jar
javax.activation-api-1.2.0.jar
[geode] 01/02: GEODE-8496: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 (#5574)
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 4bf7350680a1ef4e5db8e61fe9c16323c91b20dd
Author: Owen Nichols
AuthorDate: Tue Nov 17 21:12:26 2020 -0800
GEODE-8496: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 (#5574)
This reverts the previous revert commit
6b8f5b03cc3c0927cd7eef23e5cc627a780f8a0c.
---
.../src/test/resources/expected-pom.xml| 4 ++--
.../gradle/plugins/DependencyConstraints.groovy| 2 +-
.../rest/ListIndexManagementDUnitTest.java | 3 ++-
.../session/tests/GenericAppServerInstall.java | 2 +-
.../integrationTest/resources/assembly_content.txt | 16 +++
.../resources/dependency_classpath.txt | 16 +++
.../geode/management/configuration/Index.java | 4 +++-
.../geode/management/configuration/IndexTest.java | 24 ++
8 files changed, 36 insertions(+), 35 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 45f57d9..75ae8fc 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -442,13 +442,13 @@
org.eclipse.jetty
jetty-server
-9.4.21.v20190926
+9.4.33.v20201020
compile
org.eclipse.jetty
jetty-webapp
-9.4.21.v20190926
+9.4.33.v20201020
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 01ae79f..375ac4a 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -57,7 +57,7 @@ class DependencyConstraints implements Plugin {
// The jetty version is also hard-coded in geode-assembly:test
// at o.a.g.sessions.tests.GenericAppServerInstall.java
-deps.put("jetty.version", "9.4.21.v20190926")
+deps.put("jetty.version", "9.4.33.v20201020")
// These version numbers are consumed by protobuf configurations that are
plugin-specific and not
// part of the typical Gradle dependency configurations.
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
index 96d5ace..2573346 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
@@ -184,7 +184,8 @@ public class ListIndexManagementDUnitTest {
public void getIndex_fails_when_region_name_is_missing_from_filter() {
indexConfig.setName("index1");
assertThatThrownBy(() -> cms.get(indexConfig))
-.hasMessageContaining("Error while extracting response for type");
+.isInstanceOf(IllegalArgumentException.class)
+.hasMessageContaining("Unable to construct the URI with the current
configuration");
}
@Test
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
index a93e581..69e1333 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
@@ -33,7 +33,7 @@ import java.util.function.IntSupplier;
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
- private static final String JETTY_VERSION = "9.4.21.v20190926";
+ private static final String JETTY_VERSION = "9.4.33.v20201020";
/**
* Get the version number, download URL, and container name of a generic app
server using
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index d71a251..48bd348 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1027,14 +1027,14 @@ lib/javax.servlet-api-3.1.0.jar
lib/javax.transaction-api-1.3.jar
lib/jaxb-api-2.3.1.jar
lib/jaxb-impl-2.3.2.jar
-lib/jetty-http-9.4.21.v20190926.jar
-lib/jetty-io-9.4.21.
[geode] branch support/1.13 updated (c19849c -> 212386e)
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 c19849c apache-geode 1.13.1 new 4bf7350 GEODE-8496: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 (#5574) new 212386e GEODE-8718: Bump shiro from 1.6.0 to 1.7.0 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: .../src/test/resources/expected-pom.xml| 6 ++-- .../gradle/plugins/DependencyConstraints.groovy| 4 +-- .../rest/ListIndexManagementDUnitTest.java | 3 +- .../session/tests/GenericAppServerInstall.java | 2 +- .../integrationTest/resources/assembly_content.txt | 34 +++--- .../resources/dependency_classpath.txt | 34 +++--- .../geode/management/configuration/Index.java | 4 ++- .../geode/management/configuration/IndexTest.java | 24 +++ 8 files changed, 56 insertions(+), 55 deletions(-)
[geode] 02/02: GEODE-8718: Bump shiro from 1.6.0 to 1.7.0
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 212386e2b53dbc18a647e0a40bd0846d3a250018
Author: Owen Nichols
AuthorDate: Tue Nov 17 21:15:27 2020 -0800
GEODE-8718: Bump shiro from 1.6.0 to 1.7.0
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 18 +-
.../integrationTest/resources/dependency_classpath.txt | 18 +-
4 files changed, 20 insertions(+), 20 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 75ae8fc..f0bcf74 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -412,7 +412,7 @@
org.apache.shiro
shiro-core
-1.6.0
+1.7.0
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 375ac4a..65ed75c 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -42,7 +42,7 @@ class DependencyConstraints implements Plugin {
deps.put("jgroups.version", "3.6.14.Final")
deps.put("log4j.version", "2.13.1")
deps.put("micrometer.version", "1.4.1")
-deps.put("shiro.version", "1.6.0")
+deps.put("shiro.version", "1.7.0")
deps.put("slf4j-api.version", "1.7.30")
// These version numbers are used in testing various versions of tomcat
and are consumed explicitly
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 48bd348..97b5e96 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1058,15 +1058,15 @@ lib/netty-all-4.1.48.Final.jar
lib/protobuf-java-3.11.4.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.6.0.jar
-lib/shiro-config-core-1.6.0.jar
-lib/shiro-config-ogdl-1.6.0.jar
-lib/shiro-core-1.6.0.jar
-lib/shiro-crypto-cipher-1.6.0.jar
-lib/shiro-crypto-core-1.6.0.jar
-lib/shiro-crypto-hash-1.6.0.jar
-lib/shiro-event-1.6.0.jar
-lib/shiro-lang-1.6.0.jar
+lib/shiro-cache-1.7.0.jar
+lib/shiro-config-core-1.7.0.jar
+lib/shiro-config-ogdl-1.7.0.jar
+lib/shiro-core-1.7.0.jar
+lib/shiro-crypto-cipher-1.7.0.jar
+lib/shiro-crypto-core-1.7.0.jar
+lib/shiro-crypto-hash-1.7.0.jar
+lib/shiro-event-1.7.0.jar
+lib/shiro-lang-1.7.0.jar
lib/slf4j-api-1.7.30.jar
lib/snappy-0.4.jar
lib/spring-beans-5.2.9.RELEASE.jar
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index a8d1174..6251862 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -36,8 +36,8 @@ javax.activation-1.2.0.jar
istack-commons-runtime-3.0.11.jar
jaxb-impl-2.3.2.jar
commons-validator-1.6.jar
-shiro-core-1.6.0.jar
-shiro-config-ogdl-1.6.0.jar
+shiro-core-1.7.0.jar
+shiro-config-ogdl-1.7.0.jar
commons-beanutils-1.9.4.jar
commons-codec-1.14.jar
commons-collections-3.2.2.jar
@@ -58,13 +58,13 @@ jna-5.5.0.jar
jopt-simple-5.0.4.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.6.0.jar
-shiro-crypto-hash-1.6.0.jar
-shiro-crypto-cipher-1.6.0.jar
-shiro-config-core-1.6.0.jar
-shiro-event-1.6.0.jar
-shiro-crypto-core-1.6.0.jar
-shiro-lang-1.6.0.jar
+shiro-cache-1.7.0.jar
+shiro-crypto-hash-1.7.0.jar
+shiro-crypto-cipher-1.7.0.jar
+shiro-config-core-1.7.0.jar
+shiro-event-1.7.0.jar
+shiro-crypto-core-1.7.0.jar
+shiro-lang-1.7.0.jar
slf4j-api-1.7.30.jar
spring-core-5.2.9.RELEASE.jar
javax.activation-api-1.2.0.jar
[geode] branch support/1.13 updated (c19849c -> 212386e)
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 c19849c apache-geode 1.13.1 new 4bf7350 GEODE-8496: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 (#5574) new 212386e GEODE-8718: Bump shiro from 1.6.0 to 1.7.0 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: .../src/test/resources/expected-pom.xml| 6 ++-- .../gradle/plugins/DependencyConstraints.groovy| 4 +-- .../rest/ListIndexManagementDUnitTest.java | 3 +- .../session/tests/GenericAppServerInstall.java | 2 +- .../integrationTest/resources/assembly_content.txt | 34 +++--- .../resources/dependency_classpath.txt | 34 +++--- .../geode/management/configuration/Index.java | 4 ++- .../geode/management/configuration/IndexTest.java | 24 +++ 8 files changed, 56 insertions(+), 55 deletions(-)
[geode] 01/02: GEODE-8496: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 (#5574)
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 4bf7350680a1ef4e5db8e61fe9c16323c91b20dd
Author: Owen Nichols
AuthorDate: Tue Nov 17 21:12:26 2020 -0800
GEODE-8496: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 (#5574)
This reverts the previous revert commit
6b8f5b03cc3c0927cd7eef23e5cc627a780f8a0c.
---
.../src/test/resources/expected-pom.xml| 4 ++--
.../gradle/plugins/DependencyConstraints.groovy| 2 +-
.../rest/ListIndexManagementDUnitTest.java | 3 ++-
.../session/tests/GenericAppServerInstall.java | 2 +-
.../integrationTest/resources/assembly_content.txt | 16 +++
.../resources/dependency_classpath.txt | 16 +++
.../geode/management/configuration/Index.java | 4 +++-
.../geode/management/configuration/IndexTest.java | 24 ++
8 files changed, 36 insertions(+), 35 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 45f57d9..75ae8fc 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -442,13 +442,13 @@
org.eclipse.jetty
jetty-server
-9.4.21.v20190926
+9.4.33.v20201020
compile
org.eclipse.jetty
jetty-webapp
-9.4.21.v20190926
+9.4.33.v20201020
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 01ae79f..375ac4a 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -57,7 +57,7 @@ class DependencyConstraints implements Plugin {
// The jetty version is also hard-coded in geode-assembly:test
// at o.a.g.sessions.tests.GenericAppServerInstall.java
-deps.put("jetty.version", "9.4.21.v20190926")
+deps.put("jetty.version", "9.4.33.v20201020")
// These version numbers are consumed by protobuf configurations that are
plugin-specific and not
// part of the typical Gradle dependency configurations.
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
index 96d5ace..2573346 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
@@ -184,7 +184,8 @@ public class ListIndexManagementDUnitTest {
public void getIndex_fails_when_region_name_is_missing_from_filter() {
indexConfig.setName("index1");
assertThatThrownBy(() -> cms.get(indexConfig))
-.hasMessageContaining("Error while extracting response for type");
+.isInstanceOf(IllegalArgumentException.class)
+.hasMessageContaining("Unable to construct the URI with the current
configuration");
}
@Test
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
index a93e581..69e1333 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
@@ -33,7 +33,7 @@ import java.util.function.IntSupplier;
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
- private static final String JETTY_VERSION = "9.4.21.v20190926";
+ private static final String JETTY_VERSION = "9.4.33.v20201020";
/**
* Get the version number, download URL, and container name of a generic app
server using
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index d71a251..48bd348 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1027,14 +1027,14 @@ lib/javax.servlet-api-3.1.0.jar
lib/javax.transaction-api-1.3.jar
lib/jaxb-api-2.3.1.jar
lib/jaxb-impl-2.3.2.jar
-lib/jetty-http-9.4.21.v20190926.jar
-lib/jetty-io-9.4.21.
[geode] branch develop updated: GEODE-8707: fix release scripts for 1.13.1 (#5747)
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 6dae939 GEODE-8707: fix release scripts for 1.13.1 (#5747)
6dae939 is described below
commit 6dae93976c14e2c60fed0cd32942ee63bf2b7521
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Tue Nov 17 20:52:32 2020 -0800
GEODE-8707: fix release scripts for 1.13.1 (#5747)
* use license review script from develop
* don't expect prod version in builds from source
* placeholders for releasing from not-the-latest SHA
* add reminder about publishing to github
* keep init part of script on retry
* more portable gpg key expansion
* amend end of life calculation to clarify that 3 releases, not 9 months,
is the criteria for retiring a support branch
* improve documentation for bumping dependencies
---
dev-tools/dependencies/README.md| 18 ++
dev-tools/release/commit_rc.sh | 1 +
dev-tools/release/deploy_rc_pipeline.sh | 14 +++---
dev-tools/release/prepare_rc.sh | 1 +
dev-tools/release/promote_rc.sh | 9 ++---
5 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/dev-tools/dependencies/README.md b/dev-tools/dependencies/README.md
index e55e151..07d252d 100644
--- a/dev-tools/dependencies/README.md
+++ b/dev-tools/dependencies/README.md
@@ -4,12 +4,14 @@ of cutting the next release, to allow time for any subtle
issues to surface.
The Release Manager will call for a volunteer to update dependencies. Here
are some
scripts that may be helpful.
-Step 1: list all dependencies for which maven is aware of a newer version:
+Step 0: Create a JIRA ticket for this work.
+
+Step 1: List bump commands for all dependencies for which maven offers a newer
version:
cd geode
-dev-tools/dependencies/bump.sh -l
+dev-tools/dependencies/bump.sh -l
-Step 2: filter out certain dependencies that we cannot change, such as:
+Step 2: Filter out certain dependencies that we cannot change, such as:
- jgroups
- classgraph
- gradle-tooling-api
@@ -21,26 +23,26 @@ Step 2: filter out certain dependencies that we cannot
change, such as:
- tomcat 6
- archunit (13.0 and later get OOM on JDK8)
-Step 3: in some cases, maven suggests new majors, beta releases, or just wrong
releases.
+Step 3: In some cases, maven suggests new majors, beta releases, or just wrong
releases.
Manually search for those dependencies on mavencentral to see if there is a
better choice.
Examples include:
- commons-collections (versioning back in 2004 predated semver)
- springfox-swagger (stay on 2.9, as 2.10 and later is completely
re-architected)
- selenium-api (these tests are very old, so stay on version pi)
-Step 4: create a PR and start bumping dependencies. Push to the PR every few
to run PR
+Step 4: Create a PR and start bumping dependencies. Push to the PR every few
to run PR
checks. Later, review the PR checks and try to narrow down which bump
introduced problems
and revert it. At the end, create separate PRs for each one that was
problematic and ask
for help from someone in the community who knows that area better.
To bump a dependency, in most cases there are 2-4 files that will be touched,
but
-sometimes more. The bump commands provided in step 1 just attempt to do a
search-and-
+sometimes more. Each bump command provided in step 1 just attempts to do a
search-and-
replace on the old version number, then a git add -p. Very carefully answer
'y' to
changes where the matched string was the version number of the library you are
bumping.
Answer 'n' to anything else. The bump script will then create a commit and
run a gradlew
-devBuild to smoke-test the new version. Minor changes may be needed, e.g.
replacing a
+devBuild to smoke-test the new version. Minor touchups may be needed, e.g.
replacing a
call to a deprecated method. Use commit --amend to add any such fixups.
-The first arg to bump.sh (the dependency name) is just used in the commit
message. It
+Note: the dependency-name argument to bump.sh is just used in the commit
message. It
does not affect the grep. If you have several dependencies with the same
version, one
bump command will bump them all, so shorten, e.g. just "jetty" instead of
"jetty-server".
\ No newline at end of file
diff --git a/dev-tools/release/commit_rc.sh b/dev-tools/release/commit_rc.sh
index e4c7293..7331a12 100755
--- a/dev-tools/release/commit_rc.sh
+++ b/dev-tools/release/commit_rc.sh
@@ -124,6 +124,7 @@ echo
""
for DIR in ${GEODE} ${GEODE_EXAMPLES} ${GEODE_NATIVE} ${GEODE_BENCHMARKS} ; do
set -x
cd ${DIR}
+git pull -r
git push -u origin
git push
[geode-native] branch develop updated: fix docker build to not hang
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-native.git The following commit(s) were added to refs/heads/develop by this push: new 96faa99 fix docker build to not hang 96faa99 is described below commit 96faa995c4e61e464f5366693a1d2616f2c28508 Author: Owen Nichols AuthorDate: Tue Nov 17 16:10:28 2020 -0800 fix docker build to not hang (cherry picked from commit 62b51b19cc6a87355060047ea8202d4f552feee0) --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index b000b3e..c78aa78 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,6 +17,9 @@ FROM ubuntu LABEL maintainer="Apache Geode " +ENV TZ=US/Pacific +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + ENV CLANG_VERSION 6.0 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \
[geode-native] branch support/1.12 updated: fix docker build to not hang
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-native.git The following commit(s) were added to refs/heads/support/1.12 by this push: new 164465e fix docker build to not hang 164465e is described below commit 164465e92298f110df1079b445f7d105e5bc0c44 Author: Owen Nichols AuthorDate: Tue Nov 17 16:10:28 2020 -0800 fix docker build to not hang (cherry picked from commit 62b51b19cc6a87355060047ea8202d4f552feee0) --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 06625d2..233cd8c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,6 +17,9 @@ FROM ubuntu LABEL maintainer Apache Geode +ENV TZ=US/Pacific +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + ENV CLANG_VERSION 6.0 RUN apt-get update && \ apt-get install -y \
[geode-native] branch support/1.13 updated: fix docker build to not hang
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-native.git The following commit(s) were added to refs/heads/support/1.13 by this push: new 62b51b1 fix docker build to not hang 62b51b1 is described below commit 62b51b19cc6a87355060047ea8202d4f552feee0 Author: Owen Nichols AuthorDate: Tue Nov 17 16:10:28 2020 -0800 fix docker build to not hang --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 486a6f5..851bf48 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,6 +17,9 @@ FROM ubuntu LABEL maintainer Apache Geode +ENV TZ=US/Pacific +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + ENV CLANG_VERSION 6.0 RUN apt-get update && \ apt-get install -y \
[geode-native] branch develop updated: fix docker build to not hang
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-native.git The following commit(s) were added to refs/heads/develop by this push: new 96faa99 fix docker build to not hang 96faa99 is described below commit 96faa995c4e61e464f5366693a1d2616f2c28508 Author: Owen Nichols AuthorDate: Tue Nov 17 16:10:28 2020 -0800 fix docker build to not hang (cherry picked from commit 62b51b19cc6a87355060047ea8202d4f552feee0) --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index b000b3e..c78aa78 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,6 +17,9 @@ FROM ubuntu LABEL maintainer="Apache Geode " +ENV TZ=US/Pacific +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + ENV CLANG_VERSION 6.0 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \
[geode-native] branch support/1.12 updated: fix docker build to not hang
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-native.git The following commit(s) were added to refs/heads/support/1.12 by this push: new 164465e fix docker build to not hang 164465e is described below commit 164465e92298f110df1079b445f7d105e5bc0c44 Author: Owen Nichols AuthorDate: Tue Nov 17 16:10:28 2020 -0800 fix docker build to not hang (cherry picked from commit 62b51b19cc6a87355060047ea8202d4f552feee0) --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 06625d2..233cd8c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,6 +17,9 @@ FROM ubuntu LABEL maintainer Apache Geode +ENV TZ=US/Pacific +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + ENV CLANG_VERSION 6.0 RUN apt-get update && \ apt-get install -y \
[geode-native] branch support/1.13 updated: fix docker build to not hang
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-native.git The following commit(s) were added to refs/heads/support/1.13 by this push: new 62b51b1 fix docker build to not hang 62b51b1 is described below commit 62b51b19cc6a87355060047ea8202d4f552feee0 Author: Owen Nichols AuthorDate: Tue Nov 17 16:10:28 2020 -0800 fix docker build to not hang --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 486a6f5..851bf48 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,6 +17,9 @@ FROM ubuntu LABEL maintainer Apache Geode +ENV TZ=US/Pacific +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + ENV CLANG_VERSION 6.0 RUN apt-get update && \ apt-get install -y \
[geode-native] branch support/1.12 updated: fix docker build to not hang
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-native.git The following commit(s) were added to refs/heads/support/1.12 by this push: new 164465e fix docker build to not hang 164465e is described below commit 164465e92298f110df1079b445f7d105e5bc0c44 Author: Owen Nichols AuthorDate: Tue Nov 17 16:10:28 2020 -0800 fix docker build to not hang (cherry picked from commit 62b51b19cc6a87355060047ea8202d4f552feee0) --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 06625d2..233cd8c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,6 +17,9 @@ FROM ubuntu LABEL maintainer Apache Geode +ENV TZ=US/Pacific +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + ENV CLANG_VERSION 6.0 RUN apt-get update && \ apt-get install -y \
[geode-native] branch support/1.13 updated: fix docker build to not hang
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-native.git The following commit(s) were added to refs/heads/support/1.13 by this push: new 62b51b1 fix docker build to not hang 62b51b1 is described below commit 62b51b19cc6a87355060047ea8202d4f552feee0 Author: Owen Nichols AuthorDate: Tue Nov 17 16:10:28 2020 -0800 fix docker build to not hang --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 486a6f5..851bf48 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,6 +17,9 @@ FROM ubuntu LABEL maintainer Apache Geode +ENV TZ=US/Pacific +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + ENV CLANG_VERSION 6.0 RUN apt-get update && \ apt-get install -y \
[geode] branch develop updated (1eb9f34 -> 2053a5d)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 1eb9f34 GEODE-8714: return event to queue at stoping of gw sender (#5752) add 1c6206c GEODE-8718: include ticket number in commit comment add 2053a5d GEODE-8718: Bump shiro from 1.6.0 to 1.7.0 No new revisions were added by this update. Summary of changes: .../src/test/resources/expected-pom.xml | 2 +- .../gradle/plugins/DependencyConstraints.groovy | 2 +- dev-tools/dependencies/bump.sh | 21 + .../integrationTest/resources/assembly_content.txt | 18 +- .../resources/dependency_classpath.txt | 18 +- 5 files changed, 33 insertions(+), 28 deletions(-)
[geode] branch develop updated (1eb9f34 -> 2053a5d)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 1eb9f34 GEODE-8714: return event to queue at stoping of gw sender (#5752) add 1c6206c GEODE-8718: include ticket number in commit comment add 2053a5d GEODE-8718: Bump shiro from 1.6.0 to 1.7.0 No new revisions were added by this update. Summary of changes: .../src/test/resources/expected-pom.xml | 2 +- .../gradle/plugins/DependencyConstraints.groovy | 2 +- dev-tools/dependencies/bump.sh | 21 + .../integrationTest/resources/assembly_content.txt | 18 +- .../resources/dependency_classpath.txt | 18 +- 5 files changed, 33 insertions(+), 28 deletions(-)
[geode] branch develop updated (1eb9f34 -> 2053a5d)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 1eb9f34 GEODE-8714: return event to queue at stoping of gw sender (#5752) add 1c6206c GEODE-8718: include ticket number in commit comment add 2053a5d GEODE-8718: Bump shiro from 1.6.0 to 1.7.0 No new revisions were added by this update. Summary of changes: .../src/test/resources/expected-pom.xml | 2 +- .../gradle/plugins/DependencyConstraints.groovy | 2 +- dev-tools/dependencies/bump.sh | 21 + .../integrationTest/resources/assembly_content.txt | 18 +- .../resources/dependency_classpath.txt | 18 +- 5 files changed, 33 insertions(+), 28 deletions(-)
