Skip to content

Commit 1b79293

Browse files
fix: adopt EDC build 1.4.0 (#5666)
1 parent c73beb6 commit 1b79293

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

extensions/common/auth/auth-delegated/src/main/java/org/eclipse/edc/api/auth/delegated/DelegatedAuthenticationExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class DelegatedAuthenticationExtension implements ServiceExtension {
5151
public static final String CONFIG_ALIAS = "web.http.<context>." + AUTH_KEY + ".";
5252
@Setting(context = CONFIG_ALIAS, description = "URL where the third-party IdP's public key(s) can be resolved for the configured <context>")
5353
public static final String AUTH_KEY_URL = "dac.key.url";
54-
@Setting(context = CONFIG_ALIAS, description = "Duration (in ms) that the internal key cache is valid for the configured <context>", type = "Long", defaultValue = "" + DEFAULT_CACHE_TIME_TO_LIVE)
54+
@Setting(context = CONFIG_ALIAS, description = "Duration (in ms) that the internal key cache is valid for the configured <context>", defaultValue = "" + DEFAULT_CACHE_TIME_TO_LIVE)
5555
public static final String AUTH_CACHE_VALIDITY_MS = "dac.cache.validity";
5656
public static final String AUDIENCE_KEY = "dac.audience";
5757
private static final int DEFAULT_VALIDATION_TOLERANCE = 5_000;

extensions/common/sql/sql-pool/sql-pool-apache-commons/src/main/java/org/eclipse/edc/sql/pool/commons/CommonsConnectionPoolServiceExtension.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,19 @@ public class CommonsConnectionPoolServiceExtension implements ServiceExtension {
5353
@Setting(description = "Username to be used for the JDBC connection. Can be omitted if not required, or if the password is encoded in the JDBC url.", context = EDC_DATASOURCE_CONFIG_CONTEXT)
5454
public static final String PASSWORD = "password";
5555

56-
@Setting(description = "Pool max idle connections", type = "int", context = EDC_DATASOURCE_CONFIG_CONTEXT)
56+
@Setting(description = "Pool max idle connections", context = EDC_DATASOURCE_CONFIG_CONTEXT)
5757
public static final String POOL_CONNECTIONS_MAX_IDLE = "pool.connections.max-idle";
58-
@Setting(description = "Pool max total connections", type = "int", context = EDC_DATASOURCE_CONFIG_CONTEXT)
58+
@Setting(description = "Pool max total connections", context = EDC_DATASOURCE_CONFIG_CONTEXT)
5959
public static final String POOL_CONNECTIONS_MAX_TOTAL = "pool.connections.max-total";
60-
@Setting(description = "Pool min idle connections", type = "int", context = EDC_DATASOURCE_CONFIG_CONTEXT)
60+
@Setting(description = "Pool min idle connections", context = EDC_DATASOURCE_CONFIG_CONTEXT)
6161
public static final String POOL_CONNECTIONS_MIN_IDLE = "pool.connections.min-idle";
62-
@Setting(description = "Pool test on borrow", type = "boolean", context = EDC_DATASOURCE_CONFIG_CONTEXT)
62+
@Setting(description = "Pool test on borrow", context = EDC_DATASOURCE_CONFIG_CONTEXT)
6363
public static final String POOL_CONNECTION_TEST_ON_BORROW = "pool.connection.test.on-borrow";
64-
@Setting(description = "Pool test on create", type = "boolean", context = EDC_DATASOURCE_CONFIG_CONTEXT)
64+
@Setting(description = "Pool test on create", context = EDC_DATASOURCE_CONFIG_CONTEXT)
6565
public static final String POOL_CONNECTION_TEST_ON_CREATE = "pool.connection.test.on-create";
66-
@Setting(description = "Pool test on return", type = "boolean", context = EDC_DATASOURCE_CONFIG_CONTEXT)
66+
@Setting(description = "Pool test on return", context = EDC_DATASOURCE_CONFIG_CONTEXT)
6767
public static final String POOL_CONNECTION_TEST_ON_RETURN = "pool.connection.test.on-return";
68-
@Setting(description = "Pool test while idle", type = "boolean", context = EDC_DATASOURCE_CONFIG_CONTEXT)
68+
@Setting(description = "Pool test while idle", context = EDC_DATASOURCE_CONFIG_CONTEXT)
6969
public static final String POOL_CONNECTION_TEST_WHILE_IDLE = "pool.connection.test.while-idle";
7070
@Setting(description = "Pool test query", context = EDC_DATASOURCE_CONFIG_CONTEXT)
7171
public static final String POOL_CONNECTION_TEST_QUERY = "pool.connection.test.query";

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,6 @@ dsp-core = { module = "org.eclipse.dataspacetck.dsp:core", version.ref = "dcp-tc
132132
jackson = ["jackson-annotations", "jackson-databind"]
133133

134134
[plugins]
135-
edc-build = { id = "org.eclipse.edc.edc-build", version = "1.3.0" }
135+
edc-build = { id = "org.eclipse.edc.edc-build", version = "1.4.0" }
136136
shadow = { id = "com.gradleup.shadow", version = "9.3.1" }
137137
swagger = { id = "io.swagger.core.v3.swagger-gradle-plugin", version.ref = "swagger" }

0 commit comments

Comments
 (0)