diff --git a/gradle.properties b/gradle.properties index d7deb95..69cda89 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,16 +3,4 @@ name = rpm version = 2.2.0 org.gradle.warning.mode = ALL -gradle.wrapper.version = 7.3.2 -gradle.publish.plugin.version = 0.14.0 -bouncycastle.version = 1.71 -xbib-archive.version = 1.0.1 -ant.version = 1.10.10 -maven.version = 3.8.1 -maven-plugin-annotations.version = 3.6.1 -maven-plugin-plugin.version = 3.6.1 -maven-wagon.version = 3.4.3 -aether-connector-basic.version = 1.1.0 -aether-transport-wagon.version = 1.1.0 -slf4j.version = 1.7.30 -mvel.version = 2.4.12.Final +gradle.wrapper.version = 7.4.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..41d9927 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac0b842..92f06b5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/rpm-ant/build.gradle b/rpm-ant/build.gradle index 937c5e4..cc2f3e5 100644 --- a/rpm-ant/build.gradle +++ b/rpm-ant/build.gradle @@ -1,6 +1,6 @@ dependencies { api project(':rpm-core') - implementation "org.apache.ant:ant:${project.property('ant.version')}" + implementation libs.ant } apply from: rootProject.file('gradle/publishing/publication.gradle') diff --git a/rpm-core/build.gradle b/rpm-core/build.gradle index 013b249..9b49d25 100644 --- a/rpm-core/build.gradle +++ b/rpm-core/build.gradle @@ -1,7 +1,7 @@ dependencies { - api "org.bouncycastle:bcpg-jdk18on:${project.property('bouncycastle.version')}" - api "org.xbib:io-compress-bzip2:${project.property('xbib-archive.version')}" - api "org.xbib:io-compress-xz:${project.property('xbib-archive.version')}" + api libs.bouncycastle + api libs.bzip2 + api libs.xz } apply from: rootProject.file('gradle/publishing/publication.gradle') diff --git a/settings.gradle b/settings.gradle index cd79941..defd083 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,8 +1,21 @@ -rootProject.name = name +dependencyResolutionManagement { + versionCatalogs { + libs { + version('gradle', '7.4.2') + version('junit', '5.8.2') + library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') + library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit') + library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit') + library('junit4', 'junit:junit:4.13.2') + library('hamcrest', 'org.hamcrest:hamcrest-library:2.2') + plugin('publish', 'com.gradle.plugin-publish').version('0.18.0') + library('bzip2', 'org.xbib', 'io-compress-bzip2').version('1.1.0') + library('xz', 'org.xbib', 'io-compress-xz').version('1.1.0') + library('bouncycastle', 'org.bouncycastle', 'bcpg-jdk18on').version('1.71') + library('ant', 'org.apache.ant', 'ant').version('1.10.10') + } + } +} include 'rpm-core' include 'rpm-ant' -// gradle plugin moved to antoher repository -//include 'gradle-plugin-rpm' -// maven plugin was removed in gradle -//include 'maven-plugin-rpm'