Skip to content

Merge upstream #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ghedwards merged 18 commits into from
Jul 9, 2025
Merged

Merge upstream #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
41817c1
Upd infinispan
Nowheresly Jan 30, 2025
ec1a8ee
Fix do not return url content
Nowheresly Jan 30, 2025
5eb7aa7
Upd infinispan
Nowheresly Apr 27, 2025
543926f
Upd dentrassi plugin
Nowheresly Apr 27, 2025
5ec1db6
Upd jdk 21.0.7 Dockerfile
Nowheresly Apr 27, 2025
7b48bf0
Upd asm 9.8
Nowheresly Apr 27, 2025
6301010
Upd grpc
Nowheresly Apr 27, 2025
6ecd285
Release version 0.14.3
github-actions[bot] Apr 28, 2025
b4be0a0
Revert "Release version 0.14.3"
Nowheresly May 1, 2025
172d28e
Tmp deactivate depoy to maven repository
Nowheresly May 1, 2025
05d3be0
Release version 0.14.3
github-actions[bot] May 1, 2025
f8b3af0
Prepare version 0.14.4
Nowheresly May 6, 2025
383915c
Release version 0.14.4
github-actions[bot] May 7, 2025
2cebb2f
Prepare version 0.14.5-beta.1
Nowheresly Jun 9, 2025
aaa6057
Upd infinispan + mockito + slf4j + testcontainers
Nowheresly Jun 9, 2025
74929ab
Upd byte buddy + grpc + junit
Nowheresly Jun 9, 2025
4620518
fix #1134 cannot export admin config
Jun 24, 2025
3df46a5
Upd infinispan
Nowheresly Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion agent/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/benchmarks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/bytecode-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions agent/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -17,7 +17,7 @@
<description>Glowroot Agent Core (Unshaded)</description>

<properties>
<asm.version>9.7.1</asm.version>
<asm.version>9.8</asm.version>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions agent/dist-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down Expand Up @@ -65,13 +65,13 @@
<!-- this is to resolve maven enforcer RequireUpperBoundDeps error -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.7.1</version>
<version>9.8</version>
</dependency>
<dependency>
<!-- this is to resolve maven enforcer RequireUpperBoundDeps error -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.7.1</version>
<version>9.8</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion agent/dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/embedded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/it-harness/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugin-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/camel-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
12 changes: 6 additions & 6 deletions agent/plugins/cassandra-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down Expand Up @@ -76,35 +76,35 @@
<!-- this is to resolve maven enforcer RequireUpperBoundDeps error -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.7.1</version>
<version>9.8</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- this is to resolve maven enforcer RequireUpperBoundDeps error -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.7.1</version>
<version>9.8</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- this is to resolve maven enforcer RequireUpperBoundDeps error -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>9.7.1</version>
<version>9.8</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- this is to resolve maven enforcer RequireUpperBoundDeps error -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>9.7.1</version>
<version>9.8</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- this is to resolve maven enforcer RequireUpperBoundDeps error -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>9.7.1</version>
<version>9.8</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/ejb-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/elasticsearch-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/executor-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/grails-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/hibernate-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions agent/plugins/http-client-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down Expand Up @@ -291,7 +291,7 @@
<!-- this is to resolve maven enforcer RequireUpperBoundDeps error -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.7.1</version>
<version>9.8</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/jakarta-servlet-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/java-http-server-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/jaxrs-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions agent/plugins/jaxws-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down Expand Up @@ -151,7 +151,7 @@
<!-- this is to resolve maven enforcer RequireUpperBoundDeps error -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.7.1</version>
<version>9.8</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/jdbc-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/jms-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/jsf-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/jsp-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/kafka-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/logger-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/mail-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/mongodb-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/netty-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/play-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion agent/plugins/quartz-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.glowroot</groupId>
<artifactId>glowroot-parent</artifactId>
<version>0.14.3-SNAPSHOT</version>
<version>0.14.5-beta.1-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down
Loading
Loading