From 7e31f56ea1130909948bcf9e5beefc161ceef137 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Tue, 18 Jun 2024 14:25:40 +0200 Subject: [PATCH] Add versions.toml to .gitattributes and normalize line endings to lf. #13484 --- .gitattributes | 4 +- versions.toml | 170 ++++++++++++++++++++++++------------------------- 2 files changed, 87 insertions(+), 87 deletions(-) diff --git a/.gitattributes b/.gitattributes index e4f4bf8b496..a3135003e80 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ # Ignore all differences in line endings for the lock file. -versions.lock text eol=lf -versions.props text eol=lf +versions.lock text eol=lf +versions.toml text eol=lf # Gradle files are always in LF. *.gradle text eol=lf diff --git a/versions.toml b/versions.toml index 55f59301781..6a137975d3e 100644 --- a/versions.toml +++ b/versions.toml @@ -1,85 +1,85 @@ -[versions] -antlr = "4.11.1" -asm = "9.6" -assertj = "3.21.0" -commons-codec = "1.13" -commons-compress = "1.19" -ecj = "3.36.0" -errorprone = "2.18.0" -flexmark = "0.61.24" -# @keep This is GJF version for spotless/ tidy. -googleJavaFormat = "1.18.1" -groovy = "3.0.21" -hamcrest = "2.2" -icu4j = "74.2" -javacc = "7.0.12" -jflex = "1.8.2" -jgit = "5.13.1.202206130422-r" -jmh = "1.37" -jts = "1.17.0" -junit = "4.13.1" -# @keep Minimum gradle version to run the build -minGradle = "8.8" -# @keep This is the minimum required Java version. -minJava = "21" -morfologik = "2.1.9" -morfologik-ukrainian = "4.9.1" -nekohtml = "1.9.17" -opennlp = "2.3.2" -procfork = "1.0.6" -randomizedtesting = "2.8.1" -rat = "0.14" -s2-geometry = "1.0.0" -spatial4j = "0.8" -xerces = "2.12.0" -zstd = "1.5.5-11" - -[libraries] -antlr-core = { module = "org.antlr:antlr4", version.ref = "antlr" } -antlr-runtime = { module = "org.antlr:antlr4-runtime", version.ref = "antlr" } -asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" } -asm-core = { module = "org.ow2.asm:asm", version.ref = "asm" } -assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } -commons-codec = { module = "commons-codec:commons-codec", version.ref = "commons-codec" } -commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commons-compress" } -ecj = { module = "org.eclipse.jdt:ecj", version.ref = "ecj" } -errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" } -flexmark-core = { module = "com.vladsch.flexmark:flexmark", version.ref = "flexmark" } -flexmark-ext-abbreviation = { module = "com.vladsch.flexmark:flexmark-ext-abbreviation", version.ref = "flexmark" } -flexmark-ext-attributes = { module = "com.vladsch.flexmark:flexmark-ext-attributes", version.ref = "flexmark" } -flexmark-ext-autolink = { module = "com.vladsch.flexmark:flexmark-ext-autolink", version.ref = "flexmark" } -flexmark-ext-tables = { module = "com.vladsch.flexmark:flexmark-ext-tables", version.ref = "flexmark" } -groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" } -hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" } -icu4j = { module = "com.ibm.icu:icu4j", version.ref = "icu4j" } -javacc = { module = "net.java.dev.javacc:javacc", version.ref = "javacc" } -jflex = { module = "de.jflex:jflex", version.ref = "jflex" } -jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" } -jmh-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" } -jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" } -jts = { module = "org.locationtech.jts:jts-core", version.ref = "jts" } -junit = { module = "junit:junit", version.ref = "junit" } -morfologik-polish = { module = "org.carrot2:morfologik-polish", version.ref = "morfologik" } -morfologik-stemming = { module = "org.carrot2:morfologik-stemming", version.ref = "morfologik" } -morfologik-ukrainian = { module = "ua.net.nlp:morfologik-ukrainian-search", version.ref = "morfologik-ukrainian" } -nekohtml = { module = "net.sourceforge.nekohtml:nekohtml", version.ref = "nekohtml" } -opennlp-tools = { module = "org.apache.opennlp:opennlp-tools", version.ref = "opennlp" } -procfork = { module = "com.carrotsearch:procfork", version.ref = "procfork" } -randomizedtesting-runner = { module = "com.carrotsearch.randomizedtesting:randomizedtesting-runner", version.ref = "randomizedtesting" } -rat = { module = "org.apache.rat:apache-rat", version.ref = "rat" } -s2-geometry = { module = "io.sgr:s2-geometry-library-java", version.ref = "s2-geometry" } -spatial4j = { module = "org.locationtech.spatial4j:spatial4j", version.ref = "spatial4j" } -xerces = { module = "xerces:xercesImpl", version.ref = "xerces" } -zstd = { module = "com.github.luben:zstd-jni", version.ref = "zstd" } - -[plugins] -benmanes-versions = "com.github.ben-manes.versions:0.51.0" -dependencychecks = "com.carrotsearch.gradle.dependencychecks:0.0.9" -errorprone = "net.ltgt.errorprone:3.1.0" -forbiddenapis = "de.thetaphi.forbiddenapis:3.7" -jacocolog = "org.barfuin.gradle.jacocolog:3.1.0" -owasp-dependencycheck = "org.owasp.dependencycheck:7.2.0" -randomizedtesting = "com.carrotsearch.gradle.randomizedtesting:0.0.6" -spotless = "com.diffplug.spotless:6.5.2" -undercouch-download = "de.undercouch.download:5.2.0" -versionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.4" +[versions] +antlr = "4.11.1" +asm = "9.6" +assertj = "3.21.0" +commons-codec = "1.13" +commons-compress = "1.19" +ecj = "3.36.0" +errorprone = "2.18.0" +flexmark = "0.61.24" +# @keep This is GJF version for spotless/ tidy. +googleJavaFormat = "1.18.1" +groovy = "3.0.21" +hamcrest = "2.2" +icu4j = "74.2" +javacc = "7.0.12" +jflex = "1.8.2" +jgit = "5.13.1.202206130422-r" +jmh = "1.37" +jts = "1.17.0" +junit = "4.13.1" +# @keep Minimum gradle version to run the build +minGradle = "8.8" +# @keep This is the minimum required Java version. +minJava = "21" +morfologik = "2.1.9" +morfologik-ukrainian = "4.9.1" +nekohtml = "1.9.17" +opennlp = "2.3.2" +procfork = "1.0.6" +randomizedtesting = "2.8.1" +rat = "0.14" +s2-geometry = "1.0.0" +spatial4j = "0.8" +xerces = "2.12.0" +zstd = "1.5.5-11" + +[libraries] +antlr-core = { module = "org.antlr:antlr4", version.ref = "antlr" } +antlr-runtime = { module = "org.antlr:antlr4-runtime", version.ref = "antlr" } +asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" } +asm-core = { module = "org.ow2.asm:asm", version.ref = "asm" } +assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } +commons-codec = { module = "commons-codec:commons-codec", version.ref = "commons-codec" } +commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commons-compress" } +ecj = { module = "org.eclipse.jdt:ecj", version.ref = "ecj" } +errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" } +flexmark-core = { module = "com.vladsch.flexmark:flexmark", version.ref = "flexmark" } +flexmark-ext-abbreviation = { module = "com.vladsch.flexmark:flexmark-ext-abbreviation", version.ref = "flexmark" } +flexmark-ext-attributes = { module = "com.vladsch.flexmark:flexmark-ext-attributes", version.ref = "flexmark" } +flexmark-ext-autolink = { module = "com.vladsch.flexmark:flexmark-ext-autolink", version.ref = "flexmark" } +flexmark-ext-tables = { module = "com.vladsch.flexmark:flexmark-ext-tables", version.ref = "flexmark" } +groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" } +hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" } +icu4j = { module = "com.ibm.icu:icu4j", version.ref = "icu4j" } +javacc = { module = "net.java.dev.javacc:javacc", version.ref = "javacc" } +jflex = { module = "de.jflex:jflex", version.ref = "jflex" } +jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" } +jmh-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" } +jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" } +jts = { module = "org.locationtech.jts:jts-core", version.ref = "jts" } +junit = { module = "junit:junit", version.ref = "junit" } +morfologik-polish = { module = "org.carrot2:morfologik-polish", version.ref = "morfologik" } +morfologik-stemming = { module = "org.carrot2:morfologik-stemming", version.ref = "morfologik" } +morfologik-ukrainian = { module = "ua.net.nlp:morfologik-ukrainian-search", version.ref = "morfologik-ukrainian" } +nekohtml = { module = "net.sourceforge.nekohtml:nekohtml", version.ref = "nekohtml" } +opennlp-tools = { module = "org.apache.opennlp:opennlp-tools", version.ref = "opennlp" } +procfork = { module = "com.carrotsearch:procfork", version.ref = "procfork" } +randomizedtesting-runner = { module = "com.carrotsearch.randomizedtesting:randomizedtesting-runner", version.ref = "randomizedtesting" } +rat = { module = "org.apache.rat:apache-rat", version.ref = "rat" } +s2-geometry = { module = "io.sgr:s2-geometry-library-java", version.ref = "s2-geometry" } +spatial4j = { module = "org.locationtech.spatial4j:spatial4j", version.ref = "spatial4j" } +xerces = { module = "xerces:xercesImpl", version.ref = "xerces" } +zstd = { module = "com.github.luben:zstd-jni", version.ref = "zstd" } + +[plugins] +benmanes-versions = "com.github.ben-manes.versions:0.51.0" +dependencychecks = "com.carrotsearch.gradle.dependencychecks:0.0.9" +errorprone = "net.ltgt.errorprone:3.1.0" +forbiddenapis = "de.thetaphi.forbiddenapis:3.7" +jacocolog = "org.barfuin.gradle.jacocolog:3.1.0" +owasp-dependencycheck = "org.owasp.dependencycheck:7.2.0" +randomizedtesting = "com.carrotsearch.gradle.randomizedtesting:0.0.6" +spotless = "com.diffplug.spotless:6.5.2" +undercouch-download = "de.undercouch.download:5.2.0" +versionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.4"