Skip to content

Commit 2479bde

Browse files
avelanariusavelanarius
committed
Merge branch '3.x' (at 3.11.4) into scylla-3.x
Update to 3.11.4 from upstream repo.
2 parents d291df6 + 031eda1 commit 2479bde

File tree

22 files changed

+63
-57
lines changed

22 files changed

+63
-57
lines changed

‎Jenkinsfile

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -140,25 +140,6 @@ ${status} after ${currentBuild.durationString - ' and counting'}"""
140140
}
141141
}
142142

143-
def submitCIMetrics(buildType) {
144-
long durationMs = currentBuild.duration
145-
long durationSec = durationMs / 1000
146-
long nowSec = (currentBuild.startTimeInMillis + durationMs) / 1000
147-
def branchNameNoPeriods = env.BRANCH_NAME.replaceAll('\\.', '_')
148-
def durationMetric = "okr.ci.java.${env.DRIVER_METRIC_TYPE}.${buildType}.${branchNameNoPeriods} ${durationSec} ${nowSec}"
149-
150-
timeout(time: 1, unit: 'MINUTES') {
151-
withCredentials([string(credentialsId: 'lab-grafana-address', variable: 'LAB_GRAFANA_ADDRESS'),
152-
string(credentialsId: 'lab-grafana-port', variable: 'LAB_GRAFANA_PORT')]) {
153-
withEnv(["DURATION_METRIC=${durationMetric}"]) {
154-
sh label: 'Send runtime metrics to labgrafana', script: '''#!/bin/bash -le
155-
echo "${DURATION_METRIC}" | nc -q 5 ${LAB_GRAFANA_ADDRESS} ${LAB_GRAFANA_PORT}
156-
'''
157-
}
158-
}
159-
}
160-
}
161-
162143
def describePerCommitStage() {
163144
script {
164145
currentBuild.displayName = "Per-Commit build"
@@ -182,7 +163,9 @@ def describeAdhocAndScheduledTestingStage() {
182163

183164
// branch pattern for cron
184165
// should match 3.x, 4.x, 4.5.x, etc
185-
def branchPatternCron = ~"((\\d+(\\.[\\dx]+)+))"
166+
def branchPatternCron() {
167+
~"((\\d+(\\.[\\dx]+)+))"
168+
}
186169

187170
pipeline {
188171
agent none
@@ -327,7 +310,7 @@ pipeline {
327310

328311
triggers {
329312
// schedules only run against release branches (i.e. 3.x, 4.x, 4.5.x, etc.)
330-
parameterizedCron(branchPatternCron.matcher(env.BRANCH_NAME).matches() ? """
313+
parameterizedCron(branchPatternCron().matcher(env.BRANCH_NAME).matches() ? """
331314
# Every weeknight (Monday - Friday) around 3:00 AM
332315
### JDK8 tests against 2.1, 3.0, 3.11 and 4.0
333316
H 3 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=2.1 3.0 3.11 4.0;CI_SCHEDULE_JABBA_VERSION=1.8;CI_SCHEDULE_TEST_PROFILE=long
@@ -428,11 +411,6 @@ pipeline {
428411
}
429412
}
430413
post {
431-
always {
432-
node('master') {
433-
submitCIMetrics('commit')
434-
}
435-
}
436414
aborted {
437415
notifySlack('aborted')
438416
}

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ not yet have been released. You can find the documentation for the latest
66
version through the [Java driver
77
docs](https://docs.scylladb.com/using-scylla/scylla-java-driver/) or via the release tags,
88
[e.g.
9-
3.11.2.0](https://github.com/scylladb/java-driver/releases/tag/3.11.2.0).*
9+
3.11.4.0](https://github.com/scylladb/java-driver/releases/tag/3.11.4.0).*
1010

1111
A modern, [feature-rich](manual/) and highly tunable Java client
1212
library for Apache Cassandra (2.1+) and using exclusively Cassandra's binary protocol
@@ -62,7 +62,7 @@ it in your application using the following Maven dependency
6262
<dependency>
6363
<groupId>com.scylladb</groupId>
6464
<artifactId>scylla-driver-core</artifactId>
65-
<version>3.11.2.0</version>
65+
<version>3.11.4.0</version>
6666
</dependency>
6767
```
6868

@@ -72,7 +72,7 @@ Note that the object mapper is published as a separate artifact:
7272
<dependency>
7373
<groupId>com.scylladb</groupId>
7474
<artifactId>scylla-driver-mapping</artifactId>
75-
<version>3.11.2.0</version>
75+
<version>3.11.4.0</version>
7676
</dependency>
7777
```
7878

@@ -82,7 +82,7 @@ The 'extras' module is also published as a separate artifact:
8282
<dependency>
8383
<groupId>com.scylladb</groupId>
8484
<artifactId>scylla-driver-extras</artifactId>
85-
<version>3.11.2.0</version>
85+
<version>3.11.4.0</version>
8686
</dependency>
8787
```
8888

@@ -92,7 +92,7 @@ to avoid the explicit dependency to Netty.
9292

9393
## Compatibility
9494

95-
The Java client driver 3.11.2.0 ([branch 3.x](https://github.com/scylladb/java-driver/tree/3.x)) is compatible with
95+
The Java client driver 3.11.4.0 ([branch scylla-3.x](https://github.com/scylladb/java-driver/tree/scylla-3.x)) is compatible with
9696
Scylla and Apache Cassandra 2.1, 2.2, 3.0+.
9797

9898
UDT and tuple support is available only when using Apache Cassandra 2.1 or higher.

‎changelog/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@
55
3.x versions get published.
66
-->
77

8+
### 3.11.4
9+
- [improvement] JAVA-3079: Upgrade Netty to 4.1.94, 3.x edition
10+
- [improvement] JAVA-3082: Fix maven build for Apple-silicon
11+
- [improvement] PR 1671: Fix LatencyAwarePolicy scale docstring
12+
13+
### 3.11.3
14+
- [improvement] JAVA-3023: Upgrade Netty to 4.1.77, 3.x edition
15+
16+
817
### 3.11.2
918
- [improvement] JAVA-3008: Upgrade Netty to 4.1.75, 3.x edition
1019
- [improvement] JAVA-2984: Upgrade Jackson to resolve high-priority CVEs

‎driver-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>com.scylladb</groupId>
2828
<artifactId>scylla-driver-parent</artifactId>
29-
<version>3.11.2.6-SNAPSHOT</version>
29+
<version>3.11.4.0-SNAPSHOT</version>
3030
</parent>
3131

3232
<artifactId>scylla-driver-core</artifactId>
@@ -129,7 +129,7 @@
129129

130130
<dependency>
131131
<groupId>io.netty</groupId>
132-
<artifactId>netty-tcnative</artifactId>
132+
<artifactId>${netty-tcnative.artifact}</artifactId>
133133
<classifier>${os.detected.classifier}</classifier>
134134
<scope>test</scope>
135135
</dependency>

‎driver-core/src/main/java/com/datastax/driver/core/policies/LatencyAwarePolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ public Builder withExclusionThreshold(double exclusionThreshold) {
709709
*
710710
* <pre>{@code d = (t - t') / scale
711711
* alpha = 1 - (ln(d+1) / d)
712-
* avg = alpha * l + (1 - alpha * prev)}</pre>
712+
* avg = alpha * l + (1 - alpha) * prev}</pre>
713713
*
714714
* Typically, with a {@code scale} of 100 milliseconds (the default), if a new latency is
715715
* measured and the previous measure is 10 millisecond old (so {@code d=0.1}), then {@code

‎driver-dist/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>com.scylladb</groupId>
2828
<artifactId>scylla-driver-parent</artifactId>
29-
<version>3.11.2.6-SNAPSHOT</version>
29+
<version>3.11.4.0-SNAPSHOT</version>
3030
</parent>
3131

3232
<artifactId>scylla-driver-dist</artifactId>

‎driver-examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>com.scylladb</groupId>
2828
<artifactId>scylla-driver-parent</artifactId>
29-
<version>3.11.2.6-SNAPSHOT</version>
29+
<version>3.11.4.0-SNAPSHOT</version>
3030
</parent>
3131

3232
<artifactId>scylla-driver-examples</artifactId>

‎driver-extras/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>com.scylladb</groupId>
2828
<artifactId>scylla-driver-parent</artifactId>
29-
<version>3.11.2.6-SNAPSHOT</version>
29+
<version>3.11.4.0-SNAPSHOT</version>
3030
</parent>
3131

3232
<artifactId>scylla-driver-extras</artifactId>

‎driver-mapping/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>com.scylladb</groupId>
2828
<artifactId>scylla-driver-parent</artifactId>
29-
<version>3.11.2.6-SNAPSHOT</version>
29+
<version>3.11.4.0-SNAPSHOT</version>
3030
</parent>
3131

3232
<artifactId>scylla-driver-mapping</artifactId>

‎driver-tests/osgi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>com.scylladb</groupId>
2828
<artifactId>scylla-driver-tests-parent</artifactId>
29-
<version>3.11.2.6-SNAPSHOT</version>
29+
<version>3.11.4.0-SNAPSHOT</version>
3030
</parent>
3131

3232
<artifactId>scylla-driver-tests-osgi</artifactId>

0 commit comments

Comments
 (0)