Skip to content
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.

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

Merge develop into master for release #3413

Merged
merged 38 commits into from
Sep 6, 2024
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
12b0c21
updated wrapper version to latest released #3387
sven-dmlr Aug 23, 2024
16e023e
Merge pull request #3389 from mercedes-benz/feature-3387-secretvalida…
sven-dmlr Aug 23, 2024
34bdc41
Merge pull request #3388 from mercedes-benz/master
sven-dmlr Aug 23, 2024
55f43e6
documentation regarding fp declaration improved #3390
sven-dmlr Aug 26, 2024
60b5f91
Bump gradle/actions from 4.0.0 to 4.0.1
dependabot[bot] Aug 26, 2024
95c601a
Remove gradle file which seems unnecessary #3397
winzj Aug 29, 2024
43af879
Merge pull request #3398 from mercedes-benz/fix-3397-remove-not-neces…
winzj Aug 29, 2024
4cf161b
Merge pull request #3391 from mercedes-benz/dependabot/github_actions…
sven-dmlr Aug 29, 2024
eedf098
Merge pull request #3399 from mercedes-benz/feature-3390-client-false…
sven-dmlr Aug 30, 2024
5e59dfd
Simplify projectData fp JSON #3400
winzj Sep 2, 2024
8d62e5a
Refactor and documentation #3401
winzj Sep 2, 2024
b157ee0
Fix failing test #3401
winzj Sep 2, 2024
9bdfedf
fix failing unit test #3401
winzj Sep 2, 2024
836b168
minor changes #3401
winzj Sep 3, 2024
64a3b1f
PR review changes #3401
winzj Sep 3, 2024
a04cc6d
Merge pull request #3401 from mercedes-benz/feature-3400-simplify-fp-…
winzj Sep 3, 2024
a92eb13
new projectData structure added #3390
sven-dmlr Sep 3, 2024
c957342
Refactored ArchUnit root import path (#3396)
lorriborri Sep 3, 2024
8cef50d
Merge branch 'develop' into feature-3390-enable-projectData-in-client
sven-dmlr Sep 3, 2024
e653306
Improve default value handling #3408
winzj Sep 4, 2024
b22b33f
added projectData handling #3390
sven-dmlr Sep 4, 2024
c5e53c1
Change behaviour to update fp projectData entry when same id is sent …
winzj Sep 4, 2024
48ae5cc
added unmark false-positives for projectData #3390
sven-dmlr Sep 4, 2024
83da7e4
change to tab indentation instead of blanks #3390
sven-dmlr Sep 5, 2024
94deb0a
Handle logging for project data false positive handling #3408
winzj Sep 5, 2024
b844cb9
defineFalsePositives implemented #3390
sven-dmlr Sep 5, 2024
d8512df
interactiveUnmarkFalsePositives implemented #3390
sven-dmlr Sep 6, 2024
e3b2181
branch logic improved #3390
sven-dmlr Sep 6, 2024
b4bc079
documentation improved #3390
sven-dmlr Sep 6, 2024
de7b612
documentation improved #3390
sven-dmlr Sep 6, 2024
bb9717e
typo fixed #3390
sven-dmlr Sep 6, 2024
5f5d3c2
documentation improved #3390
sven-dmlr Sep 6, 2024
842a0c3
PR suggestion added #3390
sven-dmlr Sep 6, 2024
0b0ee5a
fixed failing integrationtest #3390
sven-dmlr Sep 6, 2024
e8ce9da
documentation improved #3390
sven-dmlr Sep 6, 2024
e39d8f7
fixed failing integrationtest #3390
sven-dmlr Sep 6, 2024
7c9c244
documentation improved #3390
sven-dmlr Sep 6, 2024
33603f3
Merge pull request #3409 from mercedes-benz/feature-3390-enable-proje…
sven-dmlr Sep 6, 2024
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
Prev Previous commit
Next Next commit
fixed failing integrationtest #3390
sven-dmlr committed Sep 6, 2024

Verified

This commit was signed with the committer’s verified signature.
elim Takeru Naito
commit e39d8f758db66fc7f3aa4d4d8760d93c9a81c7eb
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ void json_content_as_described_in_example_of_documentation() {
FalsePositiveJobData jd2 = it.next();
assertEquals(1, jd1.getFindingId());
assertEquals("6cfa2ccf-da13-4dee-b529-0225ed9661bd", jd1.getJobUUID().toString());
assertEquals("Absolute Path Traversal, can be ignored because not in deployment", jd1.getComment());
assertEquals("Can be ignored because not in deployment", jd1.getComment());
assertEquals(15, jd2.getFindingId());
assertEquals("6cfa2ccf-da13-4dee-b529-0225ed9661bd", jd2.getJobUUID().toString());
assertNull(jd2.getComment());