Skip to content

Commit 89b4c95

Browse files
committed
Merge branch 'java' into 'master'
updated Groovy and Kotlin commands See merge request CodeScoring/docs!632
2 parents ea236f4 + 561833d commit 89b4c95

File tree

3 files changed

+42
-8
lines changed

3 files changed

+42
-8
lines changed

docs/changelog/on-premise-changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ hide:
848848

849849
### [2024.22.2] - 2024-05-28
850850

851-
- Добавлена возможность запуска платформе с опцией readOnlyRootFilesystem в Kubernetes
851+
- Добавлена возможность запуска платформы с опцией readOnlyRootFilesystem в Kubernetes
852852
- Ускорен поиск в разделах Dependencies, Policy Alerts и Components
853853
- Улучшена сортировка по полю Dependency/Package в разделе Policy Alerts
854854
- Добавлена очистка временных файлов после принудительного завершения сканирования образа

docs/dependencies/java.en.md

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,33 @@ Add to `build.gradle` file code:
4141

4242
```
4343
subprojects {
44-
task CodeScoring_All_Dependencies(type: DependencyReportTask) {}
44+
afterEvaluate { project ->
45+
project.tasks.register('CodeScoring_All_Dependencies', DependencyReportTask)
46+
}
4547
}
4648
49+
tasks.register('CodeScoring_All_Dependencies') {
50+
dependsOn subprojects.findAll {
51+
it.tasks.findByName('CodeScoring_All_Dependencies') != null
52+
}.collect {
53+
it.tasks.named('CodeScoring_All_Dependencies')
54+
}
55+
}
4756
```
4857
#### Kotlin
4958

5059
Add to `build.gradle.kts` file code:
5160
```
52-
5361
subprojects {
54-
tasks.register<DependencyReportTask>("CodeScoring_All_Dependencies"){}
62+
afterEvaluate {
63+
tasks.register<DependencyReportTask>("CodeScoring_All_Dependencies")
64+
}
65+
}
66+
67+
tasks.register("CodeScoring_All_Dependencies") {
68+
dependsOn(subprojects.mapNotNull {
69+
it.tasks.findByName("CodeScoring_All_Dependencies")
70+
})
5571
}
5672
```
5773

@@ -68,4 +84,4 @@ After generating artifacts, you need to use the console agent command [scan file
6884
scan file ./gradle-dependency-tree.txt \
6985
--api_token <api_token> \
7086
--api_url <api_url>
71-
```
87+
```

docs/dependencies/java.md

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,17 @@ mvn dependency:tree -DoutputFile=maven-dependency-tree.txt
3939

4040
```
4141
subprojects {
42-
task CodeScoring_All_Dependencies(type: DependencyReportTask) {}
42+
afterEvaluate { project ->
43+
project.tasks.register('CodeScoring_All_Dependencies', DependencyReportTask)
44+
}
45+
}
46+
47+
tasks.register('CodeScoring_All_Dependencies') {
48+
dependsOn subprojects.findAll {
49+
it.tasks.findByName('CodeScoring_All_Dependencies') != null
50+
}.collect {
51+
it.tasks.named('CodeScoring_All_Dependencies')
52+
}
4353
}
4454
```
4555

@@ -49,7 +59,15 @@ subprojects {
4959

5060
```
5161
subprojects {
52-
tasks.register<DependencyReportTask>("CodeScoring_All_Dependencies"){}
62+
afterEvaluate {
63+
tasks.register<DependencyReportTask>("CodeScoring_All_Dependencies")
64+
}
65+
}
66+
67+
tasks.register("CodeScoring_All_Dependencies") {
68+
dependsOn(subprojects.mapNotNull {
69+
it.tasks.findByName("CodeScoring_All_Dependencies")
70+
})
5371
}
5472
```
5573

@@ -66,4 +84,4 @@ subprojects {
6684
scan file ./gradle-dependency-tree.txt \
6785
--api_token <api_token> \
6886
--api_url <api_url>
69-
```
87+
```

0 commit comments

Comments
 (0)