diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eed8995067..8c6c68efa9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -85,7 +85,7 @@ jobs:
# gpg_key_id is needed for signing the rpm for the yum repository (see glowroot-central/pom.xml)
gpg_key_id=$(gpg --list-keys --with-colons | grep ^pub | cut -d':' -f5 | tail -c 8)
- mvn clean deploy -pl :glowroot-parent,:glowroot-agent-api,:glowroot-agent-plugin-api,:glowroot-agent-it-harness,:glowroot-agent,:glowroot-central \
+ mvn clean install -pl :glowroot-parent,:glowroot-agent-api,:glowroot-agent-plugin-api,:glowroot-agent-it-harness,:glowroot-agent,:glowroot-central \
-Pjavadoc \
-Prelease \
-Dglowroot.build.commit=$(git rev-parse HEAD) \
diff --git a/README.md b/README.md
index e728f87fe1..42263bd1a7 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Glowroot
## Quick start
-1. Download and unzip [glowroot-0.14.3-beta.5-dist.zip](https://github.com/glowroot/glowroot/releases/download/v0.14.3-beta.5/glowroot-0.14.3-beta.5-dist.zip)
+1. Download and unzip [glowroot-0.14.4-dist.zip](https://github.com/glowroot/glowroot/releases/download/v0.14.4/glowroot-0.14.4-dist.zip)
2. Add `-javaagent:path/to/glowroot.jar` to your application's JVM args [[where are my application server's JVM args?](https://github.com/glowroot/glowroot/wiki/Where-are-my-application-server's-JVM-args%3F)]
3. Check that the user account that runs the JVM has write access to the glowroot folder
4. Start your application
diff --git a/agent/api/pom.xml b/agent/api/pom.xml
index f26c976a6d..1912f2523c 100644
--- a/agent/api/pom.xml
+++ b/agent/api/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
diff --git a/agent/benchmarks/pom.xml b/agent/benchmarks/pom.xml
index f3d93b11ee..5079797500 100644
--- a/agent/benchmarks/pom.xml
+++ b/agent/benchmarks/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
diff --git a/agent/bytecode-api/pom.xml b/agent/bytecode-api/pom.xml
index 4857ea43e1..ab66664741 100644
--- a/agent/bytecode-api/pom.xml
+++ b/agent/bytecode-api/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
diff --git a/agent/core/pom.xml b/agent/core/pom.xml
index 3e3feaa05c..f9f4caf54b 100644
--- a/agent/core/pom.xml
+++ b/agent/core/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
@@ -17,7 +17,7 @@
Glowroot Agent Core (Unshaded)
- 9.7.1
+ 9.8
diff --git a/agent/dist-maven-plugin/pom.xml b/agent/dist-maven-plugin/pom.xml
index c9922ce676..7cd7a9706c 100644
--- a/agent/dist-maven-plugin/pom.xml
+++ b/agent/dist-maven-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
@@ -65,13 +65,13 @@
org.ow2.asm
asm
- 9.7.1
+ 9.8
org.ow2.asm
asm-commons
- 9.7.1
+ 9.8
diff --git a/agent/dist/pom.xml b/agent/dist/pom.xml
index 2189e2f8a7..23ee56149e 100644
--- a/agent/dist/pom.xml
+++ b/agent/dist/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
diff --git a/agent/embedded/pom.xml b/agent/embedded/pom.xml
index b5d30cda53..3ee8d69f3c 100644
--- a/agent/embedded/pom.xml
+++ b/agent/embedded/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
diff --git a/agent/integration-tests/pom.xml b/agent/integration-tests/pom.xml
index 537059fc99..a78f940f1c 100644
--- a/agent/integration-tests/pom.xml
+++ b/agent/integration-tests/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
diff --git a/agent/it-harness/pom.xml b/agent/it-harness/pom.xml
index 36a41d622d..0905e6bf8f 100644
--- a/agent/it-harness/pom.xml
+++ b/agent/it-harness/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
diff --git a/agent/plugin-api/pom.xml b/agent/plugin-api/pom.xml
index 5d6f55003b..f9a402ac3d 100644
--- a/agent/plugin-api/pom.xml
+++ b/agent/plugin-api/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
diff --git a/agent/plugins/camel-plugin/pom.xml b/agent/plugins/camel-plugin/pom.xml
index e8fbb0be3b..7143eb88cb 100644
--- a/agent/plugins/camel-plugin/pom.xml
+++ b/agent/plugins/camel-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/cassandra-plugin/pom.xml b/agent/plugins/cassandra-plugin/pom.xml
index e10c9edc28..a71c5c2ac0 100644
--- a/agent/plugins/cassandra-plugin/pom.xml
+++ b/agent/plugins/cassandra-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
@@ -76,35 +76,35 @@
org.ow2.asm
asm
- 9.7.1
+ 9.8
test
org.ow2.asm
asm-commons
- 9.7.1
+ 9.8
test
org.ow2.asm
asm-tree
- 9.7.1
+ 9.8
test
org.ow2.asm
asm-util
- 9.7.1
+ 9.8
test
org.ow2.asm
asm-analysis
- 9.7.1
+ 9.8
test
diff --git a/agent/plugins/ejb-plugin/pom.xml b/agent/plugins/ejb-plugin/pom.xml
index f33c79adc0..807db65235 100644
--- a/agent/plugins/ejb-plugin/pom.xml
+++ b/agent/plugins/ejb-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/elasticsearch-plugin/pom.xml b/agent/plugins/elasticsearch-plugin/pom.xml
index 63609de750..d21dfba51c 100644
--- a/agent/plugins/elasticsearch-plugin/pom.xml
+++ b/agent/plugins/elasticsearch-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/executor-plugin/pom.xml b/agent/plugins/executor-plugin/pom.xml
index 1b515ec533..b3fd0eaaf2 100644
--- a/agent/plugins/executor-plugin/pom.xml
+++ b/agent/plugins/executor-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/grails-plugin/pom.xml b/agent/plugins/grails-plugin/pom.xml
index 18637eec88..46f00b1742 100644
--- a/agent/plugins/grails-plugin/pom.xml
+++ b/agent/plugins/grails-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/hibernate-plugin/pom.xml b/agent/plugins/hibernate-plugin/pom.xml
index da1bed8fe7..4582d25893 100644
--- a/agent/plugins/hibernate-plugin/pom.xml
+++ b/agent/plugins/hibernate-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/http-client-plugin/pom.xml b/agent/plugins/http-client-plugin/pom.xml
index 98da4ef717..9b1ae93830 100644
--- a/agent/plugins/http-client-plugin/pom.xml
+++ b/agent/plugins/http-client-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
@@ -291,7 +291,7 @@
org.ow2.asm
asm
- 9.7.1
+ 9.8
test
diff --git a/agent/plugins/jakarta-servlet-plugin/pom.xml b/agent/plugins/jakarta-servlet-plugin/pom.xml
index 4026125f75..cb314ecced 100644
--- a/agent/plugins/jakarta-servlet-plugin/pom.xml
+++ b/agent/plugins/jakarta-servlet-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/java-http-server-plugin/pom.xml b/agent/plugins/java-http-server-plugin/pom.xml
index 82ece56653..1d56a006f5 100644
--- a/agent/plugins/java-http-server-plugin/pom.xml
+++ b/agent/plugins/java-http-server-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/jaxrs-plugin/pom.xml b/agent/plugins/jaxrs-plugin/pom.xml
index f2446dbf0b..fd19022bf9 100644
--- a/agent/plugins/jaxrs-plugin/pom.xml
+++ b/agent/plugins/jaxrs-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/jaxws-plugin/pom.xml b/agent/plugins/jaxws-plugin/pom.xml
index 3bc086ca77..191774a109 100644
--- a/agent/plugins/jaxws-plugin/pom.xml
+++ b/agent/plugins/jaxws-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
@@ -151,7 +151,7 @@
org.ow2.asm
asm
- 9.7.1
+ 9.8
test
diff --git a/agent/plugins/jdbc-plugin/pom.xml b/agent/plugins/jdbc-plugin/pom.xml
index 040381849c..58f454458a 100644
--- a/agent/plugins/jdbc-plugin/pom.xml
+++ b/agent/plugins/jdbc-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/jms-plugin/pom.xml b/agent/plugins/jms-plugin/pom.xml
index face6c1d07..c5183ca6bf 100644
--- a/agent/plugins/jms-plugin/pom.xml
+++ b/agent/plugins/jms-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/jsf-plugin/pom.xml b/agent/plugins/jsf-plugin/pom.xml
index 9c84bc9abd..636ae16422 100644
--- a/agent/plugins/jsf-plugin/pom.xml
+++ b/agent/plugins/jsf-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/jsp-plugin/pom.xml b/agent/plugins/jsp-plugin/pom.xml
index 2071e8422b..cb9606c843 100644
--- a/agent/plugins/jsp-plugin/pom.xml
+++ b/agent/plugins/jsp-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/kafka-plugin/pom.xml b/agent/plugins/kafka-plugin/pom.xml
index 0e447453e7..503cbb83ef 100644
--- a/agent/plugins/kafka-plugin/pom.xml
+++ b/agent/plugins/kafka-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/logger-plugin/pom.xml b/agent/plugins/logger-plugin/pom.xml
index 8d18613690..4347cb3018 100644
--- a/agent/plugins/logger-plugin/pom.xml
+++ b/agent/plugins/logger-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/mail-plugin/pom.xml b/agent/plugins/mail-plugin/pom.xml
index dea13a0528..2a0ed76b41 100644
--- a/agent/plugins/mail-plugin/pom.xml
+++ b/agent/plugins/mail-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/mongodb-plugin/pom.xml b/agent/plugins/mongodb-plugin/pom.xml
index 2b79b2d9bf..f260687fc5 100644
--- a/agent/plugins/mongodb-plugin/pom.xml
+++ b/agent/plugins/mongodb-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/netty-plugin/pom.xml b/agent/plugins/netty-plugin/pom.xml
index 7fb831d09a..77c524c4a4 100644
--- a/agent/plugins/netty-plugin/pom.xml
+++ b/agent/plugins/netty-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/play-plugin/pom.xml b/agent/plugins/play-plugin/pom.xml
index ac22316ef9..f46157d91c 100644
--- a/agent/plugins/play-plugin/pom.xml
+++ b/agent/plugins/play-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/quartz-plugin/pom.xml b/agent/plugins/quartz-plugin/pom.xml
index e870d62bce..22c7bbb09a 100644
--- a/agent/plugins/quartz-plugin/pom.xml
+++ b/agent/plugins/quartz-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/redis-plugin/pom.xml b/agent/plugins/redis-plugin/pom.xml
index 3a4490fa2c..fcabb5ce69 100644
--- a/agent/plugins/redis-plugin/pom.xml
+++ b/agent/plugins/redis-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/servlet-plugin/pom.xml b/agent/plugins/servlet-plugin/pom.xml
index b16028a413..d466e2e69b 100644
--- a/agent/plugins/servlet-plugin/pom.xml
+++ b/agent/plugins/servlet-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/spring-plugin/pom.xml b/agent/plugins/spring-plugin/pom.xml
index 907eb34fce..9ca25405b5 100644
--- a/agent/plugins/spring-plugin/pom.xml
+++ b/agent/plugins/spring-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/plugins/struts-plugin/pom.xml b/agent/plugins/struts-plugin/pom.xml
index a448cf8553..ca673eb9ac 100644
--- a/agent/plugins/struts-plugin/pom.xml
+++ b/agent/plugins/struts-plugin/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/shaded/central-https-linux/pom.xml b/agent/shaded/central-https-linux/pom.xml
index 9785627a4c..92e1c681af 100644
--- a/agent/shaded/central-https-linux/pom.xml
+++ b/agent/shaded/central-https-linux/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/shaded/central-https-osx/pom.xml b/agent/shaded/central-https-osx/pom.xml
index ceaf557212..989b1da168 100644
--- a/agent/shaded/central-https-osx/pom.xml
+++ b/agent/shaded/central-https-osx/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/shaded/central-https-windows/pom.xml b/agent/shaded/central-https-windows/pom.xml
index a6528bb0f9..bd86b0b97d 100644
--- a/agent/shaded/central-https-windows/pom.xml
+++ b/agent/shaded/central-https-windows/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
@@ -21,9 +21,9 @@
io.netty
netty-tcnative-boringssl-static
windows-x86_64
-
- 2.0.61.Final
+ 2.0.70.Final
diff --git a/agent/shaded/core/pom.xml b/agent/shaded/core/pom.xml
index 87f97cc576..59eaf4db3e 100644
--- a/agent/shaded/core/pom.xml
+++ b/agent/shaded/core/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/shaded/embedded/pom.xml b/agent/shaded/embedded/pom.xml
index 9730770c16..94148f50b8 100644
--- a/agent/shaded/embedded/pom.xml
+++ b/agent/shaded/embedded/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/shaded/it-harness/pom.xml b/agent/shaded/it-harness/pom.xml
index c31f88fe2d..7e799df23d 100644
--- a/agent/shaded/it-harness/pom.xml
+++ b/agent/shaded/it-harness/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/shaded/logging-logstash/pom.xml b/agent/shaded/logging-logstash/pom.xml
index 5468bfcb48..7fcc6517ca 100644
--- a/agent/shaded/logging-logstash/pom.xml
+++ b/agent/shaded/logging-logstash/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../../..
diff --git a/agent/ui-sandbox/pom.xml b/agent/ui-sandbox/pom.xml
index 5e5e0a5cd0..55183167c0 100644
--- a/agent/ui-sandbox/pom.xml
+++ b/agent/ui-sandbox/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
diff --git a/build/license-bundle/pom.xml b/build/license-bundle/pom.xml
index 4d4fa0a294..d81983f7a6 100644
--- a/build/license-bundle/pom.xml
+++ b/build/license-bundle/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
diff --git a/build/multi-lib-tests/pom.xml b/build/multi-lib-tests/pom.xml
index d73d023b08..8c6a4d676c 100644
--- a/build/multi-lib-tests/pom.xml
+++ b/build/multi-lib-tests/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
../..
diff --git a/central/Dockerfile b/central/Dockerfile
index 39c09960bb..291634a6ef 100644
--- a/central/Dockerfile
+++ b/central/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.5_11-jdk-jammy AS builder
+FROM eclipse-temurin:21.0.7_6-jdk-jammy AS builder
COPY target/glowroot-central-*.zip /tmp/glowroot-central.zip
RUN useradd --no-log-init -r -g root glowroot
@@ -7,7 +7,7 @@ RUN unzip -d /tmp /tmp/glowroot-central.zip \
&& chown -R glowroot:root /tmp/glowroot-central \
&& chmod -R g+rw /tmp/glowroot-central
-FROM eclipse-temurin:21.0.5_11-jdk-jammy
+FROM eclipse-temurin:21.0.7_6-jdk-jammy
COPY docker-entrypoint.sh /usr/local/bin/
COPY glowroot-central.sh /usr/local/bin/
diff --git a/central/pom.xml b/central/pom.xml
index 9cfb7d586d..094cb172bb 100644
--- a/central/pom.xml
+++ b/central/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
glowroot-central
@@ -91,19 +91,19 @@
org.infinispan
infinispan-core
- 15.0.11.Final
+ 15.2.4.Final
org.infinispan
infinispan-component-annotations
- 15.0.11.Final
+ 15.2.4.Final
compile
org.jgroups
jgroups
- 5.3.10.Final
+ 5.4.5.Final
jakarta.servlet
@@ -170,12 +170,12 @@
org.slf4j
slf4j-api
- 2.0.16
+ 2.0.17
org.slf4j
jul-to-slf4j
- 2.0.16
+ 2.0.17
ch.qos.logback
@@ -196,7 +196,7 @@
net.bytebuddy
byte-buddy
- 1.15.10
+ 1.17.5
@@ -250,19 +250,19 @@
org.testcontainers
testcontainers
- 1.19.7
+ 1.21.1
test
org.testcontainers
cassandra
- 1.19.7
+ 1.21.1
test
org.testcontainers
junit-jupiter
- 1.19.7
+ 1.21.1
test
@@ -384,7 +384,7 @@
de.dentrassi.maven
rpm
- 1.8.0
+ 1.12.0
true
diff --git a/common/pom.xml b/common/pom.xml
index 418f72eca0..05445f36d3 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
glowroot-common
diff --git a/common2/pom.xml b/common2/pom.xml
index f3fd95802e..8afefe6cc9 100644
--- a/common2/pom.xml
+++ b/common2/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
glowroot-common2
diff --git a/pom.xml b/pom.xml
index 5fd5741ae6..216a4b4bb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
pom
Glowroot Parent Project
@@ -91,17 +91,17 @@
- 1.65.1
+ 1.73.0
3.25.3
3.25.3
- 4.1.100.Final
+ 4.1.110.Final
1.2.13
1.7.36
2.10.1
3.42.0
1.33
- 5.10.2
+ 5.12.2
UTF-8
UTF-8
yyyy-MM-dd HH:mm:ss Z
@@ -231,12 +231,12 @@
org.mockito
mockito-core
- 5.11.0
+ 5.18.0
org.mockito
mockito-junit-jupiter
- 5.11.0
+ 5.18.0
test
diff --git a/ui/pom.xml b/ui/pom.xml
index 5211309627..bc0bd051e6 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
glowroot-ui
diff --git a/ui/src/main/java/org/glowroot/ui/AdminJsonService.java b/ui/src/main/java/org/glowroot/ui/AdminJsonService.java
index 2b83e05249..ab0367f9b7 100644
--- a/ui/src/main/java/org/glowroot/ui/AdminJsonService.java
+++ b/ui/src/main/java/org/glowroot/ui/AdminJsonService.java
@@ -255,7 +255,7 @@ String getHealthchecksIoConfig() throws Exception {
String getAllAdmin() throws Exception {
Object config;
if (central) {
- config = configRepository.getAllCentralAdminConfig();
+ config = configRepository.getAllCentralAdminConfig().toCompletableFuture().get();
} else {
config = configRepository.getAllEmbeddedAdminConfig();
}
@@ -561,7 +561,7 @@ String testHttpProxy(@BindRequest HttpProxyConfigDto configDto) throws IOExcepti
StringBuilder sb = new StringBuilder();
try (JsonGenerator jg = mapper.getFactory().createGenerator(CharStreams.asWriter(sb))) {
jg.writeStartObject();
- jg.writeStringField("content", responseContent);
+ jg.writeStringField("content", "received http status 200 OK response");
jg.writeEndObject();
}
return sb.toString();
diff --git a/webdriver-tests/pom.xml b/webdriver-tests/pom.xml
index 83a2c7f602..a61a1a6d90 100644
--- a/webdriver-tests/pom.xml
+++ b/webdriver-tests/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
..
@@ -215,35 +215,35 @@
org.ow2.asm
asm
- 9.7.1
+ 9.8
test
org.ow2.asm
asm-commons
- 9.7.1
+ 9.8
test
org.ow2.asm
asm-tree
- 9.7.1
+ 9.8
test
org.ow2.asm
asm-util
- 9.7.1
+ 9.8
test
org.ow2.asm
asm-analysis
- 9.7.1
+ 9.8
test
diff --git a/wire-api/pom.xml b/wire-api/pom.xml
index 1f3d0820ea..3e84c24636 100644
--- a/wire-api/pom.xml
+++ b/wire-api/pom.xml
@@ -7,7 +7,7 @@
org.glowroot
glowroot-parent
- 0.14.3-SNAPSHOT
+ 0.14.5-beta.1-SNAPSHOT
glowroot-wire-api