[geode] branch feature/GEODE-10350 updated (53b3a86408 -> 4e50da48ff)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-10350 in repository https://gitbox.apache.org/repos/asf/geode.git from 53b3a86408 GEODE-10350: volunteerForPrimary should proceed when being elector or knowing elector add 4e50da48ff fix for fixed partition dunit test failures No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[geode] branch develop updated (af5810650c -> 728467cfd7)
This is an automated email from the ASF dual-hosted git repository. dbarnes pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git from af5810650c Short-circuit CI checks for PRs that don't touch buildable files (#7763) add 728467cfd7 GEODE-10352: Update Ruby version in Geode doc preview tool (#7753) No new revisions were added by this update. Summary of changes: dev-tools/docker/docs/Dockerfile | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-)
[geode] branch develop updated (968331758c -> af5810650c)
This is an automated email from the ASF dual-hosted git repository. rhoughton pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git from 968331758c GEODE-10356: Corrected the comment (#7762) add af5810650c Short-circuit CI checks for PRs that don't touch buildable files (#7763) No new revisions were added by this update. Summary of changes: ci/scripts/archive_results.sh | 2 +- ci/scripts/create_instance.sh | 2 +- ci/scripts/delete_instance.sh | 2 +- ci/scripts/execute_build.sh| 2 +- ci/scripts/execute_tests.sh| 2 +- ci/scripts/repeat-new-tests.sh | 2 +- ci/scripts/rsync_code_down.sh | 2 +- ci/scripts/rsync_code_up.sh| 2 +- ci/scripts/shared_utilities.sh | 20 +++- 9 files changed, 23 insertions(+), 13 deletions(-)
[geode] branch support/1.15 updated: GEODE-10342: Add current jars to HTTP Module for Tomcat instructions 1.15 (#7768)
This is an automated email from the ASF dual-hosted git repository. dbarnes pushed a commit to branch support/1.15 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/support/1.15 by this push: new b20081a4c4 GEODE-10342: Add current jars to HTTP Module for Tomcat instructions 1.15 (#7768) b20081a4c4 is described below commit b20081a4c4b44fb55566ec060722860a731c409b Author: Max Hufnagel AuthorDate: Fri Jun 3 10:38:17 2022 -0700 GEODE-10342: Add current jars to HTTP Module for Tomcat instructions 1.15 (#7768) --- .../tomcat_installing_the_module.html.md.erb | 116 + 1 file changed, 98 insertions(+), 18 deletions(-) diff --git a/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb index 08fd93a5ca..af1c297e29 100644 --- a/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb +++ b/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb @@ -48,23 +48,103 @@ This adds jar files to the `lib` subdirectory and XML files to the `conf` subdir unzip $GEODE_HOME/tools/Modules/Apache_Geode_Modules-SERVER-VERSION-Tomcat.zip ``` 6. Copy the following jar files from the <%=vars.product_name%> `lib` subdirectory to the `lib` subdirectory of your Tomcat server (`$CATALINA_HOME/lib`), adding version numbers to the filenames as needed: -- commons-io jar -- commons-lang jar -- commons-validator jar -- fastutil jar -- geode-common jar -- geode-core jar -- geode-logging jar -- geode-management jar -- geode-membership jar -- geode-serialization jar -- geode-tcp-server jar -- javax.transaction-api jar -- jgroups jar -- log4j-api jar -- log4j-core jar -- log4j-jul jar -- micrometer-core jar -- shiro-core jar +* antlr jar +* classgraph jar +* commons-beanutils jar +* commons-codec jar +* commons-collections jar +* commons-io jar +* commons-lang3 jar +* commons-logging jar +* commons-math3 jar +* commons-modeler jar +* commons-validator jar +* fastutil jar +* geo jar +* geode-common jar +* geode-connectors jar +* geode-core jar +* geode-cq jar +* geode-gfsh jar +* geode-http-service jar +* geode-log4j jar +* geode-logging jar +* geode-lucene jar +* geode-management jar +* geode-membership jar +* geode-memcached jar +* geode-old-client-support jar +* geode-protobuf jar +* geode-protobuf-messages jar +* geode-rebalancer jar +* geode-redis jar +* geode-serialization jar +* geode-tcp-server jar +* geode-unsafe jar +* geode-wan jar +* grumpy-core jar +* HdrHistogram jar +* HikariCP jar +* httpclient jar +* httpcore jar +* istack-commons-runtime jar +* jackson-annotations jar +* jackson-core jar +* jackson-databind jar +* javax.activation jar +* javax.activation-api jar +* javax.mail-api jar +* javax.resource-api jar +* javax.servlet-api jar +* javax.transaction-api jar +* jaxb-api jar +* jaxb-impl jar +* jetty-http jar +* jetty-io jar +* jetty-security jar +* jetty-server jar +* jetty-servlet jar +* jetty-util jar +* jetty-util-ajax jar +* jetty-webapp jar +* jetty-xml jar +* jgroups jar +* jline jar +* jna jar +* jna-platform jar +* jopt-simple jar +* LatencyUtils jar +* log4j-api jar +* log4j-core jar +* log4j-jcl jar +* log4j-jul jar +* log4j-slf4j-impl jar +* lucene-analyzers-common jar +* lucene-analyzers-phonetic jar +* lucene-core jar +* lucene-queries jar +* lucene-queryparser jar +* micrometer-core jar +* mx4j jar +* mx4j-remote jar +* mx4j-tools jar +* netty-all jar +* protobuf-java jar +* rmiio jar +* shiro-cache jar +* shiro-config-core jar +* shiro-config-ogdl jar +* shiro-core jar +* shiro-crypto-cipher jar +* shiro-crypto-core jar +* shiro-crypto-hash jar +* shiro-event jar +* shiro-lang jar +* slf4j-api jar +* snappy jar +* spring-core jar +* spring-jcl jar +* spring-shell jar +* swagger-annotations jar Proceed to [Setting Up the HTTP Module for Tomcat](./tomcat_setting_up_the_module.html) to complete your Tomcat configuration.
[geode] branch support/1.14 updated: GEODE-10342: Add current jars to HTTP Module for Tomcat instructions 1.14 (#7767)
This is an automated email from the ASF dual-hosted git repository. dbarnes 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 bb4c7dc439 GEODE-10342: Add current jars to HTTP Module for Tomcat instructions 1.14 (#7767) bb4c7dc439 is described below commit bb4c7dc4392fe38f6206bffc36d60cd651cee906 Author: Max Hufnagel AuthorDate: Fri Jun 3 10:38:06 2022 -0700 GEODE-10342: Add current jars to HTTP Module for Tomcat instructions 1.14 (#7767) --- .../tomcat_installing_the_module.html.md.erb | 116 + 1 file changed, 98 insertions(+), 18 deletions(-) diff --git a/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb index 5e4ac9b6a7..a43d70fe3d 100644 --- a/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb +++ b/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb @@ -48,23 +48,103 @@ This adds jar files to the `lib` subdirectory and XML files to the `conf` subdir unzip $GEODE_HOME/tools/Modules/Apache_Geode_Modules-SERVER-VERSION-Tomcat.zip ``` 6. Copy the following jar files from the <%=vars.product_name%> `lib` subdirectory to the `lib` subdirectory of your Tomcat server (`$CATALINA_HOME/lib`), adding version numbers to the filenames as needed: -- commons-io jar -- commons-lang jar -- commons-validator jar -- fastutil jar -- geode-common jar -- geode-core jar -- geode-logging jar -- geode-management jar -- geode-membership jar -- geode-serialization jar -- geode-tcp-server jar -- javax.transaction-api jar -- jgroups jar -- log4j-api jar -- log4j-core jar -- log4j-jul jar -- micrometer-core jar -- shiro-core jar +* antlr jar +* classgraph jar +* commons-beanutils jar +* commons-codec jar +* commons-collections jar +* commons-io jar +* commons-lang3 jar +* commons-logging jar +* commons-math3 jar +* commons-modeler jar +* commons-validator jar +* fastutil jar +* geo jar +* geode-common jar +* geode-connectors jar +* geode-core jar +* geode-cq jar +* geode-gfsh jar +* geode-http-service jar +* geode-log4j jar +* geode-logging jar +* geode-lucene jar +* geode-management jar +* geode-membership jar +* geode-memcached jar +* geode-old-client-support jar +* geode-protobuf jar +* geode-protobuf-messages jar +* geode-rebalancer jar +* geode-redis jar +* geode-serialization jar +* geode-tcp-server jar +* geode-unsafe jar +* geode-wan jar +* grumpy-core jar +* HdrHistogram jar +* HikariCP jar +* httpclient jar +* httpcore jar +* istack-commons-runtime jar +* jackson-annotations jar +* jackson-core jar +* jackson-databind jar +* javax.activation jar +* javax.activation-api jar +* javax.mail-api jar +* javax.resource-api jar +* javax.servlet-api jar +* javax.transaction-api jar +* jaxb-api jar +* jaxb-impl jar +* jetty-http jar +* jetty-io jar +* jetty-security jar +* jetty-server jar +* jetty-servlet jar +* jetty-util jar +* jetty-util-ajax jar +* jetty-webapp jar +* jetty-xml jar +* jgroups jar +* jline jar +* jna jar +* jna-platform jar +* jopt-simple jar +* LatencyUtils jar +* log4j-api jar +* log4j-core jar +* log4j-jcl jar +* log4j-jul jar +* log4j-slf4j-impl jar +* lucene-analyzers-common jar +* lucene-analyzers-phonetic jar +* lucene-core jar +* lucene-queries jar +* lucene-queryparser jar +* micrometer-core jar +* mx4j jar +* mx4j-remote jar +* mx4j-tools jar +* netty-all jar +* protobuf-java jar +* rmiio jar +* shiro-cache jar +* shiro-config-core jar +* shiro-config-ogdl jar +* shiro-core jar +* shiro-crypto-cipher jar +* shiro-crypto-core jar +* shiro-crypto-hash jar +* shiro-event jar +* shiro-lang jar +* slf4j-api jar +* snappy jar +* spring-core jar +* spring-jcl jar +* spring-shell jar +* swagger-annotations jar Proceed to [Setting Up the HTTP Module for Tomcat](./tomcat_setting_up_the_module.html) to complete your Tomcat configuration.
[geode] branch develop updated: GEODE-10356: Corrected the comment (#7762)
This is an automated email from the ASF dual-hosted git repository.
nnag 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 968331758c GEODE-10356: Corrected the comment (#7762)
968331758c is described below
commit 968331758cff9c315bb95c7159ac1610aed9ad34
Author: Nabarun Nag
AuthorDate: Fri Jun 3 10:04:53 2022 -0700
GEODE-10356: Corrected the comment (#7762)
* The previous comment on removeOldEntry mentioned that the old entry
was replaced
* This has been corrected to mention that the old entry is removed and
the new entry has been added to the region queue
---
.../geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index 81dc5696e1..e76ec400f0 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
@@ -611,7 +611,8 @@ public class SerialGatewaySenderQueue implements
RegionQueue {
keepOldEntry = true;
}
- // Replace the object's value into the queue if necessary
+ // Remove the old entry from the queue if necessary. The new entry is
already present
+ // in the queue region.
if (!keepOldEntry) {
Conflatable previous = (Conflatable) region.remove(previousIndex);
stats.decQueueSize(1);
[geode] branch develop updated: GEODE-10342: Add current jars to HTTP Module for Tomcat instructions (#7745)
This is an automated email from the ASF dual-hosted git repository. dbarnes 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 300a1596ae GEODE-10342: Add current jars to HTTP Module for Tomcat instructions (#7745) 300a1596ae is described below commit 300a1596aecd89aebd2c71615da584a2e0a8442c Author: Max Hufnagel AuthorDate: Fri Jun 3 08:24:40 2022 -0700 GEODE-10342: Add current jars to HTTP Module for Tomcat instructions (#7745) --- .../tomcat_installing_the_module.html.md.erb | 116 + 1 file changed, 98 insertions(+), 18 deletions(-) diff --git a/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb index 08fd93a5ca..af1c297e29 100644 --- a/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb +++ b/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb @@ -48,23 +48,103 @@ This adds jar files to the `lib` subdirectory and XML files to the `conf` subdir unzip $GEODE_HOME/tools/Modules/Apache_Geode_Modules-SERVER-VERSION-Tomcat.zip ``` 6. Copy the following jar files from the <%=vars.product_name%> `lib` subdirectory to the `lib` subdirectory of your Tomcat server (`$CATALINA_HOME/lib`), adding version numbers to the filenames as needed: -- commons-io jar -- commons-lang jar -- commons-validator jar -- fastutil jar -- geode-common jar -- geode-core jar -- geode-logging jar -- geode-management jar -- geode-membership jar -- geode-serialization jar -- geode-tcp-server jar -- javax.transaction-api jar -- jgroups jar -- log4j-api jar -- log4j-core jar -- log4j-jul jar -- micrometer-core jar -- shiro-core jar +* antlr jar +* classgraph jar +* commons-beanutils jar +* commons-codec jar +* commons-collections jar +* commons-io jar +* commons-lang3 jar +* commons-logging jar +* commons-math3 jar +* commons-modeler jar +* commons-validator jar +* fastutil jar +* geo jar +* geode-common jar +* geode-connectors jar +* geode-core jar +* geode-cq jar +* geode-gfsh jar +* geode-http-service jar +* geode-log4j jar +* geode-logging jar +* geode-lucene jar +* geode-management jar +* geode-membership jar +* geode-memcached jar +* geode-old-client-support jar +* geode-protobuf jar +* geode-protobuf-messages jar +* geode-rebalancer jar +* geode-redis jar +* geode-serialization jar +* geode-tcp-server jar +* geode-unsafe jar +* geode-wan jar +* grumpy-core jar +* HdrHistogram jar +* HikariCP jar +* httpclient jar +* httpcore jar +* istack-commons-runtime jar +* jackson-annotations jar +* jackson-core jar +* jackson-databind jar +* javax.activation jar +* javax.activation-api jar +* javax.mail-api jar +* javax.resource-api jar +* javax.servlet-api jar +* javax.transaction-api jar +* jaxb-api jar +* jaxb-impl jar +* jetty-http jar +* jetty-io jar +* jetty-security jar +* jetty-server jar +* jetty-servlet jar +* jetty-util jar +* jetty-util-ajax jar +* jetty-webapp jar +* jetty-xml jar +* jgroups jar +* jline jar +* jna jar +* jna-platform jar +* jopt-simple jar +* LatencyUtils jar +* log4j-api jar +* log4j-core jar +* log4j-jcl jar +* log4j-jul jar +* log4j-slf4j-impl jar +* lucene-analyzers-common jar +* lucene-analyzers-phonetic jar +* lucene-core jar +* lucene-queries jar +* lucene-queryparser jar +* micrometer-core jar +* mx4j jar +* mx4j-remote jar +* mx4j-tools jar +* netty-all jar +* protobuf-java jar +* rmiio jar +* shiro-cache jar +* shiro-config-core jar +* shiro-config-ogdl jar +* shiro-core jar +* shiro-crypto-cipher jar +* shiro-crypto-core jar +* shiro-crypto-hash jar +* shiro-event jar +* shiro-lang jar +* slf4j-api jar +* snappy jar +* spring-core jar +* spring-jcl jar +* spring-shell jar +* swagger-annotations jar Proceed to [Setting Up the HTTP Module for Tomcat](./tomcat_setting_up_the_module.html) to complete your Tomcat configuration.
[geode] branch develop updated: GEODE-10301: support LocalDate and JodaTime (#7737)
This is an automated email from the ASF dual-hosted git repository.
jmelchior 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 e370d2fb6c GEODE-10301: support LocalDate and JodaTime (#7737)
e370d2fb6c is described below
commit e370d2fb6c9f5e4281146fe78a4840452f70ca9e
Author: Joris Melchior
AuthorDate: Fri Jun 3 11:13:44 2022 -0400
GEODE-10301: support LocalDate and JodaTime (#7737)
* GEODE-10301: support LocalDate and JodaTime
Co-authored-by: Jinmei Liao
- include libraries so that end-users won't have to add them to the java
path
- ensure proper serialization in gfsh and pulse
---
.../src/test/resources/expected-pom.xml| 2 +-
.../gradle/plugins/DependencyConstraints.groovy| 2 +-
...tandaloneClientManagementAPIAcceptanceTest.java | 16 ++
.../integrationTest/resources/assembly_content.txt | 3 ++
.../integrationTest/resources/expected_jars.txt| 2 ++
.../resources/gfsh_dependency_classpath.txt| 3 ++
geode-common/build.gradle | 2 ++
.../geode/util/internal/GeodeJsonMapper.java | 10 +++
geode-common/src/test/resources/expected-pom.xml | 10 +++
.../DistributedSystemMBeanIntegrationTest.java | 35 +-
.../internal/json/QueryResultFormatterTest.java| 10 +--
.../commands/QueryCommandIntegrationTestBase.java | 13 +---
.../sanctioned-geode-dunit-serializables.txt | 2 +-
.../cli/commands/GetCommandIntegrationTest.java| 19 +++-
.../internal/cli/domain/DataCommandResult.java | 5 ++--
.../cli/functions/DataCommandFunction.java | 3 +-
geode-junit/build.gradle | 1 +
.../apache/geode/management/model/Employee.java| 10 +++
geode-junit/src/test/resources/expected-pom.xml| 5
.../resources/dependency_classpath.txt | 3 ++
20 files changed, 129 insertions(+), 27 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 93c148ebe9..f16020b7b6 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -245,7 +245,7 @@
joda-time
joda-time
-2.10.9
+2.10.14
junit
diff --git
a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index cb6f371945..f8fb6e3aae 100644
---
a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -128,7 +128,7 @@ class DependencyConstraints {
api(group: 'javax.resource', name: 'javax.resource-api', version:
'1.7.1')
api(group: 'javax.servlet', name: 'javax.servlet-api', version:
'3.1.0')
api(group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1')
-api(group: 'joda-time', name: 'joda-time', version: '2.10.9')
+api(group: 'joda-time', name: 'joda-time', version: '2.10.14')
api(group: 'junit', name: 'junit', version: get('junit.version'))
api(group: 'mx4j', name: 'mx4j-tools', version: '3.0.1')
api(group: 'mysql', name: 'mysql-connector-java', version: '5.1.46')
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/StandaloneClientManagementAPIAcceptanceTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/StandaloneClientManagementAPIAcceptanceTest.java
index 295974e0fe..79ee80105d 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/StandaloneClientManagementAPIAcceptanceTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/StandaloneClientManagementAPIAcceptanceTest.java
@@ -31,6 +31,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
@@ -123,18 +124,18 @@ public class StandaloneClientManagementAPIAcceptanceTest {
.withName("startCluster")
.execute(gfshRule);
+int expectedReturnCode = 0;
assertThat(startCluster.getProcess().exitValue())
-.as("Cluster did not start correctly")
-.isEqualTo(0);
+.as("Cluster did not start correctly").isEqualTo(expectedReturnCode);
Process process = launchClientProcess(outputJar,
