Skip to content
This repository was archived by the owner on Jul 11, 2024. It is now read-only.

Commit fb97e9c

Browse files
authored
Update dependencies (#491)
* Update dependencies * Bump since not compatible * Style * Style
1 parent 3ed543f commit fb97e9c

File tree

10 files changed

+36
-29
lines changed

10 files changed

+36
-29
lines changed

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
allprojects {
2626
project.group = 'org.curioswitch.curiostack'
2727

28+
plugins.withId('java') {
29+
task allDeps(type: DependencyReportTask) {}
30+
}
31+
2832
plugins.withType(org.gradle.api.publish.maven.plugins.MavenPublishPlugin) {
2933
project.apply plugin: 'com.jfrog.bintray'
3034
// This should happen automatically, not clear why not.

common/google-cloud/pubsub/src/main/java/org/curioswitch/gcloud/pubsub/Subscriber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ private void releaseAndRecord() {
208208
}
209209

210210
messageProcessingTime.record(
211-
System.nanoTime() - startTimeNanos, TimeUnit.NANOSECONDS);
211+
Duration.ofNanos(System.nanoTime() - startTimeNanos));
212212
}
213213
});
214214
}

common/grpc/protobuf-jackson/src/main/java/org/curioswitch/common/protobuf/json/SerializeSupport.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ public static SerializedString serializeString(String name) {
246246
return s;
247247
}
248248

