Skip to content

Commit

Permalink
Merge pull request #615 from basho/features/lrb/integrate-riak-pb
Browse files Browse the repository at this point in the history 
READY: Add riak_pb submodule
  • Loading branch information
@alexmoore
alexmoore committed Apr 25, 2016
2 parents dd4438d + 2961306 commit 7660892
Show file tree
Hide file tree
Showing 14 changed files with 74,056 additions and 47 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -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
15 changes: 15 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.PHONY: compile test unit-test integration-test protogen

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 verify

protogen:
mvn -Pprotobuf-generate generate-sources
153 changes: 107 additions & 46 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<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>
Expand Down Expand Up @@ -42,6 +45,12 @@
<organization>Basho Technologies, Inc</organization>
<organizationUrl>http://www.basho.com</organizationUrl>
</developer>
<developer>
<name>Luke Bakken</name>
<email>[email protected]</email>
<organization>Basho Technologies, Inc</organization>
<organizationUrl>http://www.basho.com</organizationUrl>
</developer>
</developers>

<scm>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -190,47 +199,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>
Expand All @@ -257,18 +311,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>
Expand Down Expand Up @@ -309,15 +362,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>
Expand Down Expand Up @@ -352,12 +408,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>
Expand All @@ -366,9 +422,14 @@
<version>4.0.33.Final</version>
</dependency>
<dependency>
<groupId>com.basho.riak.protobuf</groupId>
<artifactId>riak-pb</artifactId>
<version>2.1.1.0</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>
</dependencies>
</project>
1 change: 1 addition & 0 deletions riak_pb
Submodule riak_pb added at a18269
2 changes: 1 addition & 1 deletion src/main/java/com/basho/riak/client/api/convert/reflection/ClassUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Loading

0 comments on commit 7660892

Please sign in to comment.