diff --git a/Jenkinsfile b/Jenkinsfile index 4f2a9d1da48..376002d5468 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('corda-shared-build-pipeline-steps@5.2') _ +@Library('corda-shared-build-pipeline-steps@5.2.1-GA') _ cordaPipelineKubernetesAgent( dailyBuildCron: 'H H/6 * * *', diff --git a/charts/corda/Chart.yaml b/charts/corda/Chart.yaml index 42261e0c653..01d62926068 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.2.1 - -# 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.2.1" - +appVersion: unstable-5.2.1 dependencies: - - name: "corda-lib" - version: "5.2.1" - repository: "file://../corda-lib" +- name: corda-lib + version: 5.2.1 + repository: file://../corda-lib diff --git a/gradle.properties b/gradle.properties index 6afaca45353..a04ca642c04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,140 +1,87 @@ -# General repository setup properties -artifactoryContextUrl=https://software.r3.com/artifactory -publicArtifactURL = https://download.corda.net/maven -kotlin.code.style=official -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. +#Tue May 28 12:35:35 UTC 2024 +org.gradle.caching=true kapt.include.compile.classpath=false - -# Update with new major releases, or minor releases with breaking changes. (This drives the Flow Versioning too.) -platformVersion = 50201 - -# Versioning constants. -## The release/marketing version -cordaProductVersion=5.2.1 -## 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. -cordaRuntimeRevision=0 - -# Plugin dependency versions -bndVersion=6.4.0 -bndlibVersion=6.4.1 -cordaGradlePluginsVersion=7.0.4 +kryoSerializersVersion=0.45 +snappyVersion=0.4 +databaseName= +paxJdbcVersion=1.5.3 detektPluginVersion=1.23.+ -internalPublishVersion=1.+ -internalDockerVersion=1.+ -# Implementation dependency versions -activationVersion=1.2.0 -ariesDynamicFrameworkExtensionVersion=1.3.6 -antlrVersion=2.7.7 -asmVersion=9.5 +osgiJdbcServiceVersion=1.1.0 +bndVersion=6.4.0 +felixScrVersion=2.2.6 +picocliVersion=4.7.3 +kotlin.build.report.output=file,build_scan avroVersion=1.11.3 -commonsVersion = 1.7 -commonsLangVersion = 3.12.0 -commonsTextVersion = 1.10.0 -# Corda API libs revision (change in 4th digit indicates a breaking change) -# Change to 5.2.1.xx-SNAPSHOT to pick up maven local published copy -cordaApiVersion=5.2.1.53-beta+ - +artifactoryPluginVersion=4.28.2 +cordaRuntimeRevision=0 +databaseAdminPassword= +postgresHost= +postgresDatabase= disruptorVersion=3.4.4 +compositeBuild=false +enableProfiling=false +publicArtifactURL=https\://download.corda.net/maven +internalDockerVersion=1.+ +comEthloTimeItuVersion=1.7.3 +cordaGradlePluginsVersion=7.0.4 +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 -# Hibernate cannot be upgraded to 6.x due to missing OSGi support +kryoVersion=5.5.0 +cordaCliHostLocation=../corda-cli-plugin-host +osgiUtilPromiseVersion=1.3.0 +licenseName=The Apache License, Version 2.0 +org.gradle.jvmargs=-Dfile.encoding\=UTF-8 hibernateVersion=5.6.15.Final -jaxbVersion = 2.3.1 -jbossTransactionApiSpecVersion=1.1.1.Final -jetbrainsAnnotationsVersion=24.0.1 -# 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 +kotlin.code.style=official +postgresUser= +slingVersion=3.3.6 +profilerVersion=2022.3 +ariesDynamicFrameworkExtensionVersion=1.3.6 +felixSecurityVersion=2.8.4 +osgiTestJunit5Version=1.2.1 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 -# 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 -# Snappy version used for serialization -snappyVersion=0.4 +databasePort= +artifactoryContextUrl=https\://software.r3.com/artifactory +kotlin.stdlib.default.dependency=false +dom4jOsgiVersion=2.1.3_1 +licenseUrl=http\://www.apache.org/licenses/LICENSE-2.0.txt +asmVersion=9.5 +osgiUtilFunctionVersion=1.2.0 +antlrVersion=2.7.7 jsonCanonicalizerVersion=1.1 - -# Enable OSGi JDBC -osgiJdbcServiceVersion=1.1.0 -paxJdbcVersion=1.5.3 - -# Test dependency versions -dom4jOsgiVersion = 2.1.3_1 -hamcrestVersion=2.2 +org.gradle.java.installations.auto-download=false hsqldbVersion=2.7.2 -jimfsVersion = 1.3.0 -osgiTestJunit5Version=1.2.1 -slingVersion=3.3.6 - -# 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 - -# corda-cli plugin host -pluginHostVersion=5.2.1-beta+ -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. -databaseHost= -databasePort= -databaseName= -databaseAdminUser= -databaseAdminPassword= - -# Legacy properties to stay compatible with the Jenkins pipeline. When setting the postgresPort, it will -# switch to using a postgres database. Either this mechanism or the generic one above can be used, if setting -# both postgres... and database... properties, they might interact badly. +commonsLangVersion=3.12.0 +jimfsVersion=1.3.0 +cordaApiVersion=5.2.1.53 +jaxbVersion=2.3.1 +commonsTextVersion=1.10.0 postgresPort= -postgresHost= -postgresUser= +liquibaseVersion=4.19.0 +cordaApiLocation=../corda-api +pluginHostVersion=5.2.1 postgresPassword= -postgresDatabase= - -# switch the database type for database integration tests. Currently valid values are -# HSQL, POSTGRES and MSSQL. -# See testing/db-testkit/src/main/kotlin/net/corda/db/testkit/DbUtils.kt +platformVersion=50201 +jbossTransactionApiSpecVersion=1.1.1.Final +activationVersion=1.2.0 +hamcrestVersion=2.2 +quasarVersion=0.9.1_r3-SNAPSHOT +networkntJsonSchemaVersion=1.0.79 +osgiCmVersion=1.6.1 +reflectAsmVersion=1.11.9 +databaseHost= +cordaProductVersion=5.2.1 +kotlinMetadataVersion=0.7.0 +osgiServiceComponentVersion=1.5.1 +bndlibVersion=6.4.1 +jetbrainsAnnotationsVersion=24.0.1 +systemLambdaVersion=1.2.1 databaseType=HSQL - -# Profiling support -enableProfiling=false -profilerVersion=2022.3 - -# Kotlin build -kotlin.build.report.output=file,build_scan - -org.gradle.caching = true -gradleEnterpriseUrl = https://gradle.dev.r3.com - -# License -licenseName = The Apache License, Version 2.0 -licenseUrl = http://www.apache.org/licenses/LICENSE-2.0.txt +osgiNamespaceServiceVersion=1.0.0 +jibCoreVersion=0.23.0 +beanutilsVersion=1.9.4 +felixVersion=7.0.5 +internalPublishVersion=1.+ +commonsVersion=1.7 +databaseAdminUser=