date:20220613

[geode] branch support/1.12 updated: GEODE-10355: Bump spring-security from 5.2.12 to 5.5.8 (#7770)

2022-06-13 Thread onichols

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 ed47063062 GEODE-10355: Bump spring-security from 5.2.12 to 5.5.8 
(#7770)
ed47063062 is described below

commit ed47063062b3d93c6c65f2be9ce6b58b731d4048
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Mon Jun 13 14:49:02 2022 -0700

GEODE-10355: Bump spring-security from 5.2.12 to 5.5.8 (#7770)

Geode endeavors to update to the latest version of 3rd-party
dependencies on develop wherever possible.  Doing so increases the
shelf life of releases and increases security and reliability.
Doing so regularly makes the occasional hiccups this can cause easier
to pinpoint and address.

Dependency bumps in this batch:
* Bump spring-security from 5.2.12.RELEASE to 5.5.8
---
 boms/geode-all-bom/src/test/resources/expected-pom.xml | 10 +-
 .../apache/geode/gradle/plugins/DependencyConstraints.groovy   |  2 +-
 geode-assembly/src/integrationTest/resources/expected_jars.txt |  1 +
 3 files changed, 7 insertions(+), 6 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 e4674ce20f..b3e6277bea 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -706,31 +706,31 @@
   
 org.springframework.security
 spring-security-config
-5.2.12.RELEASE
+5.5.8
 compile
   
   
 org.springframework.security
 spring-security-core
-5.2.12.RELEASE
+5.5.8
 compile
   
   
 org.springframework.security
 spring-security-ldap
-5.2.12.RELEASE
+5.5.8
 compile
   
   
 org.springframework.security
 spring-security-test
-5.2.12.RELEASE
+5.5.8
 compile
   
   
 org.springframework.security
 spring-security-web
-5.2.12.RELEASE
+5.5.8
 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 8997f5d788..0368e6b749 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
@@ -231,7 +231,7 @@ class DependencyConstraints implements Plugin {
   entry('selenium-support')
 }
 
-dependencySet(group: 'org.springframework.security', version: 
'5.2.12.RELEASE') {
+dependencySet(group: 'org.springframework.security', version: '5.5.8') {
   entry('spring-security-config')
   entry('spring-security-core')
   entry('spring-security-ldap')
diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt 
b/geode-assembly/src/integrationTest/resources/expected_jars.txt
index 2fdc874d96..092aa81af2 100644
--- a/geode-assembly/src/integrationTest/resources/expected_jars.txt
+++ b/geode-assembly/src/integrationTest/resources/expected_jars.txt
@@ -105,6 +105,7 @@ spring-plugin-core
 spring-plugin-metadata
 spring-security-config
 spring-security-core
+spring-security-crypto
 spring-security-ldap
 spring-security-web
 spring-shell

[geode] branch support/1.14 updated: GEODE-10355: Bump spring-security from 5.4.8 to 5.6.5 (#7769)

2022-06-13 Thread onichols

This is an automated email from the ASF dual-hosted git repository.

onichols pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/support/1.14 by this push:
 new 06cdd26589 GEODE-10355: Bump spring-security from 5.4.8 to 5.6.5 
(#7769)
06cdd26589 is described below

commit 06cdd2658949213386ab56d2d077b50f0db9d023
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Mon Jun 13 14:48:26 2022 -0700

GEODE-10355: Bump spring-security from 5.4.8 to 5.6.5 (#7769)

Geode endeavors to update to the latest version of 3rd-party
dependencies on develop wherever possible.  Doing so increases the
shelf life of releases and increases security and reliability.
Doing so regularly makes the occasional hiccups this can cause easier
to pinpoint and address.

Dependency bumps in this batch:
* Bump spring-security from 5.4.8 to 5.6.5
---
 boms/geode-all-bom/src/test/resources/expected-pom.xml   | 16 
 .../geode/gradle/plugins/DependencyConstraints.groovy|  2 +-
 .../src/integrationTest/resources/expected_jars.txt  |  1 +
 3 files changed, 10 insertions(+), 9 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 706d4a3352..5c24a4daac 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -742,49 +742,49 @@
   
 org.springframework.security
 spring-security-config
-5.4.8
+5.6.5
 compile
   
   
 org.springframework.security
 spring-security-core
-5.4.8
+5.6.5
 compile
   
   
 org.springframework.security
 spring-security-ldap
-5.4.8
+5.6.5
 compile
   
   
 org.springframework.security
 spring-security-test
-5.4.8
+5.6.5
 compile
   
   
 org.springframework.security
 spring-security-web
-5.4.8
+5.6.5
 compile
   
   
 org.springframework.security
 spring-security-oauth2-core
-5.4.8
+5.6.5
 compile
   
   
 org.springframework.security
 spring-security-oauth2-client
-5.4.8
+5.6.5
 compile
   
   
 org.springframework.security
 spring-security-oauth2-jose
-5.4.8
+5.6.5
 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 af37196159..54d3c3997d 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
@@ -244,7 +244,7 @@ class DependencyConstraints implements Plugin {
   entry('selenium-support')
 }
 
-dependencySet(group: 'org.springframework.security', version: '5.4.8') {
+dependencySet(group: 'org.springframework.security', version: '5.6.5') {
   entry('spring-security-config')
   entry('spring-security-core')
   entry('spring-security-ldap')
diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt 
b/geode-assembly/src/integrationTest/resources/expected_jars.txt
index 0f17b5329f..14db534777 100644
--- a/geode-assembly/src/integrationTest/resources/expected_jars.txt
+++ b/geode-assembly/src/integrationTest/resources/expected_jars.txt
@@ -112,6 +112,7 @@ spring-plugin-core
 spring-plugin-metadata
 spring-security-config
 spring-security-core
+spring-security-crypto
 spring-security-ldap
 spring-security-oauth2-client
 spring-security-oauth2-core

[geode] branch develop updated: GEODE-10369 part 2 Fix hardcoded gcp project reference and adjust windows unit test cpu/ram usage. (#7798)

2022-06-13 Thread smgoller

This is an automated email from the ASF dual-hosted git repository.

smgoller 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 e2ac1113f8 GEODE-10369 part 2 Fix hardcoded gcp project reference and 
adjust windows unit test cpu/ram usage. (#7798)
e2ac1113f8 is described below

commit e2ac1113f8f6819095785be556bef8e080ab6988
Author: Sean Goller 
AuthorDate: Mon Jun 13 11:56:38 2022 -0700

GEODE-10369 part 2 Fix hardcoded gcp project reference and adjust windows 
unit test cpu/ram usage. (#7798)

* Fix hardcoded reference to gcp project.

* Fix windows unit test ram and cpu settings.
---
 ci/pipelines/shared/jinja.variables.yml | 4 ++--
 ci/scripts/delete_instance.sh   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/pipelines/shared/jinja.variables.yml 
b/ci/pipelines/shared/jinja.variables.yml
index 398ed93c06..40fc16b9c6 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -215,7 +215,7 @@ tests:
   RAM: '24'
   name: windows-core-integration
 - ARTIFACT_SLUG: windows-unittestfiles
-  CPUS: '10'
+  CPUS: '8'
   DISK: '200GB'
   DUNIT_PARALLEL_FORKS: '0'
   EXECUTE_TEST_TIMEOUT: 1h
@@ -225,7 +225,7 @@ tests:
   PARALLEL_DUNIT: 'false'
   PARALLEL_GRADLE: 'true'
   PLATFORM: windows
-  RAM: '10'
+  RAM: '8'
   name: windows-unit
 - ARTIFACT_SLUG: apicheck
   CALL_STACK_TIMEOUT: '20700'
diff --git a/ci/scripts/delete_instance.sh b/ci/scripts/delete_instance.sh
index 56ccf4a043..2e9bebc766 100755
--- a/ci/scripts/delete_instance.sh
+++ b/ci/scripts/delete_instance.sh
@@ -51,7 +51,7 @@ while read BLAH ; do
 else
 START_TIMESTAMP=${BLAH}
 fi
-done < <(gcloud logging read "resource.type=gce_instance AND 
resource.labels.instance_id=${INSTANCE_ID} AND 
logName=projects/apachegeode-ci/logs/cloudaudit.googleapis.com%2Factivity" 
--format=json | jq -r '.[].timestamp')
+done < <(gcloud logging read "resource.type=gce_instance AND 
resource.labels.instance_id=${INSTANCE_ID} AND 
logName=projects/${GCP_PROJECT}/logs/cloudaudit.googleapis.com%2Factivity" 
--format=json | jq -r '.[].timestamp')
 
 START_SECONDS=$(date -d "${START_TIMESTAMP}" +%s)
 END_SECONDS=$(date -d "${END_TIMESTAMP}" +%s)

[geode] branch develop updated: GEODE-10267: fix creating gw sender with non-existent disk store (#7643)

2022-06-13 Thread mkevo

This is an automated email from the ASF dual-hosted git repository.

mkevo 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 d7ff22cd18 GEODE-10267: fix creating gw sender with non-existent disk 
store (#7643)
d7ff22cd18 is described below

commit d7ff22cd18bb3e08a73035e950e6e5523ff99bec
Author: Mario Kevo <48509719+mk...@users.noreply.github.com>
AuthorDate: Mon Jun 13 09:53:44 2022 +0200

GEODE-10267: fix creating gw sender with non-existent disk store (#7643)

* GEODE-10267: fix creating gw sender with non-existent disk store
---
 .../geode/cache/CacheXml70GatewayDUnitTest.java|  5 +++
 .../geode/cache/CacheXml80GatewayDUnitTest.java|  3 ++
 ...CreateDestroyGatewaySenderCommandDUnitTest.java | 40 +
 .../cache/wan/misc/WANConfigurationJUnitTest.java  | 41 +++---
 .../wan/internal/GatewaySenderFactoryImpl.java |  8 -
 5 files changed, 92 insertions(+), 5 deletions(-)

diff --git 
a/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
 
b/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
index c9e8b92190..0489224a39 100644
--- 
a/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
+++ 
b/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
@@ -125,6 +125,8 @@ public class CacheXml70GatewayDUnitTest extends 
CacheXmlTestCase {
   public void testParallelGatewaySender() throws Exception {
 getSystem();
 CacheCreation cache = new CacheCreation();
+DiskStoreFactory dsf = cache.createDiskStoreFactory();
+dsf.create("LNSender");
 
 GatewaySenderFactory gatewaySenderFactory = 
cache.createGatewaySenderFactory();
 gatewaySenderFactory.setParallel(true);
@@ -163,6 +165,9 @@ public class CacheXml70GatewayDUnitTest extends 
CacheXmlTestCase {
   public void testSerialGatewaySender() throws Exception {
 getSystem();
 CacheCreation cache = new CacheCreation();
+DiskStoreFactory dsf = cache.createDiskStoreFactory();
+dsf.create("LNSender");
+
 GatewaySenderFactory gatewaySenderFactory = 
cache.createGatewaySenderFactory();
 gatewaySenderFactory.setParallel(false);
 gatewaySenderFactory.setManualStart(true);
diff --git 
a/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
 
b/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
index e49787f1a3..4ba5c8904e 100644
--- 
a/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
+++ 
b/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
@@ -105,6 +105,8 @@ public class CacheXml80GatewayDUnitTest extends 
CacheXmlTestCase {
   public void testGatewaySenderWithSubstitutionFilter() throws Exception {
 getSystem();
 CacheCreation cache = new CacheCreation();
+DiskStoreFactory dsf = cache.createDiskStoreFactory();
+dsf.create(DiskStoreFactory.DEFAULT_DISK_STORE_NAME);
 
 // Create a GatewaySender with GatewayEventSubstitutionFilter.
 // Don't start the sender to avoid 'Locators must be configured before 
starting gateway-sender'
@@ -113,6 +115,7 @@ public class CacheXml80GatewayDUnitTest extends 
CacheXmlTestCase {
 GatewaySenderFactory factory = cache.createGatewaySenderFactory();
 factory.setManualStart(true);
 factory.setGatewayEventSubstitutionFilter(new 
MyGatewayEventSubstitutionFilter());
+factory.setDiskStoreName(DiskStoreFactory.DEFAULT_DISK_STORE_NAME);
 GatewaySender sender = factory.create(id, 2);
 
 // Verify the GatewayEventSubstitutionFilter is set on the GatewaySender.
diff --git 
a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java
 
b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java
index 3575552dfa..49fbea480a 100644
--- 
a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java
+++ 
b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java
@@ -19,6 +19,7 @@ import static 
org.apache.geode.distributed.ConfigurationProperties.REMOTE_LOCATO
 import static 
org.apache.geode.internal.cache.wan.wancommand.WANCommandUtils.verifySenderAttributes;
 import static 
org.apache.geode.internal.cache.wan.wancommand.WANCommandUtils.verifySenderDoesNotExist;
 import static 
org.apache.geode.internal.cache.wan.wancommand.WANCommandUtils.verifySenderState;
+import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
 import static org.assertj.core.api.Assertions.assertThat;
 
 i

[geode] branch support/1.12 updated: GEODE-10355: Bump spring-security from 5.2.12 to 5.5.8 (#7770)

[geode] branch support/1.14 updated: GEODE-10355: Bump spring-security from 5.4.8 to 5.6.5 (#7769)

[geode] branch develop updated: GEODE-10369 part 2 Fix hardcoded gcp project reference and adjust windows unit test cpu/ram usage. (#7798)

[geode] branch develop updated: GEODE-10267: fix creating gw sender with non-existent disk store (#7643)

4 matches

Site Navigation

Mail list logo

Footer information