diff --git a/ballerina-tests/http-advanced-tests/Ballerina.toml b/ballerina-tests/http-advanced-tests/Ballerina.toml index a3c69d049a..8fa074fe97 100644 --- a/ballerina-tests/http-advanced-tests/Ballerina.toml +++ b/ballerina-tests/http-advanced-tests/Ballerina.toml @@ -9,9 +9,9 @@ name = "http_test_common" repository = "local" version = "2.9.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] scope = "testOnly" path = "../../test-utils/build/libs/http-test-utils-2.9.0-SNAPSHOT.jar" diff --git a/ballerina-tests/http-client-tests/Ballerina.toml b/ballerina-tests/http-client-tests/Ballerina.toml index 40f2e90d10..a8ebf304ff 100644 --- a/ballerina-tests/http-client-tests/Ballerina.toml +++ b/ballerina-tests/http-client-tests/Ballerina.toml @@ -9,9 +9,9 @@ name = "http_test_common" repository = "local" version = "2.9.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] scope = "testOnly" path = "../../test-utils/build/libs/http-test-utils-2.9.0-SNAPSHOT.jar" diff --git a/ballerina-tests/http-dispatching-tests/Ballerina.toml b/ballerina-tests/http-dispatching-tests/Ballerina.toml index fede6f8b70..85d9f25b7e 100644 --- a/ballerina-tests/http-dispatching-tests/Ballerina.toml +++ b/ballerina-tests/http-dispatching-tests/Ballerina.toml @@ -9,9 +9,9 @@ name = "http_test_common" repository = "local" version = "2.9.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] scope = "testOnly" path = "../../test-utils/build/libs/http-test-utils-2.9.0-SNAPSHOT.jar" diff --git a/ballerina-tests/http-interceptor-tests/Ballerina.toml b/ballerina-tests/http-interceptor-tests/Ballerina.toml index 4b38e4c662..e5a0c9035b 100644 --- a/ballerina-tests/http-interceptor-tests/Ballerina.toml +++ b/ballerina-tests/http-interceptor-tests/Ballerina.toml @@ -9,9 +9,9 @@ name = "http_test_common" repository = "local" version = "2.9.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] scope = "testOnly" path = "../../test-utils/build/libs/http-test-utils-2.9.0-SNAPSHOT.jar" diff --git a/ballerina-tests/http-misc-tests/Ballerina.toml b/ballerina-tests/http-misc-tests/Ballerina.toml index 96f6d87092..cfa8cac0e1 100644 --- a/ballerina-tests/http-misc-tests/Ballerina.toml +++ b/ballerina-tests/http-misc-tests/Ballerina.toml @@ -9,9 +9,9 @@ name = "http_test_common" repository = "local" version = "2.9.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] scope = "testOnly" path = "../../test-utils/build/libs/http-test-utils-2.9.0-SNAPSHOT.jar" diff --git a/ballerina-tests/http-resiliency-tests/Ballerina.toml b/ballerina-tests/http-resiliency-tests/Ballerina.toml index 975abc6eb8..3c6ac4c113 100644 --- a/ballerina-tests/http-resiliency-tests/Ballerina.toml +++ b/ballerina-tests/http-resiliency-tests/Ballerina.toml @@ -9,9 +9,9 @@ name = "http_test_common" repository = "local" version = "2.9.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] scope = "testOnly" path = "../../test-utils/build/libs/http-test-utils-2.9.0-SNAPSHOT.jar" diff --git a/ballerina-tests/http-security-tests/Ballerina.toml b/ballerina-tests/http-security-tests/Ballerina.toml index 2a18abf0b9..cb2f295271 100644 --- a/ballerina-tests/http-security-tests/Ballerina.toml +++ b/ballerina-tests/http-security-tests/Ballerina.toml @@ -9,9 +9,9 @@ name = "http_test_common" repository = "local" version = "2.9.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] scope = "testOnly" path = "../../test-utils/build/libs/http-test-utils-2.9.0-SNAPSHOT.jar" diff --git a/ballerina-tests/http-service-tests/Ballerina.toml b/ballerina-tests/http-service-tests/Ballerina.toml index e685821dd0..1260b248c9 100644 --- a/ballerina-tests/http-service-tests/Ballerina.toml +++ b/ballerina-tests/http-service-tests/Ballerina.toml @@ -9,9 +9,9 @@ name = "http_test_common" repository = "local" version = "2.9.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] scope = "testOnly" path = "../../test-utils/build/libs/http-test-utils-2.9.0-SNAPSHOT.jar" diff --git a/ballerina-tests/http2-tests/Ballerina.toml b/ballerina-tests/http2-tests/Ballerina.toml index 540a714b47..647296a4a6 100644 --- a/ballerina-tests/http2-tests/Ballerina.toml +++ b/ballerina-tests/http2-tests/Ballerina.toml @@ -9,9 +9,9 @@ name = "http_test_common" repository = "local" version = "2.9.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] scope = "testOnly" path = "../../test-utils/build/libs/http-test-utils-2.9.0-SNAPSHOT.jar" diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 97f72e376b..e577c7aba6 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -10,157 +10,157 @@ license = ["Apache-2.0"] distribution = "2201.7.0" export = ["http", "http.httpscerr"] -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "http-native" version = "@toml.version@" path = "../native/build/libs/http-native-@project.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "mime-native" version = "@mime.version@" path = "./lib/mime-native-@stdlib.mimenative.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "constraint-native" version = "@constraint.version@" path = "./lib/constraint-native-@stdlib.constraintnative.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-common" version = "@netty.version@" path = "./lib/netty-common-@netty.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-buffer" version = "@netty.version@" path = "./lib/netty-buffer-@netty.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-transport" version = "@netty.version@" path = "./lib/netty-transport-@netty.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-resolver" version = "@netty.version@" path = "./lib/netty-resolver-@netty.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-handler" version = "@netty.version@" path = "./lib/netty-handler-@netty.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-codec-http" version = "@netty.version@" path = "./lib/netty-codec-http-@netty.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-codec" version = "@netty.version@" path = "./lib/netty-codec-@netty.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-handler-proxy" version = "@netty.version@" path = "./lib/netty-handler-proxy-@netty.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-codec-http2" version = "@netty.version@" path = "./lib/netty-codec-http2-@netty.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "commons-pool.wso2" artifactId = "commons-pool" version = "@commmon.pool.version@" path = "./lib/commons-pool-@commmon.pool.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-transport-native-unix-common" version = "@netty.version@" path = "./lib/netty-transport-native-unix-common-@netty.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "org.bouncycastle" artifactId = "bcprov-jdk15on" version = "@bouncycastle.version@" path = "./lib/bcprov-jdk15on-@bouncycastle.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "org.bouncycastle" artifactId = "bcpkix-jdk15on" version = "@bouncycastle.version@" path = "./lib/bcpkix-jdk15on-@bouncycastle.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-tcnative-boringssl-static" version = "@tcnative.version@" path = "./lib/netty-tcnative-boringssl-static-@tcnative.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/netty-tcnative-boringssl-static-@tcnative.version@-windows-x86_64.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/netty-tcnative-boringssl-static-@tcnative.version@-linux-aarch_64.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/netty-tcnative-boringssl-static-@tcnative.version@-linux-x86_64.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/netty-tcnative-boringssl-static-@tcnative.version@-osx-aarch_64.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/netty-tcnative-boringssl-static-@tcnative.version@-osx-x86_64.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-tcnative-classes" version = "@tcnative.version@" path = "./lib/netty-tcnative-classes-@tcnative.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "org.jvnet.mimepull" artifactId = "mimepull" version = "@mimepull.version@" path = "./lib/mimepull-@mimepull.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-codec-socks" version = "@netty.version@" path = "./lib/netty-codec-socks-@netty.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "org.jboss.marshalling" artifactId = "jboss-marshalling" version = "@marshalling.version@" path = "./lib/jboss-marshalling-@marshalling.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "net.jpountz.lz4" artifactId = "lz4" version = "@lz4.version@" path = "./lib/lz4-@lz4.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "com.google.protobufl" artifactId = "protobuf-java" version = "@protobuf.version@" diff --git a/build-config/resources/BallerinaTest.toml b/build-config/resources/BallerinaTest.toml index 1091bba1d9..9ce50e8831 100644 --- a/build-config/resources/BallerinaTest.toml +++ b/build-config/resources/BallerinaTest.toml @@ -9,9 +9,9 @@ name = "@test.common@" repository = "local" version = "@toml.version@" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] scope = "testOnly" path = "../../test-utils/build/libs/http-test-utils-@project.version@.jar" diff --git a/test-utils/build.gradle b/test-utils/build.gradle index 50c65d6737..ab2f629e1c 100644 --- a/test-utils/build.gradle +++ b/test-utils/build.gradle @@ -38,7 +38,7 @@ dependencies { } checkstyle { - toolVersion '7.8.2' + toolVersion '10.12.0' configFile rootProject.file("build-config/checkstyle/build/checkstyle.xml") configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")] } @@ -51,6 +51,10 @@ tasks.withType(Checkstyle) { checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles") checkstyleTest.dependsOn(":checkstyle:downloadCheckstyleRuleFiles") +spotbugsMain { + enabled = false +} + spotbugsTest { enabled = false }