diff --git a/build.gradle b/build.gradle index 9a6431d..419e86d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,34 +1,27 @@ plugins { - id 'application' - id 'jacoco-report-aggregation' - alias(versions.plugins.asciidoctorConvention) - alias(versions.plugins.javaConvention) - alias(versions.plugins.sonarqube) + alias(libs.plugins.asciidoctorConvention) + alias(libs.plugins.applicationConvention) + alias(libs.plugins.libraryConvention) + id "org.sonarqube" version "4.0.0.2929" +} + +repositories { + mavenCentral() + mavenLocal() } dependencies { - implementation versions.slf4j - implementation versions.commonscli - testImplementation versions.junit - implementation versions.bundles.logback + implementation libs.slf4j + implementation libs.commonscli + testImplementation libs.junit + implementation libs.bundles.logback spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0' } -publishing { - publications { - application(MavenPublication) { - groupId = group - from components.java - } - } -} - -final BUILD_DATE = new Date().format('dd.MM.yyyy').toString() - final MAIN_CLASS_NAME = 'de.thpeetz.generations.App' java { - sourceCompatibility = JavaVersion.VERSION_1_8 + //sourceCompatibility = JavaVersion.VERSION_1_8 } application { @@ -41,20 +34,16 @@ jar { } } -spotbugs { - ignoreFailures = true -} - -sonarqube { +sonar { properties { property "sonar.projectKey", "tpeetz_generations_AYB--ei2Uw4Nr911AV3u" property "sonar.qualitygate.wait", true property "sonar.host.url", "https://sonar.thpeetz.de" - property "sonar.login", "92ff8e7c02747a905df2c49de874ce3db001bd37" + property "sonar.token", "squ_c05f5c2a7c2b7f6bf43769eebb9162b484c7edb6" property "sonar.sourceEncoding", "UTF-8" } } wrapper { - gradleVersion = "7.5" + gradleVersion = libs.versions.gradle.get() } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c68..17655d0 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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 95eafdd..2ca04be 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,29 @@ +pluginManagement { + plugins { + } + resolutionStrategy { + } + repositories { + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/cimt-ag/convention-plugins") + credentials(PasswordCredentials) + } + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositories { + maven { + name = 'GitHubPackages' + url = uri("https://maven.pkg.github.com/cimt-ag/version-catalog") + credentials(PasswordCredentials) + } + } + versionCatalogs { + libs { + from("de.cimt:version-catalog:1.0.0-SNAPSHOT") + } + } +} rootProject.name="generations"