Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync Java 17 migration branch with main #271

Merged
merged 15 commits into from
Jul 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ensure all Java files use LF.
*.java eol=lf
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
4 changes: 2 additions & 2 deletions build-config/checkstyle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ apply plugin: 'java'

task downloadMultipleFiles(type: Download) {
src([
'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/checkstyle.xml',
'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/suppressions.xml'
'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/checkstyle.xml',
'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/suppressions.xml'
])
overwrite false
onlyIfNewer true
Expand Down
8 changes: 6 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ task copyArtifactZip {
dependsOn(":architecture-model-generator:architecture-model-generator-ls-extension:build")
dependsOn(":graphql-model-generator:graphql-model-generator-core:build")
dependsOn(":graphql-model-generator:graphql-model-generator-ls-extension:build")
dependsOn(":generatePomFileForMavenJavaPublication")
inputs.dir file(project.rootDir)
doLast {
copy {
Expand All @@ -132,15 +133,17 @@ task copyArtifactZip {
}
}
outputs.dir artifactLibParent
doNotTrackState("build needs to run every time")
}

task createArtifactZip(type: Zip) {
dependsOn copyArtifactZip
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")
doNotTrackState("build needs to run every time")
}

publishing {
Expand Down Expand Up @@ -189,5 +192,6 @@ task clean {
delete "dist"
}

build.doNotTrackState("build needs to run every time")
publishToMavenLocal.dependsOn build
publish.dependsOn build
4 changes: 2 additions & 2 deletions docerina-ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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/")
}
21 changes: 10 additions & 11 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
org.gradle.caching=true
group=org.ballerinalang
version=1.2.1-SNAPSHOT
ballerinaLangVersion=2201.7.0
ballerinaLangVersion=2201.8.0-20230726-145300-b2bdf796

ballerinaGradlePluginVersion=0.15.0
checkstylePluginVersion=8.18
checkStyleToolVersion=7.8.2
downloadPluginVersion=4.0.4
ballerinaGradlePluginVersion=2.0.1-SNAPSHOT
checkStyleToolVersion=10.12.1
downloadPluginVersion=5.4.0
eclipseLsp4jVersion=0.12.0
gsonVersion=2.8.9
puppycrawlCheckstyleVersion=8.18
gsonVersion=2.10.1
puppycrawlCheckstyleVersion=10.12.1
releasePluginVersion=2.8.0
shadowJarPluginVersion=5.2.0
spotbugsPluginVersion=4.5.1
testngVersion=6.14.3
shadowJarPluginVersion=8.1.1
spotbugsPluginVersion=5.0.14
testngVersion=7.6.1

# Ballerinax Observer
observeVersion=1.1.0
Expand All @@ -29,7 +28,7 @@ stdlibUrlVersion=2.3.0
# Stdlib Level 02
stdlibConstraintVersion=1.3.0
stdlibCryptoVersion=2.4.0
stdlibLogVersion=2.8.0
stdlibLogVersion=2.8.1-20230718-085900-36c385c
stdlibOsVersion=1.7.0
stdlibRandomVersion=1.4.0

Expand Down
4 changes: 2 additions & 2 deletions gradle/javaProject.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -109,7 +109,7 @@ test {

jacocoTestReport {
reports {
xml.enabled true
xml.required = true
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
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.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading