update copyright year and dependencies

Signed-off-by: Sergei Malafeev <sergeymalafeev@gmail.com>
opentracing-contrib · Feb 4, 2019 · 09f346a · 09f346a
1 parent 4e67044
commit 09f346a
Show file tree

Hide file tree

Showing 17 changed files with 57 additions and 61 deletions.
diff --git a/.settings.xml b/.settings.xml
@@ -1,8 +1,7 @@
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017-2018 The OpenTracing Authors
+    Copyright 2017-2019 The OpenTracing Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -16,29 +15,29 @@
 
 -->
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
                           http://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <servers>
-        <server>
-            <id>sonatype</id>
-            <username>${env.SONATYPE_USER}</username>
-            <password>${env.SONATYPE_PASSWORD}</password>
-        </server>
-        <server>
-            <id>bintray</id>
-            <username>${env.BINTRAY_USER}</username>
-            <password>${env.BINTRAY_KEY}</password>
-        </server>
-        <server>
-            <id>jfrog-snapshots</id>
-            <username>${env.BINTRAY_USER}</username>
-            <password>${env.BINTRAY_KEY}</password>
-        </server>
-        <server>
-            <id>github.com</id>
-            <username>${env.GH_USER}</username>
-            <password>${env.GH_TOKEN}</password>
-        </server>
-    </servers>
+  <servers>
+    <server>
+      <id>sonatype</id>
+      <username>${env.SONATYPE_USER}</username>
+      <password>${env.SONATYPE_PASSWORD}</password>
+    </server>
+    <server>
+      <id>bintray</id>
+      <username>${env.BINTRAY_USER}</username>
+      <password>${env.BINTRAY_KEY}</password>
+    </server>
+    <server>
+      <id>jfrog-snapshots</id>
+      <username>${env.BINTRAY_USER}</username>
+      <password>${env.BINTRAY_KEY}</password>
+    </server>
+    <server>
+      <id>github.com</id>
+      <username>${env.GH_USER}</username>
+      <password>${env.GH_TOKEN}</password>
+    </server>
+  </servers>
 </settings>
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017-2018 The OpenTracing Authors
+    Copyright 2017-2019 The OpenTracing Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -14,7 +14,9 @@
     the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.opentracing.contrib</groupId>
   <artifactId>opentracing-cassandra-driver</artifactId>
@@ -23,7 +25,7 @@
   <name>${project.groupId}:${project.artifactId}</name>
   <description>OpenTracing Instrumentation for Cassandra Driver</description>
   <url>https://github.com/opentracing-contrib/java-cassandra-driver</url>
-  <inceptionYear>2017-2018</inceptionYear>
+  <inceptionYear>2017-2019</inceptionYear>
 
   <scm>
     <url>http://github.com/opentracing-contrib/java-cassandra-driver</url>
@@ -63,7 +65,7 @@
     <opentracing.version>0.31.0</opentracing.version>
     <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
     <jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
-    <cassandra.version>3.5.1</cassandra.version>
+    <cassandra.version>3.6.0</cassandra.version>
   </properties>
 
   <dependencies>
@@ -109,7 +111,7 @@
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <version>3.1.2</version>
+      <version>3.1.6</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/src/main/java/io/opentracing/contrib/cassandra/TracingCluster.java b/src/main/java/io/opentracing/contrib/cassandra/TracingCluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -22,7 +22,6 @@
 import io.opentracing.contrib.cassandra.nameprovider.CustomStringSpanName;
 import io.opentracing.contrib.cassandra.nameprovider.QuerySpanNameProvider;
 import io.opentracing.util.GlobalTracer;
