Repository navigation
Commit c9a84ee
build(samples): [Sample Tests 47] Move the JVM samples to their own build (#6394)
* build(samples): Move the JVM samples to their own build
The 28 JVM samples are now a standalone Gradle build in sentry-samples
that includes the SDK build, like the Android sample and the Android
integration tests. They depend on io.sentry:* coordinates, which Gradle
substitutes with the SDK's projects. The SDK build doesn't include them
back, so the Spring Boot, gretty and shadow plugins the samples apply no
longer load in the SDK build.
The three bootRunWithAgent tasks find the agent jar from the repository
root and take the SDK version from the catalog, since the samples build
has its own root directory and gradle.properties.
With no samples or integration tests left in the SDK build, the name
filters that skipped them for publishing and CodeQL go too.
Root check and spotlessApply no longer reach the samples, so preMerge runs
this build's check, which covers what the root check ran for them:
compilation, jars and spotless. The format workflow runs its
spotlessApply.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* build(samples): Link the JVM samples' Gradle files to the SDK build's
gradle.properties, gradlew, gradle/wrapper and
gradle/gradle-daemon-jvm.properties are now symlinks to the SDK build's
files, as in the Android sample and integration test builds. The copied
gradle.properties had drifted from the root one (-Xmx6g and
CrashOnOutOfMemoryError), and the build had no wrapper or daemon JDK pin.
The settings read the SDK version from the shared versionName property,
use the root build's Develocity plugin version, and include each sample
on its own line, matching the other separate builds.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* build(samples): Apply the convention plugins in each JVM sample
Each sample applies io.sentry.spotless and io.sentry.jdk-target in its
own plugins block, as the modules of the other separate builds do,
instead of the root script applying them to every subproject.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* ci(samples): Check the JVM samples in the Samples workflow
The JVM samples' check runs as its own job in the Samples workflow, like
the other separate builds, instead of through checkSamples in make
preMerge, so it no longer lengthens the required Build job. Dependabot
scans their build too.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* build: Drop the root's Spring dependency-management declaration
With the JVM samples in their own build, no project in the SDK build
applies io.spring.dependency-management.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* build(samples): Drop the comment on the JVM samples' root plugins
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* build(samples): Drop the header comment from the JVM samples' settings
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* build(samples): Declare the servlet sample's SDK version before using it
The dependencies block read sentryVersion before its declaration ran, so the
sample asked for io.sentry:sentry-servlet:null. The composite build substitutes
the SDK project by group and name, which hid it, but resolving published
artifacts would fail.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>1 parent c22fe1a commit c9a84ee
41 files changed
Lines changed: 288 additions & 183 deletions
File tree
- .cursor/rules
- .github
- workflows
- sentry-samples
- gradle
- sentry-samples-console-opentelemetry-noagent
- sentry-samples-console-otlp
- sentry-samples-console
- sentry-samples-jul
- sentry-samples-ktor-client
- sentry-samples-log4j2
- sentry-samples-logback
- sentry-samples-netflix-dgs
- sentry-samples-openfeign
- sentry-samples-servlet
- sentry-samples-spring-7
- sentry-samples-spring-boot-4-log4j2
- sentry-samples-spring-boot-4-opentelemetry-noagent
- sentry-samples-spring-boot-4-opentelemetry
- sentry-samples-spring-boot-4-otlp
- sentry-samples-spring-boot-4-webflux
- sentry-samples-spring-boot-4
- sentry-samples-spring-boot-jakarta-log4j2
- sentry-samples-spring-boot-jakarta-opentelemetry-noagent
- sentry-samples-spring-boot-jakarta-opentelemetry
- sentry-samples-spring-boot-jakarta
- sentry-samples-spring-boot-opentelemetry-noagent
- sentry-samples-spring-boot-opentelemetry
- sentry-samples-spring-boot-webflux-jakarta
- sentry-samples-spring-boot-webflux
- sentry-samples-spring-boot
- sentry-samples-spring-jakarta
- sentry-samples-spring
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
44 | 39 | | |
45 | 40 | | |
46 | 41 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
| 28 | + | |
27 | 29 | | |
28 | 30 | | |
29 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
70 | 73 | | |
71 | 74 | | |
72 | 75 | | |
| |||
113 | 116 | | |
114 | 117 | | |
115 | 118 | | |
116 | | - | |
| 119 | + | |
117 | 120 | | |
118 | 121 | | |
119 | 122 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
| 38 | + | |
37 | 39 | | |
38 | 40 | | |
39 | 41 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | 20 | | |
22 | 21 | | |
23 | 22 | | |
| |||
51 | 50 | | |
52 | 51 | | |
53 | 52 | | |
54 | | - | |
55 | | - | |
56 | | - | |
| 53 | + | |
57 | 54 | | |
58 | 55 | | |
59 | 56 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
0 commit comments