diff --git a/.ci/JenkinsfileSnykDelta b/.ci/JenkinsfileSnykDelta index dbb04113df..edbcec3751 100644 --- a/.ci/JenkinsfileSnykDelta +++ b/.ci/JenkinsfileSnykDelta @@ -2,5 +2,6 @@ snykDelta( snykOrgId: 'corda5-snyk-org-id', - snykTokenId: 'r3-snyk-corda5' + snykTokenId: 'r3-snyk-corda5', + javaVersion: '17' ) diff --git a/.ci/nightly/JenkinsfileNightly b/.ci/nightly/JenkinsfileNightly index eb836f8963..a1b6dbf1f9 100644 --- a/.ci/nightly/JenkinsfileNightly +++ b/.ci/nightly/JenkinsfileNightly @@ -4,5 +4,6 @@ cordaPipelineKubernetesAgent( runIntegrationTests: false, dailyBuildCron: 'H 02 * * *', gradleAdditionalArgs: '-Dscan.tag.Nightly-Build', - generateSbom: true + generateSbom: true, + javaVersion: '17' ) diff --git a/.ci/nightly/JenkinsfileSnykScan b/.ci/nightly/JenkinsfileSnykScan index 5d18b08b68..c654195c7a 100644 --- a/.ci/nightly/JenkinsfileSnykScan +++ b/.ci/nightly/JenkinsfileSnykScan @@ -1,5 +1,6 @@ @Library('corda-shared-build-pipeline-steps@5.1') _ cordaSnykScanPipeline ( - snykTokenId: 'r3-snyk-corda5' + snykTokenId: 'r3-snyk-corda5', + javaVersion: '17' ) diff --git a/Jenkinsfile b/Jenkinsfile index 000dba9570..77b1931115 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,4 +9,5 @@ cordaPipeline( localPublishVersionSuffixOverride: '-beta-9999999999999', // allow publishing artifacts to S3 bucket publishToMavenS3Repository: true, + javaVersion: '17' ) diff --git a/build.gradle b/build.gradle index a701f8e2a6..6781274fb1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import static org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 import static org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_8 -import static org.gradle.api.JavaVersion.VERSION_11 +import static org.gradle.api.JavaVersion.VERSION_17 import static org.gradle.jvm.toolchain.JavaLanguageVersion.of import org.jetbrains.dokka.gradle.DokkaTask @@ -71,7 +71,7 @@ void configureKotlinForOSGi(Configuration configuration) { } def releaseType = System.getenv('RELEASE_TYPE') ?: "SNAPSHOT" -def javaVersion = VERSION_11 +def javaVersion = VERSION_17 logger.quiet("********************** CORDA BUILD **********************") if (!JavaVersion.current().isCompatibleWith(javaVersion)) { @@ -129,8 +129,8 @@ subprojects { tasks.withType(JavaCompile).configureEach { options.compilerArgs << '-parameters' - options.encoding = 'UTF-8' + options.release.set(11) } // Added to support junit5 tests @@ -406,4 +406,4 @@ if (project.hasProperty('generateSBOM')) { artifactoryPublish { publications('sbom') } -} +} \ No newline at end of file