ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-01 23:20:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #7563 from corda/merge-release/os/4.11-release/os/4.12-2023-11-03-31

Browse Source 
ENT-10760: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-11-03
This commit is contained in:
Adel El-Beik 2023-11-04 10:10:25 +00:00 committed by GitHub
commit ae956d12e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/dev/log4j2.xml
View File

@ -135,7 +135,7 @@
<DefaultRolloverStrategy min="1" max="100"> <DefaultRolloverStrategy min="1" max="100">
<Delete basePath="${archive}" maxDepth="1"> <Delete basePath="${archive}" maxDepth="1">
<IfFileName glob="${log-name}*.log.gz"/> <IfFileName glob="${diagnostic-log-name}*.log.gz"/>
<IfLastModified age="60d"> <IfLastModified age="60d">
<IfAny> <IfAny>
<IfAccumulatedFileSize exceeds="10 GB"/> <IfAccumulatedFileSize exceeds="10 GB"/>
@ -159,7 +159,7 @@
<DefaultRolloverStrategy min="1" max="100"> <DefaultRolloverStrategy min="1" max="100">
<Delete basePath="${archive}" maxDepth="1"> <Delete basePath="${archive}" maxDepth="1">
<IfFileName glob="${log-name}*.log.gz"/> <IfFileName glob="checkpoints_agent*.log.gz"/>
<IfLastModified age="60d"> <IfLastModified age="60d">
<IfAny> <IfAny>
<IfAccumulatedFileSize exceeds="10 GB"/> <IfAccumulatedFileSize exceeds="10 GB"/>

4
constants.properties
View File

@ -17,7 +17,7 @@ openTelemetryVersion=1.20.1
openTelemetrySemConvVersion=1.20.1-alpha openTelemetrySemConvVersion=1.20.1-alpha
guavaVersion=28.0-jre guavaVersion=28.0-jre
# Quasar version to use with Java 8: # Quasar version to use with Java 8:
quasarVersion=0.7.15_r3 quasarVersion=0.7.16_r3
# Quasar version to use with Java 11: # Quasar version to use with Java 11:
quasarVersion11=0.8.1_r3 quasarVersion11=0.8.1_r3
jdkClassifier11=jdk11 jdkClassifier11=jdk11
@ -78,7 +78,7 @@ joptSimpleVersion=5.0.2
jansiVersion=1.18 jansiVersion=1.18
hibernateVersion=5.6.14.Final hibernateVersion=5.6.14.Final
# h2Version - Update docs if renamed or removed. # h2Version - Update docs if renamed or removed.
h2Version=2.1.214 h2Version=2.2.224
rxjavaVersion=1.3.8 rxjavaVersion=1.3.8
dokkaVersion=0.10.1 dokkaVersion=0.10.1
eddsaVersion=0.3.0 eddsaVersion=0.3.0

28
node/src/main/resources/migration/node-core.changelog-v25.xml
View File

@ -10,7 +10,7 @@
<dropColumn tableName="node_transactions" columnName="states_to_record"/> <dropColumn tableName="node_transactions" columnName="states_to_record"/>
</changeSet> </changeSet>
<changeSet author="R3.Corda" id="create_sender_distribution_records_table"> <changeSet author="R3.Corda" id="create_sender_distr_recs_table">
<createTable tableName="node_sender_distr_recs"> <createTable tableName="node_sender_distr_recs">
<column name="timestamp" type="TIMESTAMP"> <column name="timestamp" type="TIMESTAMP">
<constraints nullable="false"/> <constraints nullable="false"/>
@ -34,11 +34,19 @@
</changeSet> </changeSet>
<changeSet author="R3.Corda" id="node_sender_distr_recs_pkey"> <changeSet author="R3.Corda" id="node_sender_distr_recs_pkey">
<addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_sender_distr_recs_pkey" <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator, transaction_id" constraintName="node_sender_distr_recs_pkey"
tableName="node_sender_distr_recs"/> tableName="node_sender_distr_recs"/>
</changeSet> </changeSet>
<changeSet author="R3.Corda" id="create_receiver_distribution_records_table"> <changeSet author="R3.Corda" id="node_sender_distr_recs_add_indexes">
<createIndex indexName="node_sender_distr_recs_keyinfo_idx" tableName="node_sender_distr_recs">
<column name="transaction_id"/>
<column name="timestamp"/>
<column name="timestamp_discriminator"/>
</createIndex>
</changeSet>
<changeSet author="R3.Corda" id="create_receiver_distr_recs_table">
<createTable tableName="node_receiver_distr_recs"> <createTable tableName="node_receiver_distr_recs">
<column name="timestamp" type="TIMESTAMP"> <column name="timestamp" type="TIMESTAMP">
<constraints nullable="false"/> <constraints nullable="false"/>
@ -62,10 +70,18 @@
</changeSet> </changeSet>
<changeSet author="R3.Corda" id="node_receiver_distr_recs_pkey"> <changeSet author="R3.Corda" id="node_receiver_distr_recs_pkey">
<addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_receiver_distr_recs_pkey" <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator, transaction_id" constraintName="node_receiver_distr_recs_pkey"
tableName="node_receiver_distr_recs"/> tableName="node_receiver_distr_recs"/>
</changeSet> </changeSet>
<changeSet author="R3.Corda" id="node_receiver_distr_recs_add_indexes">
<createIndex indexName="node_receiver_distr_recs_keyinfo_idx" tableName="node_receiver_distr_recs">
<column name="transaction_id"/>
<column name="timestamp"/>
<column name="timestamp_discriminator"/>
</createIndex>
</changeSet>
<changeSet author="R3.Corda" id="create_recovery_party_info_table"> <changeSet author="R3.Corda" id="create_recovery_party_info_table">
<createTable tableName="node_recovery_party_info"> <createTable tableName="node_recovery_party_info">
<column name="party_id" type="NVARCHAR(144)"> <column name="party_id" type="NVARCHAR(144)">
@ -81,13 +97,13 @@
<addPrimaryKey columnNames="party_id" constraintName="node_recovery_party_info_pkey" tableName="node_recovery_party_info"/> <addPrimaryKey columnNames="party_id" constraintName="node_recovery_party_info_pkey" tableName="node_recovery_party_info"/>
</changeSet> </changeSet>
<changeSet author="R3.Corda" id="FK__sender_distribution_records__peer_party_id"> <changeSet author="R3.Corda" id="FK__sender_distr_recs__peer_party_id">
<addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_sender_distr_recs" <addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_sender_distr_recs"
constraintName="FK__send_distr__peer_party_id" constraintName="FK__send_distr__peer_party_id"
referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/> referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/>
</changeSet> </changeSet>
<changeSet author="R3.Corda" id="FK__receiver_distribution_records__peer_party_id"> <changeSet author="R3.Corda" id="FK__receiver_distr_recs__peer_party_id">
<addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_receiver_distr_recs" <addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_receiver_distr_recs"
constraintName="FK__recv_distr__peer_party_id" constraintName="FK__recv_distr__peer_party_id"
referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/> referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/>