diff --git a/architecture-model-generator/modules/architecture-model-generator-ls-extension/src/test/resources/ballerina/rainier/Ballerina.toml b/architecture-model-generator/modules/architecture-model-generator-ls-extension/src/test/resources/ballerina/rainier/Ballerina.toml index 23516f7fd..4f100bbd3 100644 --- a/architecture-model-generator/modules/architecture-model-generator-ls-extension/src/test/resources/ballerina/rainier/Ballerina.toml +++ b/architecture-model-generator/modules/architecture-model-generator-ls-extension/src/test/resources/ballerina/rainier/Ballerina.toml @@ -7,10 +7,10 @@ distribution = "2201.3.0" [build-options] observabilityIncluded = false -[[platform.java11.repository]] +[[platform.java17.repository]] id="wso2-nexus" url = "https://maven.wso2.org/nexus/content/groups/public/" -[[platform.java11.repository]] +[[platform.java17.repository]] id="wso2-nexus-snapshot" url = "https://maven.wso2.org/nexus/content/repositories/snapshots/" diff --git a/architecture-model-generator/modules/architecture-model-generator-ls-extension/src/test/resources/ballerina/rainier/resources/Ballerina.toml b/architecture-model-generator/modules/architecture-model-generator-ls-extension/src/test/resources/ballerina/rainier/resources/Ballerina.toml index 0e874d3a0..d1f56db7f 100644 --- a/architecture-model-generator/modules/architecture-model-generator-ls-extension/src/test/resources/ballerina/rainier/resources/Ballerina.toml +++ b/architecture-model-generator/modules/architecture-model-generator-ls-extension/src/test/resources/ballerina/rainier/resources/Ballerina.toml @@ -14,10 +14,10 @@ user = "root" password = "Test123#" database = "rainier_db" -[[platform.java11.repository]] +[[platform.java17.repository]] id="wso2-nexus" url = "https://maven.wso2.org/nexus/content/groups/public/" -[[platform.java11.repository]] +[[platform.java17.repository]] id="wso2-nexus-snapshot" url = "https://maven.wso2.org/nexus/content/repositories/snapshots/" diff --git a/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle index c7758fe3d..ecae63024 100644 --- a/build-config/checkstyle/build.gradle +++ b/build-config/checkstyle/build.gradle @@ -23,8 +23,8 @@ apply plugin: 'java' task downloadMultipleFiles(type: Download) { src([ - 'https://github.com/raw/wso2/code-quality-tools/v1.3/checkstyle/checkstyle.xml', - 'https://github.com/raw/wso2/code-quality-tools/v1.3/checkstyle/suppressions.xml' + 'https://github.com/raw/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/checkstyle.xml', + 'https://github.com/raw/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/suppressions.xml' ]) overwrite false onlyIfNewer true diff --git a/build.gradle b/build.gradle index bcd784c31..9b9771205 100644 --- a/build.gradle +++ b/build.gradle @@ -139,8 +139,8 @@ task createArtifactZip(type: Zip) { dependsOn(":docerina-ui:createDocerinaUiZip") dependsOn(":testerina-report-tools:createTesterinaReportToolsZip") from "build" - archiveName 'ballerina-dev-tools-' + project.version + '.zip' - destinationDir(file("dist")) + archiveFileName = 'ballerina-dev-tools-' + project.version + '.zip' + destinationDirectory = file("dist") } publishing { diff --git a/docerina-ui/build.gradle b/docerina-ui/build.gradle index ac4bac165..c5c7f7828 100644 --- a/docerina-ui/build.gradle +++ b/docerina-ui/build.gradle @@ -58,6 +58,6 @@ task npmTestDocerinaUI(type: Exec) { task createDocerinaUiZip(type: Zip) { dependsOn npmBuildDocerinaUI from "dist" - archiveName 'docerina-ui-' + project.version + '.zip' - destinationDir(file("$project.rootDir/build/docs/")) + archiveFileName = 'docerina-ui-' + project.version + '.zip' + destinationDirectory = file("$project.rootDir/build/docs/") } diff --git a/gradle.properties b/gradle.properties index 1a617522d..9f35e2357 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,16 @@ group=org.ballerinalang version=1.2.0-SNAPSHOT ballerinaLangVersion=2201.7.0-20230619-175900-bb4e4544 -ballerinaGradlePluginVersion=0.15.0 -checkstylePluginVersion=8.18 -checkStyleToolVersion=7.8.2 -downloadPluginVersion=4.0.4 +ballerinaGradlePluginVersion=2.0.0 +checkStyleToolVersion=10.12.1 +downloadPluginVersion=5.4.0 eclipseLsp4jVersion=0.12.0 gsonVersion=2.8.9 -puppycrawlCheckstyleVersion=8.18 +puppycrawlCheckstyleVersion=10.12.1 releasePluginVersion=2.8.0 -shadowJarPluginVersion=5.2.0 -spotbugsPluginVersion=4.5.1 -testngVersion=6.14.3 +shadowJarPluginVersion=8.1.0 +spotbugsPluginVersion=5.0.14 +testngVersion=7.6.1 # Ballerinax Observer observeVersion=1.1.0-20230620-193900-57e0c73 diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index 005965b18..6f3b00614 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -77,7 +77,7 @@ spotbugsMain { effort = "max" reportLevel = "low" reportsDir = file("$project.buildDir/reports/spotbugs") - def excludeFile = file("spotbugs-exclude.xml") + def excludeFile = file("${rootDir}/spotbugs-exclude.xml") if (excludeFile.exists()) { it.excludeFilter = excludeFile } @@ -109,7 +109,7 @@ test { jacocoTestReport { reports { - xml.enabled true + xml.required = true } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb8790..fae08049a 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 766b69196..6c131dbb5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,7 +16,7 @@ */ plugins { - id "com.gradle.enterprise" version "3.5" + id "com.gradle.enterprise" version "3.13.2" } rootProject.name = 'ballerina-dev-tools' diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml new file mode 100644 index 000000000..fa42822f1 --- /dev/null +++ b/spotbugs-exclude.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/testerina-report-tools/build.gradle b/testerina-report-tools/build.gradle index 5c6c8a9c1..e20709a75 100644 --- a/testerina-report-tools/build.gradle +++ b/testerina-report-tools/build.gradle @@ -55,6 +55,6 @@ task createTesterinaReportToolsZip(type: Zip) { include '**/static/css/*.css' include '**/static/js/*.js' exclude '**/static/js/runtime-*.js' - archiveName 'testerina-report-tools-' + project.version + '.zip' - destinationDir(file("$project.rootDir/build/tests/")) + archiveFileName = 'testerina-report-tools-' + project.version + '.zip' + destinationDirectory = file("$project.rootDir/build/tests/") }