Skip to content

Commit 188ea4f

Browse files
authored
Merge pull request #38 from SDA-SE/fix/endlessrun
enhance java version
2 parents 9160ce1 + 0913cb5 commit 188ea4f

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed
-17 Bytes
Binary file not shown.

statistic-client/.gradle/buildOutputCleanup/cache.properties

Lines changed: 0 additions & 2 deletions
This file was deleted.
-18.4 KB
Binary file not shown.

statistic-client/.gradle/vcs-1/gc.properties

Whitespace-only changes.

statistic-client/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313
// Apply the application plugin to add support for building a CLI application in Java.
1414
id 'application'
1515

16-
id 'com.google.cloud.tools.jib' version '3.3.2'
16+
id 'com.google.cloud.tools.jib' version '3.4.3'
1717
}
1818

1919
apply plugin: 'idea'
@@ -60,7 +60,7 @@ application {
6060
mainClass = 'org.sdase.Main'
6161
}
6262

63-
jib.from.image ='gcr.io/distroless/java17:nonroot' // newer versions are generating a StackOverflow bug
63+
jib.from.image ='gcr.io/distroless/java21:nonroot' // newer versions are generating a StackOverflow bug
6464
jib.to.image = 'quay.io/sdase/defectdojo-statistic-client'
6565

6666
// New version create StackOverflow
@@ -69,4 +69,4 @@ jib.to.image = 'quay.io/sdase/defectdojo-statistic-client'
6969
// languageVersion.set(JavaLanguageVersion.of(17))
7070
// }
7171
//}
72-
sourceCompatibility = JavaVersion.VERSION_17
72+
sourceCompatibility = JavaVersion.VERSION_21

statistic-client/src/main/groovy/org/sdase/StatisticClient.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ class StatisticClient {
4848
def productService = new ProductService(dojoConf)
4949
//noinspection GroovyAccessibility -- see comment above
5050
productService.DEFECT_DOJO_OBJET_LIMIT = 3000
51-
log.debug("limit is set to productService.DEFECT_DOJO_OBJET_LIMIT ${productService.DEFECT_DOJO_OBJET_LIMIT}")
51+
log.info("limit is set to productService.DEFECT_DOJO_OBJET_LIMIT ${productService.DEFECT_DOJO_OBJET_LIMIT}")
5252
def findingService = new FindingService(dojoConf)
5353
//noinspection GroovyAccessibility -- see comment above
5454
findingService.DEFECT_DOJO_OBJET_LIMIT = 3000
55-
log.debug("limit is set to findingService.DEFECT_DOJO_OBJET_LIMIT ${findingService.DEFECT_DOJO_OBJET_LIMIT}")
55+
log.info("limit is set to findingService.DEFECT_DOJO_OBJET_LIMIT ${findingService.DEFECT_DOJO_OBJET_LIMIT}")
5656

5757
generateResponseStatistic(productService, findingService, startDate, endDate)
5858
}
@@ -88,6 +88,7 @@ class StatisticClient {
8888
SortedSet<String> environments = new TreeSet<String>()
8989
SortedSet<String> teams = new TreeSet<String>()
9090
List<Product> products = productService.search([:])
91+
log.info "${products.size()} products found, filtering"
9192

9293
// filter products, @see shouldIncludeProduct
9394
products = products.stream()

0 commit comments

Comments
 (0)