Merge branch 'main' into feat/local-sentry-span · getsentry/sentry-java@15ec991 · GitHub

getsentry / sentry-java Public

• Notifications You must be signed in to change notification settings
• Fork 478
• Star 1.4k

• Code
• Issues 273
• Pull requests 70
• Discussions
• Actions
• Projects
• Security and quality 1
• Insights

Additional navigation options

Commit 15ec991

Browse filesBrowse the repository at this point in the historyBrowse files

markushi

authored

Merge branch 'main' into feat/local-sentry-span

2 parents ab4cef2 + 1511066 commit 15ec991
Copy full SHA for 15ec991

18 files changed

+72-57Lines changed: 72 additions & 57 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .github/workflows
  • agp-matrix.yml
  • build.yml
  • codeql-analysis.yml
  • enforce-license-compliance.yml
  • format-code.yml
  • generate-javadocs.yml
  • integration-tests-macrobenchmark.yml
  • integration-tests-size.yml
  • integration-tests-ui-critical.yml
  • integration-tests-ui.yml
  • release-build.yml
  • release.yml
  • spring-boot-2-matrix.yml
  • spring-boot-3-matrix.yml
  • spring-boot-4-matrix.yml
  • system-tests-backend.yml
• CHANGELOG.md
• sentry/src/main/java/io/sentry/internal
  • ManifestVersionReader.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.github/workflows/agp-matrix.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/agp-matrix.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -33,7 +33,7 @@ jobs:
33	33	submodules: 'recursive'
34	34
35	35	- name: Setup Java Version
36		- uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
	36	+ uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
37	37	with:
38	38	distribution: 'temurin'
39	39	java-version: '17'

Collapse file

‎.github/workflows/build.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/build.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -25,7 +25,7 @@ jobs:
25	25	submodules: 'recursive'
26	26
27	27	- name: Setup Java Version
28		- uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
	28	+ uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
29	29	with:
30	30	distribution: 'temurin'
31	31	java-version: '17'

Collapse file

‎.github/workflows/codeql-analysis.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/codeql-analysis.yml

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -25,7 +25,7 @@ jobs:
25	25	submodules: 'recursive'
26	26
27	27	- name: Setup Java Version
28		- uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
	28	+ uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
29	29	with:
30	30	distribution: 'temurin'
31	31	java-version: '17'
@@ -36,7 +36,7 @@ jobs:
36	36	cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
37	37
38	38	- name: Initialize CodeQL
39		- uses: github/codeql-action/init@cdf488f595d80d6e07e03d4674febd5ab45fa938 # pin@v2
	39	+ uses: github/codeql-action/init@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # pin@v2
40	40	with:
41	41	languages: 'java'
42	42
@@ -45,4 +45,4 @@ jobs:
45	45	./gradlew buildForCodeQL --no-build-cache
46	46
47	47	- name: Perform CodeQL Analysis
48		- uses: github/codeql-action/analyze@cdf488f595d80d6e07e03d4674febd5ab45fa938 # pin@v2
	48	+ uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # pin@v2

Collapse file

‎.github/workflows/enforce-license-compliance.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/enforce-license-compliance.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -14,7 +14,7 @@ jobs:
14	14	uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
15	15
16	16	- name: Set up Java
17		- uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
	17	+ uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
18	18	with:
19	19	distribution: 'temurin'
20	20	java-version: '17'

Collapse file

‎.github/workflows/format-code.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/format-code.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ jobs:
13	13	submodules: 'recursive'
14	14
15	15	- name: set up JDK 17
16		- uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
	16	+ uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
17	17	with:
18	18	distribution: 'temurin'
19	19	java-version: '17'

Collapse file

‎.github/workflows/generate-javadocs.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/generate-javadocs.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -14,7 +14,7 @@ jobs:
14	14	submodules: 'recursive'
15	15
16	16	- name: set up JDK 17
17		- uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
	17	+ uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
18	18	with:
19	19	distribution: 'temurin'
20	20	java-version: '17'

Collapse file

‎.github/workflows/integration-tests-macrobenchmark.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/integration-tests-macrobenchmark.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -23,7 +23,7 @@ jobs:
23	23	uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
24	24
25	25	- name: 'Set up Java: 17'
26		- uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
	26	+ uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
27	27	with:
28	28	distribution: 'temurin'
29	29	java-version: '17'

Collapse file

‎.github/workflows/integration-tests-size.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/integration-tests-size.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -23,7 +23,7 @@ jobs:
23	23	uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
24	24
25	25	- name: Setup Java Version
26		- uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
	26	+ uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
27	27	with:
28	28	distribution: "temurin"
29	29	java-version: "17"

Collapse file

‎.github/workflows/integration-tests-ui-critical.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/integration-tests-ui-critical.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -30,7 +30,7 @@ jobs:
30	30	uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
31	31
32	32	- name: Set up Java 17
33		- uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
	33	+ uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
34	34	with:
35	35	distribution: 'temurin'
36	36	java-version: '17'

Collapse file

‎.github/workflows/integration-tests-ui.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/integration-tests-ui.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -27,7 +27,7 @@ jobs:
27	27	submodules: 'recursive'
28	28
29	29	- name: 'Set up Java: 17'
30		- uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
	30	+ uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
31	31	with:
32	32	distribution: 'temurin'
33	33	java-version: '17'

0 commit comments

Comments

0 (0)