Skip to content

Commit

Permalink
feat: upgrading dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tomasbjerre committed Oct 4, 2024
1 parent 4f89c8c commit b78d510
Show file tree
Hide file tree
Showing 24 changed files with 27,335 additions and 27,706 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ This is a Java library for parsing report files like static code analysis.

Example of supported reports are available [here](https://github.com/tomasbjerre/violations-lib/tree/master/src/test/resources).

| Version | Java Version |
| --------------------| ------------ |
| version < 1.156.8 | 8 |
| 1.156.8 <= version | 11 |

A number of **parsers** have been implemented. Some **parsers** can parse output from several **reporters**.

| Reporter | Parser | Notes
Expand Down
101 changes: 37 additions & 64 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,71 +1,44 @@
apply plugin: 'java-library'

buildscript {
repositories {
mavenCentral()
mavenLocal()
}
dependencies {
classpath 'se.bjurr.gradle:gradle-scripts:2.+'
classpath 'org.jsonschema2pojo:jsonschema2pojo-gradle-plugin:1.2.1'
}
plugins {
id "se.bjurr.gradle.conventional-release"
id "se.bjurr.gradle.java-convention"
id "se.bjurr.gradle.update-versions"
}
project.ext.buildConfig = [
publishing: [
relocate: [
'com.google',
'com.jakewharton'
]
],
violations: [
updateReadme: true
],
staticCodeAnalysis: [
maxViolations: 5
],
sourceCompatibility: 11,
targetCompatibility: 11
]
apply from: project.buildscript.classLoader.getResource('main.gradle').toURI()

/*
apply plugin: 'jsonschema2pojo'
// A bit ugly: https://github.com/joelittlejohn/jsonschema2pojo/issues/1594
[
// [
// from: "${rootDir}/src/main/resources/json/sarif-schema.json",
// to: "se.bjurr.violations.lib.model.generated.sarif"
// ],
// [
// from: "${rootDir}/src/main/resources/json/coverity-schema.json",
// to: "se.bjurr.violations.lib.model.generated.coverity"
// ]
].each { codeGen ->
logger.lifecycle("Generating ${codeGen.from} to ${codeGen.to}")
jsonSchema2Pojo {
source = files(codeGen.from)
targetDirectory = file("src/gen/java")
targetPackage = codeGen.to
generateBuilders = true
annotationStyle = 'none'
includeGeneratedAnnotation = false
removeOldOutput = false
}
}
spotlessJava.dependsOn generateJsonSchema2Pojo
sourcesJar.dependsOn generateJsonSchema2Pojo
javadocJar.dependsOn generateJsonSchema2Pojo
*/
apply plugin: 'jsonschema2pojo'
// A bit ugly: https://github.com/joelittlejohn/jsonschema2pojo/issues/1594
[
// [
// from: "${rootDir}/src/main/resources/json/sarif-schema.json",
// to: "se.bjurr.violations.lib.model.generated.sarif"
// ],
// [
// from: "${rootDir}/src/main/resources/json/coverity-schema.json",
// to: "se.bjurr.violations.lib.model.generated.coverity"
// ]
].each { codeGen ->
logger.lifecycle("Generating ${codeGen.from} to ${codeGen.to}")
jsonSchema2Pojo {
source = files(codeGen.from)
targetDirectory = file("src/gen/java")
targetPackage = codeGen.to
generateBuilders = true
annotationStyle = 'none'
includeGeneratedAnnotation = false
removeOldOutput = false
}
}
spotlessJava.dependsOn generateJsonSchema2Pojo
sourcesJar.dependsOn generateJsonSchema2Pojo
javadocJar.dependsOn generateJsonSchema2Pojo
*/

dependencies {
api 'com.google.code.gson:gson:2.10.1'
api 'com.google.code.gson:gson:2.11.0'

testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.25.3'
testImplementation 'uk.co.jemos.podam:podam:8.0.1.RELEASE'
testImplementation 'com.approvaltests:approvaltests:23.0.1'
testImplementation 'com.networknt:json-schema-validator:1.4.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.26.3'
testImplementation 'uk.co.jemos.podam:podam:8.0.2.RELEASE'
testImplementation 'com.approvaltests:approvaltests:24.7.0'
testImplementation 'com.networknt:json-schema-validator:1.5.2'
}
10 changes: 7 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#Mon Sep 02 18:16:59 CEST 2024
description=A collection of scripts
version=1.157.3
#Fri Oct 04 18:05:35 CEST 2024
description=Parsing report files like static code analysis
group=se.bjurr.violations
maxViolations=5
relocate=com.google,com.jakewharton
sourceCompatibility=11
targetCompatibility=11
version=1.157.4
5 changes: 5 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
plugins {
id "se.bjurr.gradle.conventional-release" version "0.+" apply false
id "se.bjurr.gradle.java-convention" version "0.+" apply false
id "se.bjurr.gradle.update-versions" version "0.+" apply false
}
Loading

0 comments on commit b78d510

Please sign in to comment.