Skip to content

Commit e1207e6

Browse files
committed
use experimental_features:[udf] and not experimental: true
experimental flag isn't supported anymore by scylla Ref: scylladb/scylla-ccm#512 Fixes: #24
1 parent 7953da1 commit e1207e6

File tree

1 file changed

+20
-20
lines changed
  • versions/datastax/4.13.0

1 file changed

+20
-20
lines changed

versions/datastax/4.13.0/patch

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git c/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeMetadataIT.java w/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeMetadataIT.java
1+
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeMetadataIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeMetadataIT.java
22
index 32e8c3929..292a8dfa5 100644
3-
--- c/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeMetadataIT.java
4-
+++ w/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeMetadataIT.java
3+
--- a/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeMetadataIT.java
4+
+++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeMetadataIT.java
55
@@ -58,7 +58,7 @@ public class NodeMetadataIT {
66
assertThat(broadcastAddress.getAddress()).isEqualTo(connectAddress.getAddress()));
77
assertThat(node.getListenAddress().get().getAddress()).isEqualTo(connectAddress.getAddress());
@@ -11,10 +11,10 @@ index 32e8c3929..292a8dfa5 100644
1111
if (!CcmBridge.DSE_ENABLEMENT) {
1212
// CcmBridge does not report accurate C* versions for DSE, only approximated values
1313
assertThat(node.getCassandraVersion()).isEqualTo(ccmRule.getCassandraVersion());
14-
diff --git c/test-infra/revapi.json w/test-infra/revapi.json
14+
diff --git a/test-infra/revapi.json b/test-infra/revapi.json
1515
index 3cfbc8b53..0fa33a041 100644
16-
--- c/test-infra/revapi.json
17-
+++ w/test-infra/revapi.json
16+
--- a/test-infra/revapi.json
17+
+++ b/test-infra/revapi.json
1818
@@ -171,6 +171,16 @@
1919
"code": "java.method.removed",
2020
"old": "method void com.datastax.oss.driver.api.testinfra.ccm.CcmRule::reloadCore(int, java.lang.String, java.lang.String, boolean)",
@@ -32,10 +32,10 @@ index 3cfbc8b53..0fa33a041 100644
3232
}
3333
]
3434
}
35-
diff --git c/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/BaseCcmRule.java w/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/BaseCcmRule.java
35+
diff --git a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/BaseCcmRule.java b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/BaseCcmRule.java
3636
index c902434aa..0aa9bc8e1 100644
37-
--- c/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/BaseCcmRule.java
38-
+++ w/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/BaseCcmRule.java
37+
--- a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/BaseCcmRule.java
38+
+++ b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/BaseCcmRule.java
3939
@@ -18,10 +18,15 @@ package com.datastax.oss.driver.api.testinfra.ccm;
4040
import com.datastax.oss.driver.api.core.DefaultProtocolVersion;
4141
import com.datastax.oss.driver.api.core.ProtocolVersion;
@@ -66,10 +66,10 @@ index c902434aa..0aa9bc8e1 100644
6666
private Statement buildErrorStatement(
6767
Version requirement, String description, boolean lessThan, boolean dse) {
6868
return new Statement() {
69-
diff --git c/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java w/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java
70-
index cef9e13c4..46f2a08ae 100644
71-
--- c/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java
72-
+++ w/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java
69+
diff --git a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java
70+
index cef9e13c4..054c1e78e 100644
71+
--- a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java
72+
+++ b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java
7373
@@ -54,6 +54,10 @@ public class CcmBridge implements AutoCloseable {
7474
public static final Version VERSION =
7575
Objects.requireNonNull(Version.parse(System.getProperty("ccm.version", "4.0.0")));
@@ -160,7 +160,7 @@ index cef9e13c4..46f2a08ae 100644
160160
}
161161
if (getCassandraVersion().compareTo(Version.V2_2_0) >= 0) {
162162
- execute("updateconf", "enable_user_defined_functions:true");
163-
+ execute("updateconf", "enable_user_defined_functions:true", "experimental:true");
163+
+ execute("updateconf", "enable_user_defined_functions:true", "experimental_features:[udf]");
164164
}
165165
+
166166
if (DSE_ENABLEMENT) {
@@ -231,10 +231,10 @@ index cef9e13c4..46f2a08ae 100644
231231
cassandraConfiguration,
232232
dseConfiguration,
233233
dseRawYaml,
234-
diff --git c/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CustomCcmRule.java w/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CustomCcmRule.java
234+
diff --git a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CustomCcmRule.java b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CustomCcmRule.java
235235
index 4ea1b3843..45029cc10 100644
236-
--- c/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CustomCcmRule.java
237-
+++ w/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CustomCcmRule.java
236+
--- a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CustomCcmRule.java
237+
+++ b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CustomCcmRule.java
238238
@@ -15,6 +15,7 @@
239239
*/
240240
package com.datastax.oss.driver.api.testinfra.ccm;
@@ -275,10 +275,10 @@ index 4ea1b3843..45029cc10 100644
275275
public CustomCcmRule build() {
276276
return new CustomCcmRule(bridgeBuilder.build());
277277
}
278-
diff --git c/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/DefaultCcmBridgeBuilderCustomizer.java w/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/DefaultCcmBridgeBuilderCustomizer.java
278+
diff --git a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/DefaultCcmBridgeBuilderCustomizer.java b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/DefaultCcmBridgeBuilderCustomizer.java
279279
index 96a0ac5fd..69ee3a550 100644
280-
--- c/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/DefaultCcmBridgeBuilderCustomizer.java
281-
+++ w/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/DefaultCcmBridgeBuilderCustomizer.java
280+
--- a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/DefaultCcmBridgeBuilderCustomizer.java
281+
+++ b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/DefaultCcmBridgeBuilderCustomizer.java
282282
@@ -24,12 +24,13 @@ public class DefaultCcmBridgeBuilderCustomizer {
283283
public static CcmBridge.Builder configureBuilder(CcmBridge.Builder builder) {
284284
if (!CcmBridge.DSE_ENABLEMENT

0 commit comments

Comments
 (0)