diff --git a/DEPENDENCIES b/DEPENDENCIES index 371816f7..07518ef8 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -90,9 +90,9 @@ maven/mavencentral/org.apache.xbean/xbean-reflect/3.7, Apache-2.0, approved, cle maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined maven/mavencentral/org.assertj/assertj-core/3.25.3, Apache-2.0, approved, #12585 maven/mavencentral/org.awaitility/awaitility/4.2.1, Apache-2.0, approved, #14178 -maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.77, MIT, approved, #11593 -maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.77, MIT AND CC0-1.0, approved, #11595 -maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.77, MIT, approved, #11596 +maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.78, MIT, approved, #14235 +maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.78, MIT AND CC0-1.0, approved, #14237 +maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.78, MIT, approved, #14238 maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined maven/mavencentral/org.codehaus.plexus/plexus-classworlds/2.6.0, Apache-2.0 AND Plexus, approved, CQ22821 maven/mavencentral/org.codehaus.plexus/plexus-component-annotations/2.1.0, Apache-2.0, approved, #809 @@ -122,6 +122,7 @@ maven/mavencentral/org.eclipse.edc/jersey-core/0.6.1-SNAPSHOT, Apache-2.0, appro maven/mavencentral/org.eclipse.edc/jersey-providers-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/jetty-core/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/json-ld-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/junit-base/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/junit/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/jwt-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc diff --git a/extensions/control-plane/provision/provision-aws-s3/src/test/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketProvisionedResourceTest.java b/extensions/control-plane/provision/provision-aws-s3/src/test/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketProvisionedResourceTest.java index d9621902..1a1a39db 100644 --- a/extensions/control-plane/provision/provision-aws-s3/src/test/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketProvisionedResourceTest.java +++ b/extensions/control-plane/provision/provision-aws-s3/src/test/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketProvisionedResourceTest.java @@ -14,7 +14,7 @@ package org.eclipse.edc.connector.provision.aws.s3; -import org.eclipse.edc.spi.types.TypeManager; +import org.eclipse.edc.json.JacksonTypeManager; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -31,7 +31,7 @@ class S3BucketProvisionedResourceTest { @Test void verifyDeserialize() throws IOException { - var mapper = new TypeManager().getMapper(); + var mapper = new JacksonTypeManager().getMapper(); StringWriter writer = new StringWriter(); mapper.writeValue(writer, provisionedResource); diff --git a/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataPlaneIntegrationTest.java b/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataPlaneIntegrationTest.java index 3e7dcb40..4bff4ceb 100644 --- a/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataPlaneIntegrationTest.java +++ b/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataPlaneIntegrationTest.java @@ -18,9 +18,9 @@ import org.eclipse.edc.aws.s3.S3BucketSchema; import org.eclipse.edc.aws.s3.testfixtures.AbstractS3Test; import org.eclipse.edc.aws.s3.testfixtures.annotations.AwsS3IntegrationTest; +import org.eclipse.edc.json.JacksonTypeManager; import org.eclipse.edc.spi.monitor.Monitor; import org.eclipse.edc.spi.security.Vault; -import org.eclipse.edc.spi.types.TypeManager; import org.eclipse.edc.spi.types.domain.DataAddress; import org.eclipse.edc.spi.types.domain.transfer.DataFlowStartMessage; import org.junit.jupiter.api.AfterEach; @@ -79,7 +79,7 @@ void should_copy_using_destination_object_name_case_single_transfer(String[] obj } var vault = mock(Vault.class); - var typeManager = new TypeManager(); + var typeManager = new JacksonTypeManager(); var sinkFactory = new S3DataSinkFactory(destinationClient.getClientProvider(), Executors.newSingleThreadExecutor(), mock(Monitor.class), vault, typeManager, defaultChunkSizeInBytes); var sourceFactory = new S3DataSourceFactory(sourceClient.getClientProvider(), mock(Monitor.class), vault, typeManager); @@ -143,7 +143,7 @@ void should_copy_to_folder_case_property_is_present(String[] objectNames) { } var vault = mock(Vault.class); - var typeManager = new TypeManager(); + var typeManager = new JacksonTypeManager(); var sinkFactory = new S3DataSinkFactory(destinationClient.getClientProvider(), Executors.newSingleThreadExecutor(), mock(Monitor.class), vault, typeManager, defaultChunkSizeInBytes); var sourceFactory = new S3DataSourceFactory(sourceClient.getClientProvider(), mock(Monitor.class), vault, typeManager); @@ -215,9 +215,9 @@ public Stream provideArguments(ExtensionContext context) { Arguments.of((Object) new String[]{ OBJECT_PREFIX + "1-" + OBJECT_NAME, OBJECT_PREFIX + "2-" + OBJECT_NAME, - OBJECT_PREFIX + "3-" + OBJECT_NAME}), + OBJECT_PREFIX + "3-" + OBJECT_NAME }), Arguments.of((Object) new String[]{ - OBJECT_NAME})); + OBJECT_NAME })); } } } diff --git a/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSinkFactoryTest.java b/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSinkFactoryTest.java index 27fb0c3c..46ec3ed2 100644 --- a/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSinkFactoryTest.java +++ b/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSinkFactoryTest.java @@ -20,6 +20,7 @@ import org.eclipse.edc.aws.s3.AwsTemporarySecretToken; import org.eclipse.edc.aws.s3.S3BucketSchema; import org.eclipse.edc.aws.s3.S3ClientRequest; +import org.eclipse.edc.json.JacksonTypeManager; import org.eclipse.edc.spi.EdcException; import org.eclipse.edc.spi.monitor.Monitor; import org.eclipse.edc.spi.security.Vault; @@ -53,7 +54,7 @@ class S3DataSinkFactoryTest { private final int defaultChunkSizeInBytes = 1024 * 1024 * parseInt(DEFAULT_CHUNK_SIZE_IN_MB); private final AwsClientProvider clientProvider = mock(AwsClientProvider.class); private final Vault vault = mock(Vault.class); - private final TypeManager typeManager = new TypeManager(); + private final TypeManager typeManager = new JacksonTypeManager(); private final S3DataSinkFactory factory = new S3DataSinkFactory(clientProvider, mock(ExecutorService.class), mock(Monitor.class), vault, typeManager, defaultChunkSizeInBytes); private final ArgumentCaptor s3ClientRequestArgumentCaptor = ArgumentCaptor.forClass(S3ClientRequest.class); diff --git a/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSourceFactoryTest.java b/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSourceFactoryTest.java index d72f1fef..47ee3856 100644 --- a/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSourceFactoryTest.java +++ b/extensions/data-plane/data-plane-aws-s3/src/test/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSourceFactoryTest.java @@ -19,6 +19,7 @@ import org.eclipse.edc.aws.s3.AwsTemporarySecretToken; import org.eclipse.edc.aws.s3.S3BucketSchema; import org.eclipse.edc.aws.s3.S3ClientRequest; +import org.eclipse.edc.json.JacksonTypeManager; import org.eclipse.edc.spi.EdcException; import org.eclipse.edc.spi.monitor.Monitor; import org.eclipse.edc.spi.security.Vault; @@ -51,7 +52,7 @@ class S3DataSourceFactoryTest { private final AwsClientProvider clientProvider = mock(AwsClientProvider.class); - private final TypeManager typeManager = new TypeManager(); + private final TypeManager typeManager = new JacksonTypeManager(); private final Vault vault = mock(Vault.class); private final S3DataSourceFactory factory = new S3DataSourceFactory(clientProvider, mock(Monitor.class), vault, typeManager); private final ArgumentCaptor s3ClientRequestArgumentCaptor = ArgumentCaptor.forClass(S3ClientRequest.class);