Skip to content

Commit d2d8e17

Browse files
authored
fix: compilation (eclipse-edc#267)
* fix: compilation * dependencies
1 parent c9c0904 commit d2d8e17

File tree

2 files changed

+16
-19
lines changed

2 files changed

+16
-19
lines changed

DEPENDENCIES

+11-13
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,29 @@ maven/mavencentral/com.apicatalog/titanium-json-ld/1.0.0, Apache-2.0, approved,
44
maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.1, Apache-2.0, approved, #8912
55
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.10.3, Apache-2.0, approved, CQ21280
66
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.3, Apache-2.0, approved, #7947
7-
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.16.1, Apache-2.0, approved, #11606
8-
maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.16.1, Apache-2.0 AND MIT, approved, #11602
7+
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.16.2, Apache-2.0, approved, #11606
8+
maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.16.2, Apache-2.0 AND MIT, approved, #11602
99
maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.3, Apache-2.0, approved, #7934
10-
maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.16.1, Apache-2.0, approved, #11605
11-
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.16.1, Apache-2.0, approved, #11853
10+
maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.16.2, Apache-2.0, approved, #11605
11+
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.16.2, Apache-2.0, approved, #11853
1212
maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.15.3, Apache-2.0, approved, #9241
13-
maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.16.1, Apache-2.0, approved, #11856
14-
maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.16.1, Apache-2.0, approved, #11852
13+
maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.16.2, Apache-2.0, approved, #11856
14+
maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.16.2, Apache-2.0, approved, #11852
1515
maven/mavencentral/com.github.docker-java/docker-java-api/3.3.6, Apache-2.0, approved, #10346
1616
maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.3.6, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #7946
1717
maven/mavencentral/com.github.docker-java/docker-java-transport/3.3.6, Apache-2.0, approved, #7942
1818
maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0, approved, CQ21949
1919
maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20
2020
maven/mavencentral/com.google.code.gson/gson/2.10.1, Apache-2.0, approved, #6159
21-
maven/mavencentral/com.google.collections/google-collections/1.0, Apache-2.0, approved, CQ3285
2221
maven/mavencentral/com.google.crypto.tink/tink/1.12.0, Apache-2.0, approved, #12041
2322
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.22.0, Apache-2.0, approved, #10661
24-
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.23.0, Apache-2.0, approved, #11083
23+
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.26.1, Apache-2.0, approved, #13657
2524
maven/mavencentral/com.google.guava/failureaccess/1.0.2, Apache-2.0, approved, CQ22654
26-
maven/mavencentral/com.google.guava/guava/33.0.0-jre, Apache-2.0 AND CC0-1.0, approved, #12173
25+
maven/mavencentral/com.google.guava/guava/33.1.0-jre, Apache-2.0 AND CC0-1.0, approved, #13675
2726
maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
2827
maven/mavencentral/com.google.protobuf/protobuf-java/3.24.3, BSD-3-Clause, approved, clearlydefined
2928
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.37.3, Apache-2.0, approved, #11701
30-
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.14.0, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND Apache-2.0, approved, #13562
29+
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.14.2, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND Apache-2.0, approved, #13562
3130
maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.12.0, Apache-2.0, approved, #11159
3231
maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #11156
3332
maven/mavencentral/com.squareup.okhttp3/okhttp/4.9.3, Apache-2.0 AND MPL-2.0, approved, #3225
@@ -58,8 +57,8 @@ maven/mavencentral/io.opentelemetry/opentelemetry-context/1.32.0, Apache-2.0, ap
5857
maven/mavencentral/io.setl/rdf-urdna/1.1, Apache-2.0, approved, clearlydefined
5958
maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.0, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
6059
maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
61-
maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, clearlydefined
62-
maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.0, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7697
60+
maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, ee4j.cdi
61+
maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jta
6362
maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.validation
6463
maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest
6564
maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.0, BSD-3-Clause, approved, ee4j.jaxb
@@ -93,7 +92,6 @@ maven/mavencentral/org.awaitility/awaitility/4.2.0, Apache-2.0, approved, clearl
9392
maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.77, MIT, approved, #11593
9493
maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.77, MIT AND CC0-1.0, approved, #11595
9594
maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.77, MIT, approved, #11596
96-
maven/mavencentral/org.checkerframework/checker-qual/3.41.0, MIT, approved, #12032
9795
maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined
9896
maven/mavencentral/org.codehaus.plexus/plexus-classworlds/2.6.0, Apache-2.0 AND Plexus, approved, CQ22821
9997
maven/mavencentral/org.codehaus.plexus/plexus-component-annotations/2.1.0, Apache-2.0, approved, #809

extensions/control-plane/provision/provision-aws-s3/src/test/java/org/eclipse/edc/connector/provision/aws/s3/S3ConsumerResourceDefinitionGeneratorTest.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.eclipse.edc.connector.provision.aws.s3;
1717

1818
import org.eclipse.edc.aws.s3.S3BucketSchema;
19-
import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
2019
import org.eclipse.edc.connector.transfer.spi.types.TransferProcess;
2120
import org.eclipse.edc.policy.model.Policy;
2221
import org.eclipse.edc.spi.types.domain.DataAddress;
@@ -47,7 +46,7 @@ void generate() {
4746
.property(S3BucketSchema.REGION, Region.EU_WEST_2.id())
4847
.build();
4948
var asset = Asset.Builder.newInstance().build();
50-
var dr = TransferProcess.Builder.newInstance().dataRequest(DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).processId("process-id").build()).build();
49+
var dr = TransferProcess.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
5150
var policy = Policy.Builder.newInstance().build();
5251

5352
var definition = generator.generate(dr, policy);
@@ -71,7 +70,7 @@ void generate_noRegionSpecified() {
7170
.property(S3BucketSchema.BUCKET_NAME, "test-name")
7271
.build();
7372
var asset = Asset.Builder.newInstance().build();
74-
var dr = TransferProcess.Builder.newInstance().dataRequest(DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).processId("process-id").build()).build();
73+
var dr = TransferProcess.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
7574
var policy = Policy.Builder.newInstance().build();
7675

7776
var definition = generator.generate(dr, policy);
@@ -89,7 +88,7 @@ void generate_noBucketNameSpecified() {
8988
.property(S3BucketSchema.REGION, Region.EU_WEST_2.id())
9089
.build();
9190
var asset = Asset.Builder.newInstance().build();
92-
var dr = TransferProcess.Builder.newInstance().dataRequest(DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).processId("process-id").build()).build();
91+
var dr = TransferProcess.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
9392
var policy = Policy.Builder.newInstance().build();
9493

9594
assertThatExceptionOfType(NullPointerException.class).isThrownBy(() -> generator.generate(dr, policy));
@@ -102,7 +101,7 @@ void canGenerate() {
102101
.property(S3BucketSchema.REGION, Region.US_EAST_1.id())
103102
.build();
104103
var asset = Asset.Builder.newInstance().build();
105-
var dr = TransferProcess.Builder.newInstance().dataRequest(DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).processId("process-id").build()).build();
104+
var dr = TransferProcess.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
106105
var policy = Policy.Builder.newInstance().build();
107106

108107
var definition = generator.canGenerate(dr, policy);
@@ -117,7 +116,7 @@ void canGenerateIsNotTypeS3BucketSchema() {
117116
.property(S3BucketSchema.REGION, Region.US_EAST_1.id())
118117
.build();
119118
var asset = Asset.Builder.newInstance().build();
120-
var dataRequest = TransferProcess.Builder.newInstance().dataRequest(DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build()).build();
119+
var dataRequest = TransferProcess.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
121120
var policy = Policy.Builder.newInstance().build();
122121

123122
var definition = generator.canGenerate(dataRequest, policy);

0 commit comments

Comments
 (0)