Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Large part of Issue 113: Upgrade various dependencies

Also Regenerated the VProto as the new protobuf expects the generated message class to include a method called toBuilder.
  • Loading branch information...
commit 53a6c470ce9aad34f2cdb3ce5f6097de6ad8134e 1 parent d3f136a
Ismael Juma ijuma authored
20 .classpath
View
@@ -16,27 +16,27 @@
<classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/>
<classpathentry kind="lib" path="lib/commons-dbcp-1.2.2.jar"/>
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-io-1.3.2.jar"/>
- <classpathentry kind="lib" path="lib/commons-lang-2.1.jar"/>
<classpathentry kind="lib" path="lib/commons-logging.jar"/>
<classpathentry kind="lib" path="lib/commons-pool-1.4.jar"/>
<classpathentry kind="lib" path="lib/jdom.jar"/>
- <classpathentry kind="lib" path="lib/jetty-6.1.6rc0.jar"/>
- <classpathentry kind="lib" path="lib/jetty-util-6.1.6rc0.jar"/>
- <classpathentry kind="lib" path="lib/junit-4.1.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.13.jar"/>
<classpathentry kind="lib" path="lib/servlet-api.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.4.3.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-log4j12-1.4.3.jar"/>
- <classpathentry kind="lib" path="lib/velocity-1.5.jar"/>
<classpathentry kind="lib" path="lib/xerces.jar"/>
<classpathentry kind="lib" path="lib/colt-1.2.0.jar"/>
- <classpathentry kind="lib" path="lib/protobuf-java-2.0.3.jar"/>
<classpathentry kind="lib" path="lib/libthrift-20080411p1.jar"/>
<classpathentry kind="lib" path="lib/google-collect-snapshot-20090211.jar"/>
<classpathentry kind="lib" path="contrib/mongodb/lib/mongo-xjdm.jar"/>
<classpathentry kind="lib" path="lib/je-3.3.82.jar"/>
<classpathentry kind="lib" path="contrib/hadoop-store-builder/lib/commons-cli-2.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="contrib/hadoop-store-builder/lib/hadoop-0.18.1-core.jar"/>
+ <classpathentry kind="lib" path="lib/junit-4.6.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
+ <classpathentry kind="lib" path="lib/protobuf-java-2.1.0.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-6.1.18.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-util-6.1.18.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-api-1.5.6.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.6.jar"/>
+ <classpathentry kind="lib" path="lib/velocity-1.6.2.jar"/>
+ <classpathentry kind="lib" path="lib/commons-io-1.4.jar"/>
+ <classpathentry kind="lib" path="lib/commons-lang-2.4.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
BIN  lib/commons-io-1.3.2.jar
View
Binary file not shown
BIN  lib/commons-io-1.4.jar
View
Binary file not shown
BIN  lib/commons-lang-2.1.jar
View
Binary file not shown
BIN  lib/commons-lang-2.4.jar
View
Binary file not shown
BIN  lib/jetty-6.1.18.jar
View
Binary file not shown
BIN  lib/jetty-6.1.6rc0.jar
View
Binary file not shown
BIN  lib/jetty-util-6.1.18.jar
View
Binary file not shown
BIN  lib/jetty-util-6.1.6rc0.jar
View
Binary file not shown
BIN  lib/junit-4.1.jar
View
Binary file not shown
BIN  lib/junit-4.6.jar
View
Binary file not shown
BIN  lib/log4j-1.2.13.jar
View
Binary file not shown
BIN  lib/log4j-1.2.15.jar
View
Binary file not shown
BIN  lib/protobuf-java-2.0.3.jar
View
Binary file not shown
BIN  lib/protobuf-java-2.1.0.jar
View
Binary file not shown
BIN  lib/slf4j-api-1.4.3.jar
View
Binary file not shown
BIN  lib/slf4j-api-1.5.6.jar
View
Binary file not shown
BIN  lib/slf4j-log4j12-1.4.3.jar
View
Binary file not shown
BIN  lib/slf4j-log4j12-1.5.6.jar
View
Binary file not shown
BIN  lib/velocity-1.5.jar
View
Binary file not shown
BIN  lib/velocity-1.6.2.jar
View
Binary file not shown
10,342 src/java/voldemort/client/protocol/pb/VProto.java
View
5,224 additions, 5,118 deletions not shown
4 test/unit/voldemort/serialization/protobuf/ProtoBufSerializerTest.java
View
@@ -31,6 +31,10 @@ public Message getDefaultInstanceForType() {
throw new UnsupportedOperationException();
}
+ public com.google.protobuf.Message.Builder toBuilder() {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public byte[] toByteArray() {
return bytes;
Please sign in to comment.
Something went wrong with that request. Please try again.