Skip to content

Commit

Permalink
Merge pull request #482 from ravinperera00/java21_sync
Browse files Browse the repository at this point in the history
Migrate to Java 21
  • Loading branch information
warunalakshitha authored Nov 18, 2024
2 parents 8ec5f41 + 961c7cc commit 2826714
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ This repository only contains the source code for the module.

### Set up the prerequisites

1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations).
1. Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations).

* [Oracle](https://www.oracle.com/java/technologies/downloads/)

Expand Down
16 changes: 8 additions & 8 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
[package]
org = "ballerina"
name = "xslt"
version = "2.7.0"
version = "2.7.1"
authors = ["Ballerina"]
keywords = ["xslt", "xml", "html", "xsl", "transformation"]
repository = "https://github.com/ballerina-platform/module-ballerina-xslt"
icon = "icon.png"
license = ["Apache-2.0"]
distribution = "2201.10.0"

[platform.java17]
[platform.java21]
graalvmCompatible = true

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "xslt-native"
version = "2.7.0"
path = "../native/build/libs/xslt-native-2.7.0.jar"
version = "2.7.1"
path = "../native/build/libs/xslt-native-2.7.1-SNAPSHOT.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/jakarta.activation-1.2.2.jar"
version = "1.2.2"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/Saxon-HE-11.4.jar"
version = "11.4"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/xmlresolver-4.5.2.jar"
version = "4.5.2"
6 changes: 3 additions & 3 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.10.0"
distribution-version = "2201.11.0-20241112-214900-6b80ab87"

[[package]]
org = "ballerina"
name = "io"
version = "1.6.1"
version = "1.6.2"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
Expand Down Expand Up @@ -89,7 +89,7 @@ modules = [
[[package]]
org = "ballerina"
name = "xslt"
version = "2.7.0"
version = "2.7.1"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
Expand Down
10 changes: 5 additions & 5 deletions build-config/resources/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ icon = "icon.png"
license = ["Apache-2.0"]
distribution = "2201.10.0"

[platform.java17]
[platform.java21]
graalvmCompatible = true

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "xslt-native"
version = "@toml.version@"
path = "../native/build/libs/xslt-native-@project.version@.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/jakarta.activation-@jakarta.activation.version@.jar"
version = "@jakarta.activation.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/Saxon-HE-@saxon.he.version@.jar"
version = "@saxon.he.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/xmlresolver-@xmlresolver.version@.jar"
version = "@xmlresolver.version@"
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ axiomVersion=1.4.0
slf4jVersion=1.7.30
puppycrawlCheckstyleVersion=10.12.0
checkStyleToolVersion=10.12.0
githubSpotbugsVersion=5.0.14
githubSpotbugsVersion=6.0.18
githubJohnrengelmanShadowVersion=8.1.1
underCouchDownloadVersion=5.4.0
researchgateReleaseVersion=2.8.0
ballerinaGradlePluginVersion=2.0.1
saxonHeVersion=11.4
xmlResolverVersion=4.5.2

ballerinaLangVersion=2201.10.0
stdlibIoVersion=1.6.1
ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87
stdlibIoVersion=1.6.2-20241112-233100-995cf5f
8 changes: 5 additions & 3 deletions native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ dependencies {
}

spotbugsMain {
ignoreFailures = true
effort = "max"
reportLevel = "low"
def classLoader = plugins["com.github.spotbugs"].class.classLoader
def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence")
def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort")
effort = SpotBugsEffort.MAX
reportLevel = SpotBugsConfidence.LOW
reportsDir = file("$project.buildDir/reports/spotbugs")
def excludeFile = file("${rootDir}/build-config/spotbugs-exclude.xml")
if (excludeFile.exists()) {
Expand Down

0 comments on commit 2826714

Please sign in to comment.