Skip to content

Commit 81dda02

Browse files
chore(deps): bump bouncyCastle-jdk18on from 1.77 to 1.78 (#180)
* chore(deps): bump bouncyCastle-jdk18on from 1.77 to 1.78 Bumps `bouncyCastle-jdk18on` from 1.77 to 1.78. Updates `org.bouncycastle:bcpkix-jdk18on` from 1.77 to 1.78 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Updates `org.bouncycastle:bcprov-jdk18on` from 1.77 to 1.78 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcpkix-jdk18on dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.bouncycastle:bcprov-jdk18on dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * dependencies * fix compilation --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ndr_brt <[email protected]>
1 parent 2d2d753 commit 81dda02

File tree

17 files changed

+38
-31
lines changed

17 files changed

+38
-31
lines changed

DEPENDENCIES

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ maven/mavencentral/org.assertj/assertj-core/3.25.1, Apache-2.0, approved, #12585
226226
maven/mavencentral/org.assertj/assertj-core/3.25.3, Apache-2.0, approved, #12585
227227
maven/mavencentral/org.awaitility/awaitility/4.2.0, Apache-2.0, approved, #14178
228228
maven/mavencentral/org.awaitility/awaitility/4.2.1, Apache-2.0, approved, #14178
229-
maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.77, MIT, approved, #11593
230-
maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.77, MIT AND CC0-1.0, approved, #11595
231-
maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.77, MIT, approved, #11596
229+
maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.78, MIT, approved, #14235
230+
maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.78, MIT AND CC0-1.0, approved, #14237
231+
maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.78, MIT, approved, #14238
232232
maven/mavencentral/org.ccil.cowan.tagsoup/tagsoup/1.2.1, Apache-2.0, approved, clearlydefined
233233
maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined
234234
maven/mavencentral/org.codehaus.plexus/plexus-classworlds/2.6.0, Apache-2.0 AND Plexus, approved, CQ22821
@@ -318,6 +318,7 @@ maven/mavencentral/org.eclipse.edc/jetty-core/0.6.1-SNAPSHOT, Apache-2.0, approv
318318
maven/mavencentral/org.eclipse.edc/json-ld-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
319319
maven/mavencentral/org.eclipse.edc/json-ld-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
320320
maven/mavencentral/org.eclipse.edc/json-ld/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
321+
maven/mavencentral/org.eclipse.edc/json-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
321322
maven/mavencentral/org.eclipse.edc/junit-base/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
322323
maven/mavencentral/org.eclipse.edc/junit/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
323324
maven/mavencentral/org.eclipse.edc/jwt-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc

extensions/control-plane/provision/provision-blob/src/test/java/org/eclipse/edc/connector/provision/azure/blob/ObjectContainerProvisionedResourceTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package org.eclipse.edc.connector.provision.azure.blob;
1616

1717
import org.eclipse.edc.azure.blob.AzureBlobStoreSchema;
18+
import org.eclipse.edc.json.JacksonTypeManager;
1819
import org.eclipse.edc.spi.types.TypeManager;
1920
import org.junit.jupiter.api.BeforeEach;
2021
import org.junit.jupiter.api.Test;
@@ -28,7 +29,7 @@
2829
class ObjectContainerProvisionedResourceTest {
2930

3031
private ObjectContainerProvisionedResource resource;
31-
private final TypeManager typeManager = new TypeManager();
32+
private final TypeManager typeManager = new JacksonTypeManager();
3233

3334
@BeforeEach
3435
void setUp() {

extensions/control-plane/store/asset-index-cosmos/src/test/java/org/eclipse/edc/connector/store/azure/cosmos/assetindex/CosmosAssetIndexTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.eclipse.edc.connector.controlplane.store.sql.assetindex.SqlAssetIndex;
2222
import org.eclipse.edc.connector.controlplane.store.sql.assetindex.schema.BaseSqlDialectStatements;
2323
import org.eclipse.edc.connector.controlplane.store.sql.assetindex.schema.postgres.PostgresDialectStatements;
24+
import org.eclipse.edc.json.JacksonTypeManager;
2425
import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
25-
import org.eclipse.edc.spi.types.TypeManager;
2626
import org.eclipse.edc.sql.QueryExecutor;
2727
import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
2828
import org.eclipse.edc.transaction.spi.TransactionContext;
@@ -54,7 +54,7 @@ static void dropTables(CosmosPostgresTestExtension.SqlHelper runner) {
5454

5555
@BeforeEach
5656
void setUp(TransactionContext transactionContext, QueryExecutor queryExecutor, CosmosPostgresTestExtension.SqlHelper runner, DataSourceRegistry reg) {
57-
var typeManager = new TypeManager();
57+
var typeManager = new JacksonTypeManager();
5858
typeManager.registerTypes(PolicyRegistrationTypes.TYPES.toArray(Class<?>[]::new));
5959

6060

extensions/control-plane/store/contract-definition-store-cosmos/src/test/java/org/eclipse/edc/connector/store/azure/cosmos/contractdefinition/CosmosContractDefinitionStoreTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.eclipse.edc.connector.controlplane.store.sql.contractdefinition.SqlContractDefinitionStore;
2323
import org.eclipse.edc.connector.controlplane.store.sql.contractdefinition.schema.BaseSqlDialectStatements;
2424
import org.eclipse.edc.connector.controlplane.store.sql.contractdefinition.schema.postgres.PostgresDialectStatements;
25+
import org.eclipse.edc.json.JacksonTypeManager;
2526
import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
26-
import org.eclipse.edc.spi.types.TypeManager;
2727
import org.eclipse.edc.sql.QueryExecutor;
2828
import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
2929
import org.eclipse.edc.transaction.spi.TransactionContext;
@@ -54,7 +54,7 @@ static void dropTables(CosmosPostgresTestExtension.SqlHelper runner) {
5454

5555
@BeforeEach
5656
void setUp(TransactionContext transactionContext, QueryExecutor queryExecutor, CosmosPostgresTestExtension.SqlHelper helper, DataSourceRegistry reg) {
57-
var typeManager = new TypeManager();
57+
var typeManager = new JacksonTypeManager();
5858
typeManager.registerTypes(PolicyRegistrationTypes.TYPES.toArray(Class<?>[]::new));
5959

6060
sqlContractDefinitionStore = new SqlContractDefinitionStore(reg, DEFAULT_DATASOURCE_NAME, transactionContext, SQL_STATEMENTS, typeManager.getMapper(), queryExecutor);

extensions/control-plane/store/contract-negotiation-store-cosmos/src/test/java/org/eclipse/edc/connector/store/azure/cosmos/contractnegotiation/CosmosContractNegotiationStoreTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.eclipse.edc.connector.controlplane.store.sql.contractnegotiation.store.SqlContractNegotiationStore;
2222
import org.eclipse.edc.connector.controlplane.store.sql.contractnegotiation.store.schema.BaseSqlDialectStatements;
2323
import org.eclipse.edc.connector.controlplane.store.sql.contractnegotiation.store.schema.postgres.PostgresDialectStatements;
24+
import org.eclipse.edc.json.JacksonTypeManager;
2425
import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
25-
import org.eclipse.edc.spi.types.TypeManager;
2626
import org.eclipse.edc.sql.QueryExecutor;
2727
import org.eclipse.edc.sql.lease.testfixtures.LeaseUtil;
2828
import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
@@ -65,7 +65,7 @@ static void prepare(CosmosPostgresTestExtension.SqlHelper helper) {
6565
@BeforeEach
6666
void setUp(DataSource dataSource, TransactionContext transactionContext, QueryExecutor queryExecutor, CosmosPostgresTestExtension.SqlHelper helper, DataSourceRegistry reg) {
6767
var statements = new PostgresDialectStatements();
68-
var manager = new TypeManager();
68+
var manager = new JacksonTypeManager();
6969

7070
manager.registerTypes(PolicyRegistrationTypes.TYPES.toArray(Class<?>[]::new));
7171

extensions/control-plane/store/policy-definition-store-cosmos/src/test/java/org/eclipse/edc/connector/store/azure/cosmos/policydefinition/CosmosPolicyDefinitionStoreTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.eclipse.edc.connector.controlplane.policy.spi.testfixtures.store.PolicyDefinitionStoreTestBase;
2020
import org.eclipse.edc.connector.controlplane.store.sql.policydefinition.store.SqlPolicyDefinitionStore;
2121
import org.eclipse.edc.connector.controlplane.store.sql.policydefinition.store.schema.postgres.PostgresDialectStatements;
22+
import org.eclipse.edc.json.JacksonTypeManager;
2223
import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
23-
import org.eclipse.edc.spi.types.TypeManager;
2424
import org.eclipse.edc.sql.QueryExecutor;
2525
import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
2626
import org.eclipse.edc.transaction.spi.TransactionContext;
@@ -51,7 +51,7 @@ static void dropTables(CosmosPostgresTestExtension.SqlHelper helper) {
5151

5252
@BeforeEach
5353
void setUp(TransactionContext transactionContext, QueryExecutor queryExecutor, CosmosPostgresTestExtension.SqlHelper helper, DataSourceRegistry reg) {
54-
var manager = new TypeManager();
54+
var manager = new JacksonTypeManager();
5555

5656
manager.registerTypes(PolicyRegistrationTypes.TYPES.toArray(Class<?>[]::new));
5757

@@ -65,4 +65,4 @@ protected SqlPolicyDefinitionStore getPolicyDefinitionStore() {
6565
return sqlPolicyStore;
6666
}
6767

68-
}
68+
}

extensions/control-plane/store/transfer-process-store-cosmos/src/test/java/org/eclipse/edc/connector/store/azure/cosmos/transferprocess/CosmosTransferProcessStoreTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.eclipse.edc.connector.controlplane.store.sql.transferprocess.store.schema.postgres.PostgresDialectStatements;
2121
import org.eclipse.edc.connector.controlplane.transfer.spi.testfixtures.store.TestFunctions;
2222
import org.eclipse.edc.connector.controlplane.transfer.spi.testfixtures.store.TransferProcessStoreTestBase;
23+
import org.eclipse.edc.json.JacksonTypeManager;
2324
import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
24-
import org.eclipse.edc.spi.types.TypeManager;
2525
import org.eclipse.edc.sql.QueryExecutor;
2626
import org.eclipse.edc.sql.lease.testfixtures.LeaseUtil;
2727
import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
@@ -60,7 +60,7 @@ static void dropTables(CosmosPostgresTestExtension.SqlHelper helper) {
6060
@BeforeEach
6161
void setUp(DataSourceRegistry reg, TransactionContext transactionContext, QueryExecutor queryExecutor, CosmosPostgresTestExtension.SqlHelper helper, DataSource datasource) {
6262

63-
var typeManager = new TypeManager();
63+
var typeManager = new JacksonTypeManager();
6464
typeManager.registerTypes(TestFunctions.TestResourceDef.class, TestFunctions.TestProvisionedResource.class);
6565
typeManager.registerTypes(PolicyRegistrationTypes.TYPES.toArray(Class<?>[]::new));
6666

extensions/data-plane-selector/data-plane-instance-store-cosmos/src/test/java/org/eclipse/edc/connector/dataplane/selector/store/cosmos/CosmosDataPlaneInstanceStoreTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.eclipse.edc.connector.dataplane.selector.store.sql.SqlDataPlaneInstanceStore;
2323
import org.eclipse.edc.connector.dataplane.selector.store.sql.schema.DataPlaneInstanceStatements;
2424
import org.eclipse.edc.connector.dataplane.selector.store.sql.schema.postgres.PostgresDataPlaneInstanceStatements;
25+
import org.eclipse.edc.json.JacksonTypeManager;
2526
import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
26-
import org.eclipse.edc.spi.types.TypeManager;
2727
import org.eclipse.edc.sql.QueryExecutor;
2828
import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
2929
import org.eclipse.edc.transaction.spi.TransactionContext;
@@ -54,7 +54,7 @@ static void dropDatabase(CosmosPostgresTestExtension.SqlHelper helper) {
5454
@BeforeEach
5555
void setUp(DataSourceRegistry reg, TransactionContext transactionContext, QueryExecutor queryExecutor, CosmosPostgresTestExtension.SqlHelper helper) {
5656

57-
var typeManager = new TypeManager();
57+
var typeManager = new JacksonTypeManager();
5858
typeManager.registerTypes(DataPlaneInstance.class);
5959
typeManager.registerTypes(PolicyRegistrationTypes.TYPES.toArray(Class<?>[]::new));
6060

extensions/data-plane/data-plane-azure-data-factory/src/test/java/org/eclipse/edc/connector/dataplane/azure/datafactory/AzureDataFactoryCopyIntegrationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.eclipse.edc.connector.dataplane.spi.DataFlowStates;
2828
import org.eclipse.edc.connector.dataplane.spi.manager.DataPlaneManager;
2929
import org.eclipse.edc.connector.dataplane.spi.store.DataPlaneStore;
30+
import org.eclipse.edc.json.JacksonTypeManager;
3031
import org.eclipse.edc.junit.extensions.EdcExtension;
3132
import org.eclipse.edc.junit.testfixtures.TestUtils;
3233
import org.eclipse.edc.spi.types.TypeManager;
@@ -76,7 +77,7 @@ class AzureDataFactoryCopyIntegrationTest {
7677
private static final List<Runnable> SECRET_CLEANUP = new ArrayList<>();
7778
private static Properties savedProperties;
7879
private final String blobName = createBlobName();
79-
private final TypeManager typeManager = new TypeManager();
80+
private final TypeManager typeManager = new JacksonTypeManager();
8081

8182
@BeforeAll
8283
static void beforeAll() throws FileNotFoundException {

extensions/data-plane/data-plane-azure-data-factory/src/test/java/org/eclipse/edc/connector/dataplane/azure/datafactory/AzureDataFactoryTransferManagerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.eclipse.edc.azure.blob.api.BlobStoreApi;
2727
import org.eclipse.edc.connector.dataplane.spi.pipeline.StreamFailure;
2828
import org.eclipse.edc.connector.dataplane.spi.pipeline.StreamResult;
29+
import org.eclipse.edc.json.JacksonTypeManager;
2930
import org.eclipse.edc.spi.monitor.Monitor;
3031
import org.eclipse.edc.spi.types.TypeManager;
3132
import org.eclipse.edc.spi.types.domain.transfer.DataFlowStartMessage;
@@ -59,7 +60,7 @@ class AzureDataFactoryTransferManagerTest {
5960
private final DataFactoryClient client = mock(DataFactoryClient.class);
6061
private final DataFactoryPipelineFactory pipelineFactory = mock(DataFactoryPipelineFactory.class);
6162
private final BlobStoreApi blobStoreApi = mock(BlobStoreApi.class);
62-
private final TypeManager typeManager = new TypeManager();
63+
private final TypeManager typeManager = new JacksonTypeManager();
6364
private final KeyVaultClient keyVaultClient = mock(KeyVaultClient.class);
6465
private final KeyVaultSecret keyVaultSecret = mock(KeyVaultSecret.class);
6566
private final BlobAdapter blobAdapter = mock(BlobAdapter.class);

0 commit comments

Comments
 (0)