From 2475df81f62d14676a3010c8404b0e9a13042d52 Mon Sep 17 00:00:00 2001 From: Andreas Textor Date: Tue, 12 Mar 2024 05:39:38 +0100 Subject: [PATCH] Update dependencies --- build.gradle | 28 +++++++++++----------- dependencies.gradle | 58 ++++++++++++++++++++++----------------------- docs/build.gradle | 14 +++++------ 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/build.gradle b/build.gradle index 69807f27..c9befb51 100644 --- a/build.gradle +++ b/build.gradle @@ -17,11 +17,11 @@ plugins { id 'java' id 'jacoco' - id 'com.github.ben-manes.versions' version '0.48.0' - id 'com.adarshr.test-logger' version '3.2.0' apply false - id 'io.freefair.lombok' version '8.3' apply false + id 'com.github.ben-manes.versions' version '0.51.0' + id 'com.adarshr.test-logger' version '4.0.0' apply false + id 'io.freefair.lombok' version '8.6' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false - id 'org.ajoberstar.grgit' version '5.2.0' + id 'org.ajoberstar.grgit' version '5.2.2' } allprojects { @@ -31,8 +31,8 @@ allprojects { } def currentTag = { - def grgit = grgit.open{ dir = "${projectDir}" } - def tag = grgit.describe{ tags = true } + def grgit = grgit.open { dir = "${projectDir}" } + def tag = grgit.describe { tags = true } if (tag != null) { tag.startsWith('snapshot') ? 'snapshot' : tag.replace('v', '') } else { @@ -57,16 +57,16 @@ apply plugin: 'java' task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') { description = 'Generates an aggregate report from all subprojects' classDirectories.from = [ - "${projectDir}/cli/build/classes/java/main", - "${projectDir}/diagram/build/classes/java/main", - "${projectDir}/write/build/classes/java/main", - "${projectDir}/infer/build/classes/java/main", + "${projectDir}/cli/build/classes/java/main", + "${projectDir}/diagram/build/classes/java/main", + "${projectDir}/write/build/classes/java/main", + "${projectDir}/infer/build/classes/java/main", ] sourceDirectories.from = [ - "${projectDir}/cli/src/main/java", - "${projectDir}/diagram/src/main/java", - "${projectDir}/write/src/main/java", - "${projectDir}/infer/src/main/java", + "${projectDir}/cli/src/main/java", + "${projectDir}/diagram/src/main/java", + "${projectDir}/write/src/main/java", + "${projectDir}/infer/src/main/java", ] executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec") diff --git a/dependencies.gradle b/dependencies.gradle index ec3ad6cc..b290f582 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -15,35 +15,35 @@ */ ext.deps = [ - caffeine: 'com.github.ben-manes.caffeine:caffeine:2.9.2', - commons_codec: 'commons-codec:commons-codec:1.16.0', - commons_io: 'org.apache.commons:commons-io:1.3.2', - commons_text: 'org.apache.commons:commons-text:1.10.0', - guava: 'com.google.guava:guava:32.1.2-jre', - httpclient: 'org.apache.httpcomponents:httpclient:4.5.14', - jackson_databind: 'com.fasterxml.jackson.core:jackson-databind:2.15.2', - jena: 'org.apache.jena:jena:4.9.0', - jena_core: 'org.apache.jena:jena-core:4.9.0', - jena_arq: 'org.apache.jena:jena-arq:4.9.0', - logback: 'ch.qos.logback:logback-classic:1.4.11', - openllet: 'com.github.galigator.openllet:openllet-jena:2.6.5', - owlapi: 'net.sourceforge.owlapi:owlapi-distribution:5.5.0', - picocli: 'info.picocli:picocli:4.7.5', - picocli_codegen: 'info.picocli:picocli-codegen:4.7.5', - slf4j_api: 'org.slf4j:slf4j-api:2.0.9', - svm: 'org.graalvm.nativeimage:svm:23.1.0', - turtle_formatter: 'de.atextor:turtle-formatter:1.2.9', - vavr: 'io.vavr:vavr:0.10.4', + caffeine : 'com.github.ben-manes.caffeine:caffeine:2.9.2', + commons_codec : 'commons-codec:commons-codec:1.16.1', + commons_io : 'org.apache.commons:commons-io:1.3.2', + commons_text : 'org.apache.commons:commons-text:1.11.0', + guava : 'com.google.guava:guava:33.0.0-jre', + httpclient : 'org.apache.httpcomponents:httpclient:4.5.14', + jackson_databind : 'com.fasterxml.jackson.core:jackson-databind:2.16.2', + jena : 'org.apache.jena:jena:4.10.0', + jena_core : 'org.apache.jena:jena-core:4.10.0', + jena_arq : 'org.apache.jena:jena-arq:4.10.0', + logback : 'ch.qos.logback:logback-classic:1.5.3', + openllet : 'com.github.galigator.openllet:openllet-jena:2.6.5', + owlapi : 'net.sourceforge.owlapi:owlapi-distribution:5.5.0', + picocli : 'info.picocli:picocli:4.7.5', + picocli_codegen : 'info.picocli:picocli-codegen:4.7.5', + slf4j_api : 'org.slf4j:slf4j-api:2.0.12', + svm : 'org.graalvm.nativeimage:svm:23.1.2', + turtle_formatter : 'de.atextor:turtle-formatter:1.2.11', + vavr : 'io.vavr:vavr:0.10.4', - // Test - junit_jupiter_api: 'org.junit.jupiter:junit-jupiter-api:5.10.0', - junit_jupiter_params: 'org.junit.jupiter:junit-jupiter-params:5.10.0', - junit_jupiter_engine: 'org.junit.jupiter:junit-jupiter-engine:5.10.0', - assertj: 'org.assertj:assertj-core:3.24.2', - jqwik: 'net.jqwik:jqwik:1.8.0', - classgraph: 'io.github.classgraph:classgraph:4.8.162', + // Test + junit_jupiter_api : 'org.junit.jupiter:junit-jupiter-api:5.10.2', + junit_jupiter_params: 'org.junit.jupiter:junit-jupiter-params:5.10.2', + junit_jupiter_engine: 'org.junit.jupiter:junit-jupiter-engine:5.10.2', + assertj : 'org.assertj:assertj-core:3.25.3', + jqwik : 'net.jqwik:jqwik:1.8.3', + classgraph : 'io.github.classgraph:classgraph:4.8.168', - // Documentation - nodejs: '12.13.1', - npm: '6.9.0' + // Documentation + nodejs : '12.13.1', + npm : '6.9.0' ] diff --git a/docs/build.gradle b/docs/build.gradle index 1331678f..286554a5 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -15,7 +15,7 @@ */ plugins { - id 'com.github.node-gradle.node' version '7.0.0' + id 'com.github.node-gradle.node' version '7.0.2' } apply from: file("${rootDir}/dependencies.gradle") @@ -44,7 +44,7 @@ task installAsciidoctorMathjax(type: NpmTask) { } task setAntoraVersion(type: Copy) { - ant.replaceregexp(match:'version: .*', replace:"version: ${version}", flags:'g', byline:true) { + ant.replaceregexp(match: 'version: .*', replace: "version: ${version}", flags: 'g', byline: true) { fileset(dir: "${project.projectDir}", includes: 'antora.yml') } } @@ -59,8 +59,8 @@ task antora(type: NodeTask) { dependsOn 'setAntoraVersion' dependsOn 'generateImages' environment = [ - 'DOCSEARCH_ENABLED': 'true', - 'DOCSEARCH_ENGINE': 'lunr' + 'DOCSEARCH_ENABLED': 'true', + 'DOCSEARCH_ENGINE' : 'lunr' ] workingDir = rootProject.projectDir script = file("${project.buildDir}/node_modules/@antora/cli/bin/antora") @@ -72,8 +72,8 @@ project.fileTree(dir: ontologyDir, include: '*.ttl').files.each { ttlFile -> def baseName = ttlFile.name.replaceFirst("[.][^.]+\$", "") def imageFile = "${project.projectDir}/modules/ROOT/assets/images/${baseName}.svg" def diagramArgs = ttlFile.getText().contains("top_to_bottom") ? - ['diagram', '--direction', 'top_to_bottom', "${baseName}.ttl", imageFile] : - ['diagram', "${baseName}.ttl", imageFile] + ['diagram', '--direction', 'top_to_bottom', "${baseName}.ttl", imageFile] : + ['diagram', "${baseName}.ttl", imageFile] def command = [project(':cli').file('build/bin/owl').getCanonicalPath()] + diagramArgs tasks.create(name: "${baseName}", type: Exec) { commandLine command @@ -81,7 +81,7 @@ project.fileTree(dir: ontologyDir, include: '*.ttl').files.each { ttlFile -> inputs.file file(ttlFile) outputs.file file(imageFile) doLast { - if( !project(':cli').file('build/bin/owl').exists() ) { + if (!project(':cli').file('build/bin/owl').exists()) { ant.fail("owlcli binary is not present. Run gradlew nativeImage") } }