Skip to content

Commit

Permalink
Merge pull request #258 from gabilang/java_17_migration
Browse files Browse the repository at this point in the history
Migrate to Java 17
  • Loading branch information
warunalakshitha authored Jul 4, 2023
2 parents 580154e + 83eedb5 commit dcc824e
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 24 deletions.
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://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
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
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/")
}
15 changes: 7 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
22 changes: 22 additions & 0 deletions spotbugs-exclude.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!--
~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 LLC. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<FindBugsFilter>
<Match>
<Bug pattern="EI_EXPOSE_REP, EI_EXPOSE_REP2"/>
</Match>
</FindBugsFilter>
4 changes: 2 additions & 2 deletions testerina-report-tools/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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/")
}

0 comments on commit dcc824e

Please sign in to comment.