-
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -52,8 +51,8 @@ public TracingCluster(Initializer initializer, Tracer tracer,
   }
 
   public TracingCluster(Initializer initializer, Tracer tracer,
-                        QuerySpanNameProvider querySpanNameProvider,
-                        ExecutorService executorService) {
+      QuerySpanNameProvider querySpanNameProvider,
+      ExecutorService executorService) {
     super(initializer);
     this.tracer = tracer;
     this.querySpanNameProvider = querySpanNameProvider;

diff --git a/src/main/java/io/opentracing/contrib/cassandra/TracingSession.java b/src/main/java/io/opentracing/contrib/cassandra/TracingSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -43,8 +43,7 @@
 import java.util.concurrent.Executors;
 
 /**
- * Package private decorator for {@link Session}
- * Instantiated only by TracingCluster
+ * Package private decorator for {@link Session} Instantiated only by TracingCluster
  */
 class TracingSession implements Session {
 
@@ -68,7 +67,8 @@ class TracingSession implements Session {
     this.executorService = Executors.newCachedThreadPool();
   }
 
-  TracingSession(Session session, Tracer tracer, QuerySpanNameProvider querySpanNameProvider, ExecutorService executorService) {
+  TracingSession(Session session, Tracer tracer, QuerySpanNameProvider querySpanNameProvider,
+      ExecutorService executorService) {
     this.session = session;
     this.tracer = tracer;
     this.querySpanNameProvider = querySpanNameProvider;

diff --git a/src/main/java/io/opentracing/contrib/cassandra/nameprovider/CustomStringSpanName.java b/src/main/java/io/opentracing/contrib/cassandra/nameprovider/CustomStringSpanName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -14,8 +14,7 @@
 package io.opentracing.contrib.cassandra.nameprovider;
 
 /**
- * @author Jordan J Lopez
- * Returns a predifined string for every span
+ * @author Jordan J Lopez Returns a predifined string for every span
  */
 public class CustomStringSpanName implements QuerySpanNameProvider {
 

diff --git a/src/main/java/io/opentracing/contrib/cassandra/nameprovider/FullQuerySpanName.java b/src/main/java/io/opentracing/contrib/cassandra/nameprovider/FullQuerySpanName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -14,8 +14,7 @@
 package io.opentracing.contrib.cassandra.nameprovider;
 
 /**
- * @author Jordan J Lopez
- * Returns the full query as the span name
+ * @author Jordan J Lopez Returns the full query as the span name
  */
 public class FullQuerySpanName implements QuerySpanNameProvider {
 

diff --git a/src/main/java/io/opentracing/contrib/cassandra/nameprovider/PrefixedFullQuerySpanName.java b/src/main/java/io/opentracing/contrib/cassandra/nameprovider/PrefixedFullQuerySpanName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -14,8 +14,7 @@
 package io.opentracing.contrib.cassandra.nameprovider;
 
 /**
- * @author Jordan J Lopez
- * Returns a custom prefix and the full query as the span name
+ * @author Jordan J Lopez Returns a custom prefix and the full query as the span name
  */
 public class PrefixedFullQuerySpanName implements QuerySpanNameProvider {
 

diff --git a/src/main/java/io/opentracing/contrib/cassandra/nameprovider/QueryMethodTableSpanName.java b/src/main/java/io/opentracing/contrib/cassandra/nameprovider/QueryMethodTableSpanName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -17,9 +17,8 @@
 import java.util.regex.Pattern;
 
 /**
- * @author Jordan J Lopez
- * Returns formatted string wtih extracted Cassandra query method and target entity as span name
- * Target entity can include keyspace, table, index, view, or none
+ * @author Jordan J Lopez Returns formatted string wtih extracted Cassandra query method and target
+ * entity as span name Target entity can include keyspace, table, index, view, or none
  */
 public class QueryMethodTableSpanName implements QuerySpanNameProvider {
 

diff --git a/src/main/java/io/opentracing/contrib/cassandra/nameprovider/QuerySpanNameProvider.java b/src/main/java/io/opentracing/contrib/cassandra/nameprovider/QuerySpanNameProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at

diff --git a/src/test/java/io/opentracing/contrib/cassandra/CassandraMappingTest.java b/src/test/java/io/opentracing/contrib/cassandra/CassandraMappingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at

diff --git a/src/test/java/io/opentracing/contrib/cassandra/CassandraTest.java b/src/test/java/io/opentracing/contrib/cassandra/CassandraTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at

diff --git a/src/test/java/io/opentracing/contrib/cassandra/TestUtil.java b/src/test/java/io/opentracing/contrib/cassandra/TestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at

diff --git a/src/test/java/io/opentracing/contrib/cassandra/nameprovider/CustomStringSpanNameTest.java b/src/test/java/io/opentracing/contrib/cassandra/nameprovider/CustomStringSpanNameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at

diff --git a/src/test/java/io/opentracing/contrib/cassandra/nameprovider/FullQuerySpanNameTest.java b/src/test/java/io/opentracing/contrib/cassandra/nameprovider/FullQuerySpanNameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at

diff --git a/...est/java/io/opentracing/contrib/cassandra/nameprovider/PrefixedFullQuerySpanNameTest.java b/...est/java/io/opentracing/contrib/cassandra/nameprovider/PrefixedFullQuerySpanNameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at

diff --git a/...test/java/io/opentracing/contrib/cassandra/nameprovider/QueryMethodTableSpanNameTest.java b/...test/java/io/opentracing/contrib/cassandra/nameprovider/QueryMethodTableSpanNameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at

diff --git a/travis/publish.sh b/travis/publish.sh
@@ -1,5 +1,5 @@
 #
-# Copyright 2017-2018 The OpenTracing Authors
+# Copyright 2017-2019 The OpenTracing Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at