progress

Signed-off-by: Adrian Cole <adrian@tetrate.io>

dropwizard/pom.xml

@@ -36,5 +36,10 @@
       <artifactId>zipkin-client</artifactId>
       <version>${dropwizard-zipkin.version}</version>
     </dependency>
+    <!-- Dropwizard uses ZipkinSpanHandler which has a dependency on this. -->
+    <dependency>
+      <groupId>io.zipkin.reporter2</groupId>
+      <artifactId>zipkin-reporter</artifactId>
+    </dependency>
   </dependencies>
 </project>

jersey2-cassandra3/pom.xml

@@ -21,15 +21,14 @@
     <maven.compiler.release>8</maven.compiler.release>
 
     <!-- Use a container that doesn't use Netty. -->
-    <jersey.version>2.33</jersey.version>
-    <spring.version>4.3.29.RELEASE</spring.version>
+    <jersey.version>2.41</jersey.version>
+    <spring.version>4.3.30.RELEASE</spring.version>
 
-    <cassandra.version>3.11.9</cassandra.version>
-    <!-- Use the cassandra-driver-core version bundled in cassandra to not conflict with Netty. -->
-    <cassandra-driver-core.version>3.0.1</cassandra-driver-core.version>
+    <cassandra.version>4.1.3</cassandra.version>
+    <cassandra-driver-core.version>3.11.2</cassandra-driver-core.version>
 
     <!-- https://github.com/openzipkin/brave-cassandra -->
-    <brave-cassandra.version>0.11.1</brave-cassandra.version>
+    <brave-cassandra.version>0.13.0</brave-cassandra.version>
   </properties>
 
   <dependencies>

jersey2-cassandra3/src/main/java/brave/example/Frontend.java

@@ -53,7 +53,7 @@ public static void main(String[] args) throws Exception {
     String contactPointString = System.getProperty("backend.contactPoint", "127.0.0.1:9042");
     HostAndPort parsed = HostAndPort.fromString(contactPointString).withDefaultPort(9042);
     Cluster cluster = Cluster.builder()
-        .addContactPointsWithPorts(new InetSocketAddress(parsed.getHostText(), parsed.getPort()))
+        .addContactPointsWithPorts(new InetSocketAddress(parsed.getHost(), parsed.getPort()))
         .build();
     Runtime.getRuntime().addShutdownHook(new Thread(cluster::close));
 

jersey2-cassandra3/src/main/resources/cassandra.yaml

@@ -9,7 +9,6 @@ storage_port: 7000
 native_transport_port: 9042
 listen_address: 127.0.0.1
 start_native_transport: true
-start_rpc: false
 seed_provider:
   - class_name: org.apache.cassandra.locator.SimpleSeedProvider
     parameters:

parent-pom.xml

@@ -27,28 +27,13 @@
     </license>
   </licenses>
 
-  <repositories>
-    <repository>
-      <id>sonatype.snapshots</id>
-      <name>Sonatype Snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
     <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <brave.version>5.18.0-SNAPSHOT</brave.version>
-    <zipkin-reporter.version>3.0.0-SNAPSHOT</zipkin-reporter.version>
+    <brave.version>5.18.0</brave.version>
 
     <!-- The JRE used in Docker images can be higher than ${maven.compiler.release}. -->
     <jre.version>SET MANUALLY IN PROJECTS</jre.version>
@@ -68,13 +53,6 @@
   <!-- Only declare Brave dependencies here as we want projects to control their own settings -->
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>io.zipkin.reporter2</groupId>
-        <artifactId>zipkin-reporter-bom</artifactId>
-        <version>${zipkin-reporter.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>io.zipkin.brave</groupId>
         <artifactId>brave-bom</artifactId>