Merge the changes we did for TS 1.3 into dpclient branch, before merging back to develop.

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "tools"]
 	path = tools
 	url = https://github.com/basho/riak-client-tools/
+[submodule "riak_pb"]
+	path = riak_pb
+	url = https://github.com/basho/riak_pb.git

Makefile

@@ -0,0 +1,23 @@
+.PHONY: compile test unit-test integration-test integration-test-timeseries protogen
+
+RIAK_PORT ?= 8087
+
+compile:
+	mvn clean compile
+
+test: unit-test integration-test
+
+unit-test:
+	mvn test
+
+integration-test:
+	mvn -Pitest,default -Dcom.basho.riak.2i=true -Dcom.basho.riak.yokozuna=true -Dcom.basho.riak.buckettype=true -Dcom.basho.riak.crdt=true -Dcom.basho.riak.lifecycle=true -Dcom.basho.riak.pbcport=$(RIAK_PORT) verify
+
+integration-test-timeseries:
+	mvn -Pitest,default -Dcom.basho.riak.buckettype=true -Dcom.basho.riak.crdt=true -Dcom.basho.riak.lifecycle=true -Dcom.basho.riak.timeseries=true -Dcom.basho.riak.pbcport=$(RIAK_PORT) verify
+
+integration-test-security:
+	mvn -Pitest,default -Dcom.basho.riak.security=true -Dcom.basho.riak.security.clientcert=true -Dcom.basho.riak.pbcport=$(RIAK_PORT) test-compile failsafe:integration-test
+
+protogen:
+	mvn -Pprotobuf-generate generate-sources

RELNOTES.md

@@ -1,6 +1,13 @@
 Release Notes
 =============
 
+### 2.0.6
+Following issues / PRs addressed:
+ * [Removed riak_pb external dependency](https://github.com/basho/riak-java-client/pull/615)
+ * [Fixed connection handling deadlock issue](https://github.com/basho/riak-java-client/pull/598)
+ * [Added TimeSeries Create Table command](https://github.com/basho/riak-java-client/pull/602/)
+ * [Added Erlang Term Serialization support for some Time Series operations](https://github.com/basho/riak-java-client/pull/611/)
+
 ### 2.0.5
 Following issues / PRs addressed:
  * [Fix DNS cache issue when using the client with ELB](https://github.com/basho/riak-java-client/pull/573)

pom.xml

@@ -3,10 +3,13 @@
     <groupId>com.basho.riak</groupId>
     <artifactId>riak-client</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.6-SNAPSHOT</version>
+    <version>2.0.7-SNAPSHOT</version>
     <name>Riak Client for Java</name>
     <description>Java client for Riak 2.0</description>
     <url>https://github.com/basho/riak-java-client</url>
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
 
     <licenses>
         <license>
@@ -42,6 +45,12 @@
             <organization>Basho Technologies, Inc</organization>
             <organizationUrl>http://www.basho.com</organizationUrl>
         </developer>
+        <developer>
+            <name>Luke Bakken</name>
+            <email>lbakken@basho.com</email>
+            <organization>Basho Technologies, Inc</organization>
+            <organizationUrl>http://www.basho.com</organizationUrl>
+        </developer>
     </developers>
 
     <scm>
@@ -103,7 +112,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>2.16</version>
+                        <version>2.19.1</version>
                         <executions>
                             <execution>
                                 <goals>
@@ -129,7 +138,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.4</version>
+                        <version>2.6</version>
                         <configuration>
                             <descriptors>
                                 <descriptor>src/main/assembly/jar-with-dependencies.xml</descriptor>
@@ -191,47 +200,92 @@
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
                             <additionalparam>-Xdoclint:none</additionalparam>
+                            <excludePackageNames>com.basho.riak.protobuf.util</excludePackageNames>
                         </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>protobuf-generate</id>
+            <activation>
+                <property>
+                    <name>protobuf-generate</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.webguys</groupId>
+                        <artifactId>string-template-maven-plugin</artifactId>
+                        <version>1.1</version>
+                        <configuration>
+                            <templates>
+                                <template>
+                                    <directory>${basedir}/src/main/resources</directory>
+                                    <name>RiakMessageCodes</name>
+                                    <target>${basedir}/src/main/java/com/basho/riak/protobuf/RiakMessageCodes.java</target>
+                                    <controller>
+                                        <className>com.basho.riak.protobuf.util.TemplateController</className>
+                                        <method>getProperties</method>
+                                    </controller>
+                                </template>
+                            </templates>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>render</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.twdata.maven</groupId>
+                                <artifactId>mojo-executor</artifactId>
+                                <version>2.2.0</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>com.github.igor-petruk.protobuf</groupId>
+                        <artifactId>protobuf-maven-plugin</artifactId>
+                        <version>0.6.5</version>
+                        <configuration>
+                            <cleanOutputFolder>false</cleanOutputFolder>
+                            <inputDirectories>
+                                <directory>${basedir}/riak_pb/src</directory>
+                            </inputDirectories>
+                            <outputDirectory>${project.build.sourceDirectory}</outputDirectory>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>versions-maven</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>versions-maven-plugin</artifactId>
+                        <version>2.2</version>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <shadedArtifactAttached>false</shadedArtifactAttached>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <artifactSet>
-                                <includes>
-                                    <include>com.google.protobuf:protobuf-java</include>
-                                    <include>com.basho.riak.protobuf:riak-pb</include>
-                                </includes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>com.google.protobuf</pattern>
-                                    <shadedPattern>shaded.com.google.protobuf</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.basho.riak.protobuf</pattern>
-                                    <shadedPattern>shaded.com.basho.riak.protobuf</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <artifactId>maven-release-plugin</artifactId>
                 <version>2.5.2</version>
@@ -258,18 +312,17 @@
                         </goals>
                     </execution>
                 </executions>
-
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.5.1</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
                     <compilerArgs>
-                      <arg>-Werror</arg>
-                      <arg>-Xlint:all</arg>
+                        <arg>-Werror</arg>
+                        <arg>-Xlint:all</arg>
                     </compilerArgs>
                 </configuration>
             </plugin>
@@ -310,15 +363,18 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>2.10.3</version>
+                <configuration>
+                    <excludePackageNames>com.basho.riak.protobuf.util</excludePackageNames>
+                </configuration>
             </plugin>
         </plugins>
     </build>
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.21</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
@@ -353,12 +409,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.2.2</version>
+            <version>2.7.3</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.2.2</version>
+            <version>2.7.3</version>
             <type>jar</type>
         </dependency>
         <dependency>
@@ -367,9 +423,19 @@
             <version>4.0.33.Final</version>
         </dependency>
         <dependency>
-            <groupId>com.basho.riak.protobuf</groupId>
-            <artifactId>riak-pb</artifactId>
-            <version>2.1.1.1-SNAPSHOT</version>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr-complete</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.erlang.otp</groupId>
+            <artifactId>jinterface</artifactId>
+            <version>1.5.6</version>
         </dependency>
     </dependencies>
 </project>

src/main/java/com/basho/riak/client/api/convert/reflection/ClassUtil.java

@@ -37,7 +37,7 @@ private ClassUtil() {}
      * @throws IllegalArgumentException if cannot set accessibility
      */
     public static <T extends Member> T checkAndFixAccess(T member) {
-         com.fasterxml.jackson.databind.util.ClassUtil.checkAndFixAccess(member);
+         com.fasterxml.jackson.databind.util.ClassUtil.checkAndFixAccess(member, false);
         return member;
     }