Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update most dependencies.

  • Loading branch information...
commit 076b09b4ceee3c64e7fec85822dfdebbf3c03c4b 1 parent 00d40cf
@tsuna tsuna authored
Showing with 99 additions and 45 deletions.
  1. +4 −2 Makefile.am
  2. +14 −6 pom.xml.in
  3. +1 −0  third_party/guava/guava-13.0.1.jar.md5
  4. +2 −2 third_party/guava/include.mk
  5. +1 −0  third_party/hamcrest/hamcrest-core-1.3.jar.md5
  6. +23 −0 third_party/hamcrest/include.mk
  7. +3 −1 third_party/include.mk
  8. +3 −3 third_party/javassist/include.mk
  9. +1 −0  third_party/javassist/javassist-3.17.1-GA.jar.md5
  10. +2 −2 third_party/logback/include.mk
  11. +0 −1  third_party/logback/logback-classic-0.9.24.jar.md5
  12. +1 −0  third_party/logback/logback-classic-1.0.9.jar.md5
  13. +0 −1  third_party/logback/logback-core-0.9.24.jar.md5
  14. +1 −0  third_party/logback/logback-core-1.0.9.jar.md5
  15. +3 −3 third_party/mockito/include.mk
  16. +0 −1  third_party/mockito/mockito-1.8.5.jar.md5
  17. +1 −0  third_party/mockito/mockito-core-1.9.5.jar.md5
  18. +3 −3 third_party/netty/include.mk
  19. +0 −1  third_party/netty/netty-3.5.2.Final.jar.md5
  20. +1 −0  third_party/netty/netty-3.6.2.Final.jar.md5
  21. +23 −0 third_party/objenesis/include.mk
  22. +1 −0  third_party/objenesis/objenesis-1.3.jar.md5
  23. +2 −2 third_party/powermock/include.mk
  24. +0 −1  third_party/powermock/powermock-mockito-1.4.9.jar.md5
  25. +1 −0  third_party/powermock/powermock-mockito-1.5.jar.md5
  26. +3 −10 third_party/slf4j/include.mk
  27. +0 −1  third_party/slf4j/jcl-over-slf4j-1.6.1.jar.md5
  28. +0 −1  third_party/slf4j/log4j-over-slf4j-1.6.1.jar.md5
  29. +1 −0  third_party/slf4j/log4j-over-slf4j-1.7.2.jar.md5
  30. +0 −1  third_party/slf4j/slf4j-api-1.6.1.jar.md5
  31. +1 −0  third_party/slf4j/slf4j-api-1.7.2.jar.md5
  32. +2 −2 third_party/zookeeper/include.mk
  33. +0 −1  third_party/zookeeper/zookeeper-3.3.1.jar.md5
  34. +1 −0  third_party/zookeeper/zookeeper-3.3.6.jar.md5
