From 206123fc41ecc69d111a89b4eb53041a88ef3467 Mon Sep 17 00:00:00 2001 From: r3-build Date: Wed, 29 Nov 2023 11:58:22 +0000 Subject: [PATCH] CORE-11136: release prep for release-5.1.0.0 --- Jenkinsfile | 2 +- charts/corda/Chart.yaml | 27 +--- gradle.properties | 269 ++++++++++++++++------------------------ 3 files changed, 110 insertions(+), 188 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d828e1c4068..210fcea9b44 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('corda-shared-build-pipeline-steps@5.1') _ +@Library('corda-shared-build-pipeline-steps@5.1-GA') _ cordaPipelineKubernetesAgent( dailyBuildCron: 'H H/6 * * *', diff --git a/charts/corda/Chart.yaml b/charts/corda/Chart.yaml index b6bc5733760..bd9a803c922 100644 --- a/charts/corda/Chart.yaml +++ b/charts/corda/Chart.yaml @@ -1,29 +1,10 @@ apiVersion: v2 name: corda description: A Helm chart for Corda - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) version: 5.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "unstable-5.1.0" - +appVersion: unstable-5.1.0 dependencies: - - name: "corda-lib" - version: "5.1.0" - repository: "file://../corda-lib" +- name: corda-lib + version: 5.1.0 + repository: file://../corda-lib diff --git a/gradle.properties b/gradle.properties index 2f2b96c64e1..4a8264f538d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,178 +1,119 @@ -# General repository setup properties -artifactoryContextUrl=https://software.r3.com/artifactory -publicArtifactURL = https://download.corda.net/maven -kotlin.code.style=official -kotlinVersion=1.8.21 -kotlin.stdlib.default.dependency=false -kotlinMetadataVersion=0.7.0 - -org.gradle.java.installations.auto-download=false -org.gradle.jvmargs=-Dfile.encoding=UTF-8 - -# Disable discovery of annotation processors on compile classpath. -kapt.include.compile.classpath=false - -# Update with new major releases, or minor releases with breaking changes. (This drives the Flow Versioning too.) -platformVersion = 50100 - -# Versioning constants. -## The release/marketing version -cordaProductVersion=5.1.0 -## The revision number. This lines up the versioning of the runtime-os repo with the API repo, which allows the build -## system to assume the same versioning scheme. +#Wed Nov 29 11:58:19 UTC 2023 +hikariCpVersion=5.0.1 +braveVersion=5.15.0 +paxJdbcVersion=1.5.3 +osgiJdbcServiceVersion=1.1.0 +guavaVersion=32.1.1-jre +kotlin.build.report.output=file,build_scan +picocliVersion=4.7.3 +felixScrVersion=2.2.6 +gradleDataPlugin=1.8.2 cordaRuntimeRevision=0 - -# Plugin dependency versions -bndVersion=6.4.0 -bndlibVersion=6.4.1 -cordaGradlePluginsVersion=7.0.3 -detektPluginVersion=1.23.+ -internalPublishVersion=1.+ -internalDockerVersion=1.+ -dependencyCheckVersion=0.46.+ +postgresHost= +jcipAnnotationsVersion=1.0_2 snakeyamlVersion=2.0 -dokkaVersion=1.9.+ -# Implementation dependency versions -activationVersion=1.2.0 -ariesDynamicFrameworkExtensionVersion=1.3.6 -antlrVersion=2.7.7 -asmVersion=9.5 -avroVersion=1.11.3 -commonsCompressVersion = 1.24.0 -commonsVersion = 1.7 -caffeineVersion = 3.1.6 -commonsLangVersion = 3.12.0 -commonsTextVersion = 1.10.0 -bouncycastleVersion=1.76 -# Corda API libs revision (change in 4th digit indicates a breaking change) -# Change to 5.1.0.xx-SNAPSHOT to pick up maven local published copy -cordaApiVersion=5.1.0.39-beta+ - -disruptorVersion=3.4.4 +publicArtifactURL=https\://download.corda.net/maven +comEthloTimeItuVersion=1.7.3 +swaggeruiVersion=4.18.2 +protonjVersion=0.34.1 +gradleEnterpriseUrl=https\://gradle.dev.r3.com felixConfigAdminVersion=1.9.26 -felixVersion=7.0.5 -felixScrVersion=2.2.6 -felixSecurityVersion=2.8.4 -guavaVersion=32.1.1-jre -# Hibernate cannot be upgraded to 6.x due to missing OSGi support +kubernetesClientVersion=6.7.2 +kryoVersion=5.5.0 +osgiUtilPromiseVersion=1.3.0 +org.gradle.jvmargs=-Dfile.encoding\=UTF-8 +commonsCompressVersion=1.24.0 hibernateVersion=5.6.15.Final -hikariCpVersion=5.0.1 +kotlin.code.style=official +swaggerVersion=2.2.12 +postgresUser= +dokkaVersion=1.9.+ +slingVersion=3.3.6 +profilerVersion=2022.3 +cyclonedxVersion=1.7.4 +caffeineVersion=3.1.6 +felixSecurityVersion=2.8.4 +osgiTestJunit5Version=1.2.1 +kotlinCoroutinesVersion=1.6.4 +unirestVersion=3.14.5 +licenseUrl=http\://www.apache.org/licenses/LICENSE-2.0.txt +kotlin.stdlib.default.dependency=false +asmVersion=9.5 +antlrVersion=2.7.7 +org.gradle.java.installations.auto-download=false +postgresPort= +cordaApiLocation=../corda-api +typeSafeConfigVersion=1.4.2 +pluginHostVersion=5.1.0 +postgresPassword= +postgresDb= jacksonVersion=2.15.0 -jaxbVersion = 2.3.1 jbossTransactionApiSpecVersion=1.1.1.Final -jetbrainsAnnotationsVersion=24.0.1 -kafkaClientVersion=3.4.0_1 -kubernetesClientVersion=6.7.2 -# NOTE: Kryo cannot easily be upgraded as it needs a Quasar change. -# Check with one of the group leads before changing. -kryoVersion = 5.5.0 -kryoSerializersVersion = 0.45 -kotlinCoroutinesVersion=1.6.4 -# Liquibase upgrade to 4.20 and 4.21 failed - see CORE-12612 for more details -liquibaseVersion = 4.19.0 -# Needed by Liquibase: -beanutilsVersion=1.9.4 -log4jVersion = 2.20.0 -micrometerVersion=1.11.0 -nettyVersion = 4.1.94.Final -# com.networknt:json-schema-validator cannot be upgraded beyond 1.0.79 because it requires an OSGi bundle containing SLF4j with a version in the range [2.0,3), whereas Corda currently provides 1.7.36. -networkntJsonSchemaVersion = 1.0.79 -comEthloTimeItuVersion = 1.7.3 -osgiCmVersion = 1.6.1 -osgiNamespaceServiceVersion = 1.0.0 -osgiServiceComponentVersion = 1.5.1 -osgiUtilFunctionVersion = 1.2.0 -osgiUtilPromiseVersion = 1.3.0 -picocliVersion = 4.7.3 -protonjVersion=0.34.1 -quasarVersion = 0.9.1_r3-SNAPSHOT -reflectAsmVersion = 1.11.9 -# SLF4J cannot be ugraded to 2.x due to CorDapps requiring the 1.7 <= x < 2.0 +assertjVersion=3.24.2 +osgiCmVersion=1.6.1 +cordaProductVersion=5.1.0 +kotlinMetadataVersion=0.7.0 slf4jVersion=1.7.36 -# The CLI uses SLF4J version 2 -slf4jV2Version=2.0.6 -# Snappy version used for serialization +bndlibVersion=6.4.1 +junit5Version=5.10.0 +beanutilsVersion=1.9.4 +felixVersion=7.0.5 +mockitoKotlinVersion=4.1.0 +org.gradle.caching=true +kapt.include.compile.classpath=false +kryoSerializersVersion=0.45 snappyVersion=0.4 -# Completely different version of Snappy used in Kafka client +snykVersion=0.4 +detektPluginVersion=1.23.+ +log4jVersion=2.20.0 +bndVersion=6.4.0 +nimbusVersion=10.8 xerialSnappyVersion=1.1.10.4 -typeSafeConfigVersion=1.4.2 +avroVersion=1.11.3 +artifactoryPluginVersion=4.28.2 +disruptorVersion=3.4.4 +compositeBuild=false +enableProfiling=false +internalDockerVersion=1.+ +cordaGradlePluginsVersion=7.0.3 +postgresDriverVersion=42.6.0 +javalinVersion=4.6.7 +cordaCliHostLocation=../corda-cli-plugin-host +licenseName=The Apache License, Version 2.0 +pf4jVersion=3.10.0 +jettyVersion=9.4.53.v20231009 +ariesDynamicFrameworkExtensionVersion=1.3.6 +artifactoryContextUrl=https\://software.r3.com/artifactory +dom4jOsgiVersion=2.1.3_1 +osgiUtilFunctionVersion=1.2.0 jsonCanonicalizerVersion=1.1 -braveVersion=5.15.0 +hsqldbVersion=2.7.2 +commonsLangVersion=3.12.0 zipkinVersion=2.16.3 - -# Enable OSGi JDBC -osgiJdbcServiceVersion=1.1.0 -paxJdbcVersion=1.5.3 - -# Test dependency versions -assertjVersion=3.24.2 -dom4jOsgiVersion = 2.1.3_1 +jimfsVersion=1.3.0 +cordaApiVersion=5.1.0.39 +dependencyCheckVersion=0.46.+ +jaxbVersion=2.3.1 +commonsTextVersion=1.10.0 +liquibaseVersion=4.19.0 +kafkaClientVersion=3.4.0_1 +platformVersion=50100 +activationVersion=1.2.0 hamcrestVersion=2.2 -hsqldbVersion=2.7.2 -jimfsVersion = 1.3.0 -junit5Version=5.10.0 -mockitoKotlinVersion=4.1.0 +quasarVersion=0.9.1_r3-SNAPSHOT +networkntJsonSchemaVersion=1.0.79 +reflectAsmVersion=1.11.9 +nettyVersion=4.1.94.Final mockitoVersion=5.5.0 -osgiTestJunit5Version=1.2.1 -postgresDriverVersion=42.6.0 -slingVersion=3.3.6 - -# REST dependency versions -javalinVersion = 4.6.7 -swaggerVersion = 2.2.12 -# as defined in SWAGGERUI.version in io/javalin/core/util/OptionalDependency.kt -swaggeruiVersion = 4.18.2 -nimbusVersion = 10.8 -jcipAnnotationsVersion = 1.0_2 -unirestVersion = 3.14.5 -# This version of Jetty must be the same major version as used by Javalin, please see above. -# Once Javalin version is upgraded to the latest, this override may be removed. -jettyVersion = 9.4.53.v20231009 - -# Enables the substitution of binaries for source code if it exists in expected location -# Default behaviour is false. -compositeBuild=false -cordaApiLocation=../corda-api -cordaCliHostLocation=../corda-cli-plugin-host -jibCoreVersion=0.23.0 -artifactoryPluginVersion = 4.28.2 - -# PF4J -pf4jVersion=3.10.0 - -# corda-cli plugin host -pluginHostVersion=5.1.0-beta+ +osgiServiceComponentVersion=1.5.1 +slf4jV2Version=2.0.6 +kotlinVersion=1.8.21 +jetbrainsAnnotationsVersion=24.0.1 systemLambdaVersion=1.2.1 - -# DB integration tests -# NOTE: these should be overridden when running the tests, e.g. the Jenkins pipeline will set these when running the -# `integrationTest` stage. -# See libs/db/osgi-integration-tests/src/integrationTest/kotlin/net/corda/db/test/osgi/EntitiesInBundlesTest.kt -# for an example of one of these tests. -# The above test will fall back to HSQL (in-memory) when these properties are left empty. -postgresHost= -postgresPort= -postgresDb= -postgresUser= -postgresPassword= - -# Profiling support -enableProfiling=false -profilerVersion=2022.3 - -# Kotlin build -kotlin.build.report.output=file,build_scan - -gradleEnterpriseVersion = 3.14.1 -gradleDataPlugin = 1.8.2 -org.gradle.caching = true -gradleEnterpriseUrl = https://gradle.dev.r3.com -#snyk version -snykVersion = 0.4 - -# License -licenseName = The Apache License, Version 2.0 -licenseUrl = http://www.apache.org/licenses/LICENSE-2.0.txt - -# Cyclonedx Bom generation version -cyclonedxVersion = 1.7.4 +osgiNamespaceServiceVersion=1.0.0 +jibCoreVersion=0.23.0 +internalPublishVersion=1.+ +gradleEnterpriseVersion=3.14.1 +commonsVersion=1.7 +bouncycastleVersion=1.76 +micrometerVersion=1.11.0