Skip to content

Commit 8ff54d6

Browse files
BrandonArpBrandonArp
authored
Version updates (#172)
jdk17 and package updates
1 parent d832fc4 commit 8ff54d6

32 files changed

+187
-252
lines changed

‎Jenkinsfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
pipeline {
22
agent {
33
kubernetes {
4-
yamlFile 'kubes-pod.yaml'
54
defaultContainer 'ubuntu'
65
activeDeadlineSeconds 3600
76
idleMinutes 15

‎config/config.conf‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,27 +78,20 @@ akkaConfiguration {
7878
}
7979
}
8080
cluster {
81-
# TODO: Migrate to Artery remove:
82-
seed-nodes=["akka.tcp://[email protected]:2551"]
83-
# TODO: Migrate to Artery uncomment:
84-
#seed-nodes=["akka://[email protected]:25520"]
81+
seed-nodes=["akka://[email protected]:2551"]
82+
downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
8583
sharding {
8684
state-store-mode="persistence"
8785
passivate-idle-entity-after="300s"
8886
}
8987
}
9088
remote {
9189
log-remote-lifecycle-events="on"
92-
# TODO: Migrate to Artery uncomment:
93-
#artery {
94-
# enabled="on"
95-
# transport="tcp"
96-
# canonical.port=25520
97-
# canonlical.hostname="127.0.0.1"
98-
#}
99-
# TODO: Migrate to Artery remove:
100-
netty.tcp.hostname="127.0.0.1"
101-
netty.tcp.port=2551
90+
artery {
91+
enabled="on"
92+
canonical.port=2551
93+
canonical.hostname="127.0.0.1"
94+
}
10295
}
10396
persistence {
10497
journal {

‎kubes-pod.yaml‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 50 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>com.arpnetworking.build</groupId>
2020
<artifactId>arpnetworking-parent-pom</artifactId>
21-
<version>3.0.8</version>
21+
<version>3.0.9</version>
2222
<relativePath />
2323
</parent>
2424

@@ -101,60 +101,59 @@
101101

102102
<properties>
103103
<!--Dependency versions-->
104-
<akka.version>2.5.32</akka.version>
105-
<akka.http.version>10.1.13</akka.http.version>
106-
<akka.persistence.cassandra.version>0.105</akka.persistence.cassandra.version>
107-
<apache.httpclient.version>4.5.2</apache.httpclient.version>
108-
<apache.httpcore.version>4.4.5</apache.httpcore.version>
109-
<arpnetworking.commons.version>2.0.3</arpnetworking.commons.version>
104+
<akka.version>2.6.19</akka.version>
105+
<akka.http.version>10.2.9</akka.http.version>
106+
<akka.persistence.cassandra.version>1.0.5</akka.persistence.cassandra.version>
107+
<apache.httpclient.version>4.5.13</apache.httpclient.version>
108+
<apache.httpcore.version>4.4.15</apache.httpcore.version>
109+
<arpnetworking.commons.version>2.0.5</arpnetworking.commons.version>
110110
<aspectjrt.version>1.9.9.1</aspectjrt.version>
111-
<asynchttpclient.version>2.0.38</asynchttpclient.version>
112-
<cglib.version>3.3.0</cglib.version>
113-
<commons.codec.version>1.10</commons.codec.version>
114-
<ebean.version>13.7.0</ebean.version>
111+
<asynchttpclient.version>2.12.3</asynchttpclient.version>
112+
<awaitility.version>4.2.0</awaitility.version>
113+
<commons.codec.version>1.15</commons.codec.version>
114+
<ebean.version>13.8.0</ebean.version>
115115
<ebean.annotation.version>8.2</ebean.annotation.version>
116-
<flyway.version>9.1.2</flyway.version>
116+
<flyway.version>9.1.6</flyway.version>
117117
<guava.version>31.1-jre</guava.version>
118118
<guice.version>5.1.0</guice.version>
119-
<hamcrest.version>2.0.0.0</hamcrest.version>
120-
<hikari.version>2.5.1</hikari.version>
121-
<fastutil.version>8.3.1</fastutil.version>
119+
<hamcrest.version>2.2</hamcrest.version>
120+
<hikari.version>5.0.1</hikari.version>
121+
<fastutil.version>8.5.8</fastutil.version>
122122
<h2.version>2.1.214</h2.version>
123-
<jackson.version>2.9.8</jackson.version>
124-
<javassist.version>3.22.0-GA</javassist.version>
125-
<javassist.maven.core.version>0.2.1</javassist.maven.core.version>
123+
<jackson.version>2.13.3</jackson.version>
124+
<javassist.version>3.29.1-GA</javassist.version>
125+
<javassist.maven.core.version>0.2.6</javassist.maven.core.version>
126126
<javax.persistence.version>1.0.2</javax.persistence.version>
127127
<javax.xml.version>2.3.1</javax.xml.version>
128128
<jsr305.version>3.0.2</jsr305.version>
129-
<junit.version>4.12</junit.version>
130-
<junitparams.version>1.0.5</junitparams.version>
131-
<leveldb.version>0.7</leveldb.version>
129+
<junit.version>4.13.2</junit.version>
130+
<junitparams.version>1.1.1</junitparams.version>
131+
<leveldb.version>0.12</leveldb.version>
132132
<leveldb.jni.version>1.8</leveldb.jni.version>
133-
<logback.version>1.2.3</logback.version>
134-
<logback.steno.version>1.18.0</logback.steno.version>
135-
<log4j.over.slf4j.version>1.7.22</log4j.over.slf4j.version>
136-
<metrics.client.version>0.11.3</metrics.client.version>
137-
<metrics.client.incubator.version>0.11.2</metrics.client.incubator.version>
138-
<metrics.jvm.extra.version>0.11.2</metrics.jvm.extra.version>
139-
<metrics.http.extra.version>0.11.2</metrics.http.extra.version>
133+
<logback.version>1.2.11</logback.version>
134+
<logback.steno.version>1.19.0</logback.steno.version>
135+
<log4j.over.slf4j.version>1.7.36</log4j.over.slf4j.version>
136+
<metrics.client.version>0.12.1</metrics.client.version>
137+
<metrics.client.incubator.version>0.12.1</metrics.client.incubator.version>
138+
<metrics.jvm.extra.version>0.12.1</metrics.jvm.extra.version>
139+
<metrics.http.extra.version>0.12.1</metrics.http.extra.version>
140140
<metrics.aggregator.protocol.version>1.0.10</metrics.aggregator.protocol.version>
141-
<mockito.version>4.6.1</mockito.version>
141+
<mockito.version>4.7.0</mockito.version>
142142
<netty.version>4.0.56.Final</netty.version>
143143
<netty.all.version>4.0.21.Final</netty.all.version>
144144
<ning.http.client.version>1.9.31</ning.http.client.version>
145145
<oval.version>3.2.1</oval.version>
146-
<play.ws.version>1.1.2</play.ws.version>
147-
<postgresql.version>9.4-1202-jdbc42</postgresql.version>
148-
<protobuf.version>3.10.0</protobuf.version>
149-
<reflections.version>0.9.10</reflections.version>
150-
<scala.version>2.12</scala.version>
151-
<scala.java.compat.version>0.8.0</scala.java.compat.version>
152-
<scala.library.version>2.12.3</scala.library.version>
146+
<play.ws.version>2.1.10</play.ws.version>
147+
<postgresql.version>42.4.2</postgresql.version>
148+
<protobuf.version>3.21.5</protobuf.version>
149+
<reflections.version>0.10.2</reflections.version>
150+
<scala.version>2.13</scala.version>
151+
<scala.library.version>2.13.8</scala.library.version>
153152
<signalfx.protoc.version>0.0.23</signalfx.protoc.version>
154-
<slf4j.version>1.7.30</slf4j.version>
155-
<spotbugs.annotations.version>3.1.12</spotbugs.annotations.version>
156-
<typesafe.config.version>1.3.1</typesafe.config.version>
157-
<typesafe.ssl.config.version>0.2.2</typesafe.ssl.config.version>
153+
<slf4j.version>1.7.36</slf4j.version>
154+
<spotbugs.annotations.version>4.7.1</spotbugs.annotations.version>
155+
<typesafe.config.version>1.4.2</typesafe.config.version>
156+
<typesafe.ssl.config.version>0.6.1</typesafe.ssl.config.version>
158157
<wiremock.version>2.27.2</wiremock.version>
159158

160159
<!--Plugin versions-->
@@ -528,21 +527,6 @@
528527
<skip>${skipDockerBuild}</skip>
529528
</configuration>
530529
</plugin>
531-
<!-- TODO: Remove me once we deprecate GHA -->
532-
<plugin>
533-
<groupId>org.codehaus.mojo</groupId>
534-
<artifactId>versions-maven-plugin</artifactId>
535-
<version>${maven.versions.plugin.version}</version>
536-
<executions>
537-
<execution>
538-
<id>default-display-dependency-updates</id>
539-
<goals>
540-
<goal>display-dependency-updates</goal>
541-
</goals>
542-
<phase>ignored</phase>
543-
</execution>
544-
</executions>
545-
</plugin>
546530
<plugin>
547531
<groupId>org.apache.maven.plugins</groupId>
548532
<artifactId>maven-compiler-plugin</artifactId>
@@ -874,11 +858,6 @@
874858
<artifactId>scala-library</artifactId>
875859
<version>${scala.library.version}</version>
876860
</dependency>
877-
<dependency>
878-
<groupId>org.scala-lang.modules</groupId>
879-
<artifactId>scala-java8-compat_${scala.version}</artifactId>
880-
<version>${scala.java.compat.version}</version>
881-
</dependency>
882861
<dependency>
883862
<groupId>commons-codec</groupId>
884863
<artifactId>commons-codec</artifactId>
@@ -927,12 +906,6 @@
927906
<version>${aspectjrt.version}</version>
928907
<scope>runtime</scope>
929908
</dependency>
930-
<dependency>
931-
<groupId>cglib</groupId>
932-
<artifactId>cglib</artifactId>
933-
<version>${cglib.version}</version>
934-
<scope>runtime</scope>
935-
</dependency>
936909
<!-- Aggregator Protocol -->
937910
<dependency>
938911
<groupId>com.arpnetworking.metrics</groupId>
@@ -951,6 +924,15 @@
951924
<artifactId>junit</artifactId>
952925
<version>${junit.version}</version>
953926
<scope>test</scope>
927+
<exclusions>
928+
<!-- TODO(ville): Remove once JUnit depends on modern hamcrest; see:
929+
http://hamcrest.org/JavaHamcrest/distributables
930+
-->
931+
<exclusion>
932+
<groupId>org.hamcrest</groupId>
933+
<artifactId>hamcrest-core</artifactId>
934+
</exclusion>
935+
</exclusions>
954936
</dependency>
955937
<dependency>
956938
<groupId>org.mockito</groupId>
@@ -960,7 +942,7 @@
960942
</dependency>
961943
<dependency>
962944
<groupId>org.hamcrest</groupId>
963-
<artifactId>java-hamcrest</artifactId>
945+
<artifactId>hamcrest</artifactId>
964946
<version>${hamcrest.version}</version>
965947
<scope>test</scope>
966948
</dependency>
@@ -991,7 +973,7 @@
991973
<dependency>
992974
<groupId>org.awaitility</groupId>
993975
<artifactId>awaitility</artifactId>
994-
<version>4.0.2</version>
976+
<version>${awaitility.version}</version>
995977
<scope>test</scope>
996978
</dependency>
997979
</dependencies>

‎src/main/docker/Dockerfile‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,5 @@ CMD [ \
6464
"-XX:+UseStringDeduplication", \
6565
"-XX:+UseG1GC", \
6666
"-Duser.timezone=UTC", \
67-
"--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED", \
68-
"--add-opens=java.base/java.lang=ALL-UNNAMED", \
69-
"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED", \
70-
"--add-opens=java.base/java.io=ALL-UNNAMED", \
71-
"--add-opens=java.base/java.security=ALL-UNNAMED", \
72-
"--add-opens=java.base/java.util=ALL-UNNAMED", \
73-
"--add-opens=java.management/javax.management=ALL-UNNAMED", \
74-
"--add-opens=java.naming/javax.naming=ALL-UNNAMED", \
7567
"--", \
7668
"${CAGG_CONFIG}" ]

‎src/main/java/com/arpnetworking/clusteraggregator/ClusterStatusCache.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@
3838
import com.google.common.collect.Multimaps;
3939
import com.google.common.collect.Sets;
4040
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
41-
import scala.compat.java8.OptionConverters;
4241
import scala.concurrent.duration.Duration;
4342
import scala.concurrent.duration.FiniteDuration;
43+
import scala.jdk.javaapi.CollectionConverters;
44+
import scala.jdk.javaapi.OptionConverters;
4445

4546
import java.io.Serializable;
4647
import java.util.Collection;
@@ -98,7 +99,7 @@ public void preStart() {
9899
final Scheduler scheduler = getContext()
99100
.system()
100101
.scheduler();
101-
_pollTimer = scheduler.schedule(
102+
_pollTimer = scheduler.scheduleAtFixedRate(
102103
Duration.apply(0, TimeUnit.SECONDS),
103104
Duration.apply(_pollInterval.toMillis(), TimeUnit.MILLISECONDS),
104105
getSelf(),
@@ -120,7 +121,7 @@ public Receive createReceive() {
120121
.match(ClusterEvent.CurrentClusterState.class, clusterState -> {
121122
_clusterState = Optional.of(clusterState);
122123
try (Metrics metrics = _metricsFactory.create()) {
123-
metrics.setGauge("akka/members_count", clusterState.members().size());
124+
metrics.setGauge("akka/members_count", CollectionConverters.asJava(clusterState.members()).size());
124125
if (_cluster.selfAddress().equals(clusterState.getLeader())) {
125126
metrics.setGauge("akka/is_leader", 1);
126127
} else {

‎src/main/java/com/arpnetworking/clusteraggregator/GuiceModule.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@
2121
import akka.cluster.Cluster;
2222
import akka.cluster.sharding.ClusterSharding;
2323
import akka.cluster.sharding.ClusterShardingSettings;
24-
import akka.http.javadsl.ConnectHttp;
2524
import akka.http.javadsl.Http;
2625
import akka.http.javadsl.IncomingConnection;
2726
import akka.http.javadsl.ServerBinding;
2827
import akka.routing.DefaultResizer;
2928
import akka.routing.RoundRobinPool;
30-
import akka.stream.ActorMaterializer;
3129
import akka.stream.Materializer;
30+
import akka.stream.javadsl.Source;
3231
import com.arpnetworking.clusteraggregator.aggregation.AggMessageExtractor;
3332
import com.arpnetworking.clusteraggregator.aggregation.AggregationRouter;
3433
import com.arpnetworking.clusteraggregator.client.AggClientServer;
@@ -186,6 +185,7 @@ private MetricsFactory provideMetricsFactory() throws URISyntaxException {
186185
@Singleton
187186
@SuppressFBWarnings("UPM_UNCALLED_PRIVATE_METHOD") // Invoked reflectively by Guice
188187
private ActorSystem provideActorSystem(@Named("akka-config") final Config akkaConfig) {
188+
System.out.println(akkaConfig);
189189
return ActorSystem.create("Metrics", akkaConfig);
190190
}
191191

@@ -269,12 +269,12 @@ private java.util.concurrent.CompletionStage<akka.http.javadsl.ServerBinding> pr
269269
final ActorSystem system,
270270
final Routes routes) {
271271
// Create and bind Http server
272-
final Materializer materializer = ActorMaterializer.create(system);
272+
final Materializer materializer = Materializer.createMaterializer(system);
273273
final Http http = Http.get(system);
274-
final akka.stream.javadsl.Source<IncomingConnection, CompletionStage<ServerBinding>> binding = http.bind(
275-
ConnectHttp.toHost(
274+
final Source<IncomingConnection, CompletionStage<ServerBinding>> binding = http.newServerAt(
276275
_configuration.getHttpHost(),
277-
_configuration.getHttpPort()));
276+
_configuration.getHttpPort())
277+
.connectionSource();
278278
return binding.to(
279279
akka.stream.javadsl.Sink.foreach(
280280
connection -> connection.handleWithAsyncHandler(routes, materializer)))

‎src/main/java/com/arpnetworking/clusteraggregator/JvmMetricsCollector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void preStart() {
5656
.setMessage("Starting JVM metrics collector actor.")
5757
.addData("actor", self().toString())
5858
.log();
59-
_cancellable = _scheduler.schedule(
59+
_cancellable = _scheduler.scheduleAtFixedRate(
6060
INITIAL_DELAY,
6161
_interval,
6262
self(),

0 commit comments

Comments
 (0)