View
6 Makefile.am
@@ -81,7 +81,6 @@ tsdb_SRC := \
tsdb_DEPS = \
$(ASYNCHBASE) \
$(GUAVA) \
- $(JCL_OVER_SLF4J) \
$(LOG4J_OVER_SLF4J) \
$(LOGBACK_CLASSIC) \
$(LOGBACK_CORE) \
@@ -106,7 +105,9 @@ test_DEPS = \
$(tsdb_DEPS) \
$(JAVASSIST) \
$(JUNIT) \
+ $(HAMCREST) \
$(MOCKITO) \
+ $(OBJENESIS) \
$(POWERMOCK_MOCKITO) \
$(jar)
@@ -374,14 +375,15 @@ pom.xml: pom.xml.in Makefile
-e 's/@ASYNCHBASE_VERSION@/$(ASYNCHBASE_VERSION)/' \
-e 's/@GUAVA_VERSION@/$(GUAVA_VERSION)/' \
-e 's/@GWT_VERSION@/$(GWT_VERSION)/' \
+ -e 's/@HAMCREST_VERSION@/$(HAMCREST_VERSION)/' \
-e 's/@JAVASSIST_VERSION@/$(JAVASSIST_VERSION)/' \
- -e 's/@JCL_OVER_SLF4J_VERSION@/$(JCL_OVER_SLF4J_VERSION)/' \
-e 's/@JUNIT_VERSION@/$(JUNIT_VERSION)/' \
-e 's/@LOG4J_OVER_SLF4J_VERSION@/$(LOG4J_OVER_SLF4J_VERSION)/' \
-e 's/@LOGBACK_CLASSIC_VERSION@/$(LOGBACK_CLASSIC_VERSION)/' \
-e 's/@LOGBACK_CORE_VERSION@/$(LOGBACK_CORE_VERSION)/' \
-e 's/@MOCKITO_VERSION@/$(MOCKITO_VERSION)/' \
-e 's/@NETTY_VERSION@/$(NETTY_VERSION)/' \
+ -e 's/@OBJENESIS_VERSION@/$(OBJENESIS_VERSION)/' \
-e 's/@POWERMOCK_MOCKITO_VERSION@/$(POWERMOCK_MOCKITO_VERSION)/' \
-e 's/@SLF4J_API_VERSION@/$(SLF4J_API_VERSION)/' \
-e 's/@SUASYNC_VERSION@/$(SUASYNC_VERSION)/' \
View
20 pom.xml.in
@@ -303,12 +303,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>@JCL_OVER_SLF4J_VERSION@</version>
- </dependency>
-
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>@LOGBACK_CORE_VERSION@</version>
@@ -323,6 +317,13 @@
<!-- test dependencies -->
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>@HAMCREST_VERSION@</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>@JAVASSIST_VERSION@</version>
@@ -344,6 +345,13 @@
</dependency>
<dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>@OBJENESIS_VERSION@</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>@POWERMOCK_MOCKITO_VERSION@</version>
View
1  third_party/guava/guava-13.0.1.jar.md5
@@ -0,0 +1 @@
+539a72e3c7b7bd1b12b9cf7a567fb28a
View
4 third_party/guava/include.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2012 The OpenTSDB Authors.
+# Copyright (C) 2012-2013 The OpenTSDB Authors.
#
# This library is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.
-GUAVA_VERSION := 12.0
+GUAVA_VERSION := 13.0.1
GUAVA := third_party/guava/guava-$(GUAVA_VERSION).jar
GUAVA_BASE_URL := http://search.maven.org/remotecontent?filepath=com/google/guava/guava/$(GUAVA_VERSION)
View
1  third_party/hamcrest/hamcrest-core-1.3.jar.md5
@@ -0,0 +1 @@
+6393363b47ddcbba82321110c3e07519
View
23 third_party/hamcrest/include.mk
@@ -0,0 +1,23 @@
+# Copyright (C) 2013 The OpenTSDB Authors.
+#
+# This library is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+HAMCREST_VERSION := 1.3
+HAMCREST := third_party/hamcrest/hamcrest-core-$(HAMCREST_VERSION).jar
+HAMCREST_BASE_URL := http://search.maven.org/remotecontent?filepath=org/hamcrest/hamcrest-core/$(HAMCREST_VERSION)
+
+$(HAMCREST): $(HAMCREST).md5
+ set dummy "$(HAMCREST_BASE_URL)" "$(HAMCREST)"; shift; $(FETCH_DEPENDENCY)
+
+THIRD_PARTY += $(HAMCREST)
View
4 third_party/include.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 The OpenTSDB Authors.
+# Copyright (C) 2011-2013 The OpenTSDB Authors.
#
# This library is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
@@ -20,12 +20,14 @@ THIRD_PARTY =
include third_party/guava/include.mk
include third_party/gwt/include.mk
+include third_party/hamcrest/include.mk
include third_party/hbase/include.mk
include third_party/javassist/include.mk
include third_party/junit/include.mk
include third_party/logback/include.mk
include third_party/mockito/include.mk
include third_party/netty/include.mk
+include third_party/objenesis/include.mk
include third_party/powermock/include.mk
include third_party/slf4j/include.mk
include third_party/suasync/include.mk
View
6 third_party/javassist/include.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 The OpenTSDB Authors.
+# Copyright (C) 2011-2013 The OpenTSDB Authors.
#
# This library is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
@@ -13,9 +13,9 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.
-JAVASSIST_VERSION := 3.15.0-GA
+JAVASSIST_VERSION := 3.17.1-GA
JAVASSIST := third_party/javassist/javassist-$(JAVASSIST_VERSION).jar
-JAVASSIST_BASE_URL := $(OPENTSDB_THIRD_PARTY_BASE_URL)
+JAVASSIST_BASE_URL := http://search.maven.org/remotecontent?filepath=org/javassist/javassist/$(JAVASSIST_VERSION)
$(JAVASSIST): $(JAVASSIST).md5
set dummy "$(JAVASSIST_BASE_URL)" "$(JAVASSIST)"; shift; $(FETCH_DEPENDENCY)
View
1  third_party/javassist/javassist-3.17.1-GA.jar.md5
@@ -0,0 +1 @@
+d6a8586b96f0a0fb5f6100371759fa17
View
4 third_party/logback/include.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 The OpenTSDB Authors.
+# Copyright (C) 2011-2013 The OpenTSDB Authors.
#
# This library is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.
-LOGBACK_VERSION = 1.0.0
+LOGBACK_VERSION = 1.0.9
LOGBACK_CLASSIC_VERSION := $(LOGBACK_VERSION)
LOGBACK_CLASSIC := third_party/logback/logback-classic-$(LOGBACK_CLASSIC_VERSION).jar
View
1  third_party/logback/logback-classic-0.9.24.jar.md5
@@ -1 +0,0 @@
-a34f3c097b77e516c97922fd14220aa5
View
1  third_party/logback/logback-classic-1.0.9.jar.md5
@@ -0,0 +1 @@
+ca99e6b10e9b2f46f264afc5cf1c13e1
View
1  third_party/logback/logback-core-0.9.24.jar.md5
@@ -1 +0,0 @@
-1573e1452b3d89bc06fa4cbd5840276c
View
1  third_party/logback/logback-core-1.0.9.jar.md5
@@ -0,0 +1 @@
+d1647b6efc66bd38237e4d8c484aa7b4
View
6 third_party/mockito/include.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 The OpenTSDB Authors.
+# Copyright (C) 2011-2013 The OpenTSDB Authors.
#
# This library is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
@@ -13,8 +13,8 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.
-MOCKITO_VERSION := 1.9.0
-MOCKITO := third_party/mockito/mockito-$(MOCKITO_VERSION).jar
+MOCKITO_VERSION := 1.9.5
+MOCKITO := third_party/mockito/mockito-core-$(MOCKITO_VERSION).jar
MOCKITO_BASE_URL := $(OPENTSDB_THIRD_PARTY_BASE_URL)
$(MOCKITO): $(MOCKITO).md5
View
1  third_party/mockito/mockito-1.8.5.jar.md5
@@ -1 +0,0 @@
-f61b9a6feaebbfb93d299d54eccf27e9
View
1  third_party/mockito/mockito-core-1.9.5.jar.md5
@@ -0,0 +1 @@
+98f3076e2a691d1ac291624e5a46b80b
View
6 third_party/netty/include.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 The OpenTSDB Authors.
+# Copyright (C) 2011-2013 The OpenTSDB Authors.
#
# This library is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
@@ -13,8 +13,8 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.
-NETTY_MAJOR_VERSION = 3.5
-NETTY_VERSION := 3.5.9.Final
+NETTY_MAJOR_VERSION = 3.6
+NETTY_VERSION := 3.6.2.Final
NETTY := third_party/netty/netty-$(NETTY_VERSION).jar
NETTY_BASE_URL := $(OPENTSDB_THIRD_PARTY_BASE_URL)
View
1  third_party/netty/netty-3.5.2.Final.jar.md5
@@ -1 +0,0 @@
-68d02116cf9f3e66f49329fccdff4024
View
1  third_party/netty/netty-3.6.2.Final.jar.md5
@@ -0,0 +1 @@
+beb25141cab18d504b77914a1c3242cf
View
23 third_party/objenesis/include.mk
@@ -0,0 +1,23 @@
+# Copyright (C) 2013 The OpenTSDB Authors.
+#
+# This library is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+OBJENESIS_VERSION := 1.3
+OBJENESIS := third_party/objenesis/objenesis-$(OBJENESIS_VERSION).jar
+OBJENESIS_BASE_URL := http://search.maven.org/remotecontent?filepath=org/objenesis/objenesis/$(OBJENESIS_VERSION)
+
+$(OBJENESIS): $(OBJENESIS).md5
+ set dummy "$(OBJENESIS_BASE_URL)" "$(OBJENESIS)"; shift; $(FETCH_DEPENDENCY)
+
+THIRD_PARTY += $(OBJENESIS)
View
1  third_party/objenesis/objenesis-1.3.jar.md5
@@ -0,0 +1 @@
+2d649907bd6203f2661f70d430a6ade8
View
4 third_party/powermock/include.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 The OpenTSDB Authors.
+# Copyright (C) 2011-2013 The OpenTSDB Authors.
#
# This library is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.
-POWERMOCK_MOCKITO_VERSION := 1.4.10
+POWERMOCK_MOCKITO_VERSION := 1.5
POWERMOCK_MOCKITO := third_party/powermock/powermock-mockito-$(POWERMOCK_MOCKITO_VERSION).jar
POWERMOCK_MOCKITO_BASE_URL := $(OPENTSDB_THIRD_PARTY_BASE_URL)
View
1  third_party/powermock/powermock-mockito-1.4.9.jar.md5
@@ -1 +0,0 @@
-13a99cc9ea72ca8bdb7653d30e3b46cb
View
1  third_party/powermock/powermock-mockito-1.5.jar.md5
@@ -0,0 +1 @@
+da9e7012d0e13f90c71829f2ac7d5462
View
13 third_party/slf4j/include.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 The OpenTSDB Authors.
+# Copyright (C) 2011-2013 The OpenTSDB Authors.
#
# This library is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
@@ -13,14 +13,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.
-SLF4J_VERSION = 1.6.4
-
-JCL_OVER_SLF4J_VERSION := $(SLF4J_VERSION)
-JCL_OVER_SLF4J := third_party/slf4j/jcl-over-slf4j-$(JCL_OVER_SLF4J_VERSION).jar
-JCL_OVER_SLF4J_BASE_URL := $(OPENTSDB_THIRD_PARTY_BASE_URL)
-
-$(JCL_OVER_SLF4J): $(JCL_OVER_SLF4J).md5
- set dummy "$(JCL_OVER_SLF4J_BASE_URL)" "$(JCL_OVER_SLF4J)"; shift; $(FETCH_DEPENDENCY)
+SLF4J_VERSION = 1.7.2
LOG4J_OVER_SLF4J_VERSION := $(SLF4J_VERSION)
@@ -38,4 +31,4 @@ SLF4J_API_BASE_URL := $(OPENTSDB_THIRD_PARTY_BASE_URL)
$(SLF4J_API): $(SLF4J_API).md5
set dummy "$(SLF4J_API_BASE_URL)" "$(SLF4J_API)"; shift; $(FETCH_DEPENDENCY)
-THIRD_PARTY += $(JCL_OVER_SLF4J) $(LOG4J_OVER_SLF4J) $(SLF4J_API)
+THIRD_PARTY += $(LOG4J_OVER_SLF4J) $(SLF4J_API)
View
1  third_party/slf4j/jcl-over-slf4j-1.6.1.jar.md5
@@ -1 +0,0 @@
-75afbde767fe2f172baee4bf41c79616
View
1  third_party/slf4j/log4j-over-slf4j-1.6.1.jar.md5
@@ -1 +0,0 @@
-a4c7da78cd6e4d5faf56d92b52e19b06
View
1  third_party/slf4j/log4j-over-slf4j-1.7.2.jar.md5
@@ -0,0 +1 @@
+cbd407d8ff67a6d54fd233fc0e0d8228
View
1  third_party/slf4j/slf4j-api-1.6.1.jar.md5
@@ -1 +0,0 @@
-4d619911eb06809a9b924860161c6e18
View
1  third_party/slf4j/slf4j-api-1.7.2.jar.md5
@@ -0,0 +1 @@
+ebf348e2831a3b610860fa134ad6f67f
View
4 third_party/zookeeper/include.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 The OpenTSDB Authors.
+# Copyright (C) 2011-2013 The OpenTSDB Authors.
#
# This library is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.
-ZOOKEEPER_VERSION := 3.3.4
+ZOOKEEPER_VERSION := 3.3.6
ZOOKEEPER := third_party/zookeeper/zookeeper-$(ZOOKEEPER_VERSION).jar
ZOOKEEPER_BASE_URL := $(OPENTSDB_THIRD_PARTY_BASE_URL)
View
1  third_party/zookeeper/zookeeper-3.3.1.jar.md5
@@ -1 +0,0 @@
-ea821cfdc7a5f3be2ad30bcf407135e8
View
1  third_party/zookeeper/zookeeper-3.3.6.jar.md5
@@ -0,0 +1 @@
+02786e11c19d1671640992f1bda4a858
Please sign in to comment.
Something went wrong with that request. Please try again.