Skip to content

Fix failing build of DefectDojo persistance hook #1820

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.

Sign up for GitHub

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

Merged
Zero3141 merged 12 commits into from
Jul 24, 2023
Merged

Fix failing build of DefectDojo persistance hook #1820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1196701
Add plugin to check dependency updates
Weltraumschaf Jul 20, 2023
71a4194
Update kubernete client java lib
Weltraumschaf Jul 20, 2023
1eab3b9
Update spring java lib
Weltraumschaf Jul 20, 2023
ade802f
Start with 1.0.0-SNAPSHOT in DefectDojo hook
Weltraumschaf Jul 20, 2023
e7016d6
Use our latest client lib in DefectDojo hook
Weltraumschaf Jul 20, 2023
e9a23bd
Use latest Jackson java lib
Weltraumschaf Jul 20, 2023
1a124a3
Use latest Lombok plugin
Weltraumschaf Jul 20, 2023
a5714d5
Use latest JUnit java lib
Weltraumschaf Jul 20, 2023
04352b6
Use latest Mockito java lib
Weltraumschaf Jul 20, 2023
6215b4a
Use latest SLF4J java lib
Weltraumschaf Jul 20, 2023
5772f40
Use latest kubernetes client java lib
Weltraumschaf Jul 20, 2023
828ccd1
Update Gradle wrapper scripts
Weltraumschaf Jul 20, 2023
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
49 changes: 26 additions & 23 deletions hooks/persistence-defectdojo/hook/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,59 @@
// SPDX-License-Identifier: Apache-2.0

plugins {
id 'java'
id "io.freefair.lombok" version "6.5.0-rc1"
id 'java'
id "io.freefair.lombok" version "8.1.0"
// https://github.com/ben-manes/gradle-versions-plugin
// Run: ./gradlew dependencyUpdates -Drevision=release
id "com.github.ben-manes.versions" version "0.47.0"
}

group = 'io.securecodebox'
version = '0.1.0-SNAPSHOT'
version = '1.0.0-SNAPSHOT'
sourceCompatibility = '17'

repositories {
mavenCentral()
mavenCentral()
maven {
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
}

dependencies {
implementation 'io.kubernetes:client-java:12.0.0'
implementation 'io.kubernetes:client-java:18.0.1'

implementation 'io.securecodebox:defectdojo-client:0.0.41-SNAPSHOT'
implementation 'io.securecodebox:defectdojo-client:1.0.0-SNAPSHOT'

implementation group: 'org.springframework', name: 'spring-web', version: '5.3.9'
implementation 'com.fasterxml.jackson.core:jackson-core:2.12.4'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.12.4'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.4'
implementation group: 'org.springframework', name: 'spring-web', version: '5.3.28'
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.2'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2'

implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
implementation 'org.slf4j:slf4j-log4j12:1.7.30'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
implementation 'org.slf4j:slf4j-log4j12:2.0.7'

testImplementation(platform('org.junit:junit-bom:5.7.0'))
testImplementation(platform('org.junit:junit-bom:5.9.3'))
testImplementation('org.junit.jupiter:junit-jupiter')

testImplementation "org.mockito:mockito-core:2.+"
testImplementation "org.mockito:mockito-junit-jupiter:2.+"
testImplementation "org.mockito:mockito-core:5.4.0"
testImplementation "org.mockito:mockito-junit-jupiter:5.4.0"
}

test {
useJUnitPlatform()
useJUnitPlatform()

testLogging {
events "failed"
exceptionFormat "full"
}
testLogging {
events "failed"
exceptionFormat "full"
}
}

def mainClassName = "io.securecodebox.persistence.DefectDojoPersistenceProvider"

jar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE

manifest {
attributes "Main-Class": "$mainClassName"
}
Expand All @@ -62,5 +65,5 @@ jar {
}

// Exclude signatures from dependency jars, as these would not match the fat jars content.
exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA'
exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA'
}
Binary file modified hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading