diff --git a/build/contrib/eclipse-plugin/hadoop-eclipse-plugin-2.7.4.jar b/build/contrib/eclipse-plugin/hadoop-eclipse-plugin-2.7.4.jar new file mode 100644 index 0000000..70d845a Binary files /dev/null and b/build/contrib/eclipse-plugin/hadoop-eclipse-plugin-2.7.4.jar differ diff --git a/ivy/libraries.properties b/ivy/libraries.properties index 7fee285..19bfbe6 100644 --- a/ivy/libraries.properties +++ b/ivy/libraries.properties @@ -14,7 +14,7 @@ #It drives ivy and the generation of a maven POM # This is the version of hadoop we are generating -hadoop.version=2.6.0 +hadoop.version=2.7.4 hadoop-gpl-compression.version=0.1.0 #These are the versions of our dependencies (in alphabetical order) @@ -29,7 +29,7 @@ checkstyle.version=4.2 commons-cli.version=1.2 commons-codec.version=1.4 -commons-collections.version=3.2.1 +commons-collections.version=3.2.2 commons-configuration.version=1.6 commons-daemon.version=1.0.13 commons-httpclient.version=3.0.1 @@ -39,7 +39,7 @@ commons-logging-api.version=1.0.4 commons-math.version=2.1 commons-el.version=1.0 commons-fileupload.version=1.2 -commons-io.version=2.1 +commons-io.version=2.4 commons-net.version=3.1 core.version=3.1.1 coreplugin.version=1.3.2 @@ -92,3 +92,5 @@ xerces.version=1.4.4 protobuf.version=2.5.0 guava.version=11.0.2 netty.version=3.6.2.Final + +htrace.version=3.1.0-incubating diff --git a/src/contrib/eclipse-plugin/build.xml b/src/contrib/eclipse-plugin/build.xml index cb10854..587d1b8 100644 --- a/src/contrib/eclipse-plugin/build.xml +++ b/src/contrib/eclipse-plugin/build.xml @@ -66,6 +66,7 @@ + + + + + + + @@ -151,6 +158,9 @@ lib/slf4j-api-${slf4j-api.version}.jar, lib/guava-${guava.version}.jar, lib/netty-${netty.version}.jar, + lib/servlet-api-${servlet-api.version}.jar, + lib/commons-io-${commons-io.version}.jar, + lib/commons-httpclient-${commons-httpclient.version}.jar, lib/htrace-core-${htrace.version}.jar"/> diff --git a/src/ivy/libraries.properties b/src/ivy/libraries.properties index aaabdce..15e9ea0 100644 --- a/src/ivy/libraries.properties +++ b/src/ivy/libraries.properties @@ -1,20 +1,5 @@ -# 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 -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#This properties file lists the versions of the various artifacts used by hadoop and components. -#It drives ivy and the generation of a maven POM - -# This is the version of hadoop we are generating -hadoop.version=2.6.0 +s is the version of hadoop we are generating +hadoop.version=2.7.4 hadoop-gpl-compression.version=0.1.0 #These are the versions of our dependencies (in alphabetical order) @@ -29,7 +14,7 @@ checkstyle.version=4.2 commons-cli.version=1.2 commons-codec.version=1.4 -commons-collections.version=3.1 +commons-collections.version=3.2 commons-configuration.version=1.6 commons-daemon.version=1.0.13 commons-httpclient.version=3.0.1 @@ -39,12 +24,13 @@ commons-logging-api.version=1.0.4 commons-math.version=2.1 commons-el.version=1.0 commons-fileupload.version=1.2 -commons-io.version=2.1 +commons-io.version=2.4 commons-net.version=3.1 core.version=3.1.1 coreplugin.version=1.3.2 -hsqldb.version=1.8.0.10 +# hsqldb.version=1.8.0.10 +hsqldb.version=2.0.0 ivy.version=2.1.0 @@ -59,21 +45,33 @@ jsp-2.1.version=6.1.14 jets3t.version=0.6.1 jetty.version=6.1.26 jetty-util.version=6.1.26 -jersey-core.version=1.8 -jersey-json.version=1.8 -jersey-server.version=1.8 -junit.version=4.5 +# jersey-core.version=1.8 +# jersey-json.version=1.8 +# jersey-server.version=1.8 + +jersey-core.version=1.9 +jersey-json.version=1.9 +jersey-server.version=1.9 + +# junit.version=4.5 +junit.version=4.11 + jdeb.version=0.8 jdiff.version=1.0.9 -json.version=1.0 + +# json.version=1.0 +json.version=1.1 kfs.version=0.1 -log4j.version=1.2.15 +# log4j.version=1.2.15 +log4j.version=1.2.17 + lucene-core.version=2.3.1 mockito-all.version=1.8.5 -jsch.version=0.1.42 +# jsch.version=0.1.42 +jsch.version=0.1.54 oro.version=2.0.8 @@ -81,9 +79,15 @@ rats-lib.version=0.5.1 servlet.version=4.0.6 servlet-api.version=2.5 -slf4j-api.version=1.4.3 -slf4j-log4j12.version=1.4.3 +# slf4j-api.version=1.4.3 +# slf4j-log4j12.version=1.4.3 + +slf4j-api.version=1.7.10 +slf4j-log4j12.version=1.7.10 wagon-http.version=1.0-beta-2 xmlenc.version=0.52 -xerces.version=1.4.4 +# xerces.version=1.4.4 +xerces.version=2.9.1 + +htrace.version=3.1.0-incubating