249+
@SuppressWarnings("UnnecessaryLambda")
249250
private static final Comparator<Entry<String, ?>> STRING_KEY_COMPARATOR =
250251
(o1, o2) -> {
251252
ByteString s1 = ByteString.copyFromUtf8(o1.getKey());

common/server/framework/src/main/java/org/curioswitch/common/server/framework/redis/MicrometerCommandLatencyCollector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import io.lettuce.core.protocol.ProtocolKeyword;
3333
import io.micrometer.core.instrument.MeterRegistry;
3434
import java.net.SocketAddress;
35+
import java.time.Duration;
3536
import java.util.Map;
36-
import java.util.concurrent.TimeUnit;
3737

3838
class MicrometerCommandLatencyCollector implements CommandLatencyCollector {
3939

@@ -56,7 +56,7 @@ public void recordCommandLatency(
5656
registry,
5757
idPrefix.name(),
5858
idPrefix.tags("remote", remote.toString(), "command", commandType.name()))
59-
.record(completionLatency, TimeUnit.NANOSECONDS);
59+
.record(Duration.ofNanos(completionLatency));
6060
}
6161

6262
@Override

common/testing/framework/src/main/java/org/curioswitch/common/testing/database/DatabaseTestUtil.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,23 @@
4545
import org.jooq.tools.jdbc.MockExecuteContext;
4646
import org.jooq.tools.jdbc.MockResult;
4747
import org.mockito.Answers;
48-
import org.mockito.stubbing.Answer;
48+
import org.mockito.invocation.InvocationOnMock;
4949
import org.mockito.verification.VerificationMode;
5050

5151
/** Utilities for working with a mock database in tests. */
5252
public final class DatabaseTestUtil {
5353

5454
public static final DSLContext DB = DSL.using(SQLDialect.MYSQL);
5555

56-
private static final Answer<Object> LOGS_QUERY =
57-
invocation -> {
58-
MockExecuteContext ctx = invocation.getArgument(0);
59-
throw new AssertionError("Invalid SQL query: " + ctx.sql());
60-
};
56+
private static Object logQuery(InvocationOnMock invocation) {
57+
MockExecuteContext ctx = invocation.getArgument(0);
58+
throw new AssertionError("Invalid SQL query: " + ctx.sql());
59+
}
6160

6261
public static MockDataProvider mockProvider() {
6362
return mock(
64-
MockDataProvider.class, withSettings().name("dbProvider").defaultAnswer(LOGS_QUERY));
63+
MockDataProvider.class,
64+
withSettings().name("dbProvider").defaultAnswer(DatabaseTestUtil::logQuery));
6565
}
6666

6767
/**

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pluginManagement {
4444

4545
plugins {
4646
id("com.gradle.enterprise").version("3.1")
47-
id("org.curioswitch.gradle-curiostack-plugin").version("0.2.0")
47+
id("org.curioswitch.gradle-curiostack-plugin").version("0.3.0")
4848
}
4949

5050
configure<CuriostackExtension> {

tools/curiostack-bom/build.gradle.kts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@ data class DependencySet(val group: String, val version: String, val modules: Li
4949

5050
val DEPENDENCY_BOMS = listOf(
5151
"com.fasterxml.jackson:jackson-bom:2.10.1",
52-
"com.google.cloud:google-cloud-bom:0.116.0-alpha",
52+
"com.google.cloud:google-cloud-bom:0.120.2-alpha",
53+
// TODO(choko): Remove after https://github.com/googleapis/java-cloud-bom/pull/142
54+
"com.google.cloud:google-cloud-trace-bom:0.109.3-beta",
5355
"com.google.api-client:google-api-client-bom:1.30.5",
5456
"com.google.http-client:google-http-client-bom:1.33.0",
55-
"com.linecorp.armeria:armeria-bom:0.96.0",
57+
"com.linecorp.armeria:armeria-bom:0.97.0",
5658
"io.dropwizard.metrics:metrics-bom:4.1.1",
5759
"io.grpc:grpc-bom:1.25.0",
5860
"io.zipkin.brave:brave-bom:5.9.1",
@@ -128,7 +130,7 @@ val DEPENDENCY_SETS = listOf(
128130
),
129131
DependencySet(
130132
"com.google.errorprone",
131-
"2.3.3",
133+
"2.3.4",
132134
listOf("error_prone_annotations", "error_prone_core")
133135
),
134136
DependencySet(
@@ -143,12 +145,12 @@ val DEPENDENCY_SETS = listOf(
143145
),
144146
DependencySet(
145147
"com.google.protobuf",
146-
"3.11.0",
148+
"3.11.1",
147149
listOf("protobuf-java", "protobuf-java-util")
148150
),
149151
DependencySet(
150152
"com.google.protobuf",
151-
"3.11.0",
153+
"3.11.1",
152154
listOf("protoc")
153155
),
154156
DependencySet(
@@ -184,7 +186,7 @@ val DEPENDENCY_SETS = listOf(
184186
),
185187
DependencySet(
186188
"io.fabric8",
187-
"4.6.3",
189+
"4.6.4",
188190
listOf("kubernetes-client")
189191
),
190192
DependencySet(
@@ -194,7 +196,7 @@ val DEPENDENCY_SETS = listOf(
194196
),
195197
DependencySet(
196198
"io.micrometer",
197-
"1.3.1",
199+
"1.3.2",
198200
listOf("micrometer-core", "micrometer-registry-prometheus")
199201
),
200202
DependencySet(
@@ -229,7 +231,7 @@ val DEPENDENCY_SETS = listOf(
229231
),
230232
DependencySet(
231233
"net.bytebuddy",
232-
"1.10.3",
234+
"1.10.4",
233235
listOf("byte-buddy", "byte-buddy-agent")
234236
),
235237
DependencySet(
@@ -264,7 +266,7 @@ val DEPENDENCY_SETS = listOf(
264266
),
265267
DependencySet(
266268
"org.checkerframework",
267-
"3.0.0",
269+
"3.0.1",
268270
listOf("checker-qual")
269271
),
270272
DependencySet(
@@ -304,7 +306,7 @@ val DEPENDENCY_SETS = listOf(
304306
),
305307
DependencySet(
306308
"org.mockito",
307-
"3.1.12",
309+
"3.2.0",
308310
listOf("mockito-core", "mockito-junit-jupiter")
309311
),
310312
DependencySet(
@@ -327,7 +329,7 @@ val DEPENDENCY_SETS = listOf(
327329

328330
val DEPENDENCIES = listOf(
329331
"com.bmuschko:gradle-docker-plugin:6.0.0",
330-
"com.diffplug.spotless:spotless-plugin-gradle:3.26.0",
332+
"com.diffplug.spotless:spotless-plugin-gradle:3.26.1",
331333
"com.github.ben-manes:gradle-versions-plugin:0.27.0",
332334
"com.google.code.gson:gson:2.8.6",
333335
"com.google.gradle:osdetector-gradle-plugin:1.6.2",

tools/curiostack-bom/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# SOFTWARE.
2323
#
2424

25-
version = 0.2.0
25+
version = 0.3.0

tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# SOFTWARE.
2323
#
2424

25-
version = 0.2.0
25+
version = 0.3.0

tools/gradle-plugins/gradle-curiostack-plugin/src/main/java/org/curioswitch/gradle/plugins/curiostack/ToolDependencies.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ public class ToolDependencies {
3232

3333
private static Map<String, String> DEFAULT_VERSIONS =
3434
ImmutableMap.<String, String>builder()
35-
.put("bom", "0.2.0")
35+
.put("bom", "0.3.0")
3636
.put("claat", "2.2.0")
3737
.put("gcloud", "272.0.0")
38-
.put("golang", "1.13.4")
38+
.put("golang", "1.13.5")
3939
.put("google-java-format", "1.7")
4040
.put("gradle", "6.0.1")
4141
.put("helm", "2.10.0")
4242
.put("miniconda", "Miniconda3-4.7.12.1")
43-
.put("node", "12.13.1")
43+
.put("node", "13.3.0")
4444
.put("openjdk", "zulu13.28.11-ca-jdk13.0.1")
4545
.put("openjdk8", "zulu8.42.0.21-ca-jdk8.0.232")
46-
.put("terraform", "0.12.16")
46+
.put("terraform", "0.12.17")
4747
.put("terraform-gsuite-provider", "0.1.35")
48-
.put("yarn", "1.19.1")
48+
.put("yarn", "1.19.2")
4949
.build();
5050

5151
public static String getBomVersion(Project project) {

0 commit comments

Comments
 (0)