diff --git a/README.md b/README.md index 5488c5b..fadabf0 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,10 @@ Compilation In order to compile the code you need * java 1.6 -* [gradle 0.9](http://www.gradle.org/) At the top simply run - gradle test + ./gradlew test which should compile and run all the tests. @@ -37,7 +36,7 @@ IDE Support =========== You can issue the command (at the top) - gradle idea + ./gradlew cleanIdea idea which will use the gradle IDEA plugin to create the right set of modules in order to open the project in IntelliJ IDEA. @@ -56,8 +55,6 @@ of a tree or entire subtree with easy to use listeners (`NodeEventsListener` and * `StandaloneZooKeeperServer`: a simple class to start a standalone ZooKeeper server (simple to use in testing) -Javadoc: [org.linkedin.zookeeper-impl](http://www.kiwidoc.com/java/l/p/org.linkedin/org.linkedin.zookeeper-impl) - * `org.linkedin.zookeeper-cli-impl`: A command line (similar to the one bundled with ZooKeeper) with the idea of having a syntax very close to a 'regular' shell: @@ -78,7 +75,7 @@ Simply create a packaged server which is easy to install and start. Useful in de To install the zookeeper server: cd org.linkedin.zookeeper-server - gradle package-install + ../gradlew package-install then go to the install directory and run @@ -87,7 +84,7 @@ then go to the install directory and run To install the zookeeper cli: cd org.linkedin.zookeeper-cli - gradle package-install + ../gradlew package-install then go to the install directory and run (to see help) diff --git a/RELEASE.md b/RELEASE.md index a760f32..28efe61 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,13 @@ +1.5.0 (2013/04/01) +------------------ +* Fixed [#13](https://github.com/linkedin/linkedin-zookeeper/issues/13) _zk.sh get does not work_ +* Implemented [#12](https://github.com/linkedin/linkedin-zookeeper/issues/12) _Upgrade to latest versions_ +* Fixed [#10](https://github.com/linkedin/linkedin-zookeeper/issues/10) _Make zk.sh use $JAVA\_HOME_ + +This release uses the latest version of ZooKeeper (3.4.5). Thanks to Patrick Hunt for the pull request. The build now uses gradle 1.4.0 and can be invoked using the wrapper (``gradlew``) at the root. + +Note that there is an [issue with ZooKeeper](https://issues.apache.org/jira/browse/ZOOKEEPER-1661) and the workaround for it is to use ``127.0.0.1`` instead of ``localhost``. + 1.4.1 (2012/03/31) ------------------ * use of [linkedin-utils 1.8.0](https://github.com/linkedin/linkedin-utils/tree/v1.8.0) @@ -5,7 +15,7 @@ 1.4.0 (2011/09/23) ------------------ * use of [linkedin-utils 1.7.1](https://github.com/linkedin/linkedin-utils/tree/v1.7.1) -* Implemented [#1](https://github.com/linkedin/linkedin-zookeeper/issues/1) *Expose a getConnectString in the IZKClient interface and IZooKeeperFactory* (thanks Hiram) +* Implemented [#1](https://github.com/linkedin/linkedin-zookeeper/issues/1) _Expose a getConnectString in the IZKClient interface and IZooKeeperFactory_ (thanks Hiram) 1.3.0 (2011/04/30) ------------------ diff --git a/build.gradle b/build.gradle index f9021c3..3c748d8 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ buildscript { } dependencies { - classpath 'org.linkedin:org.linkedin.gradle-plugins:1.5.glu47.2' + classpath 'org.linkedin:org.linkedin.gradle-plugins:1.6.0' } } diff --git a/org.linkedin.zookeeper-cli-impl/src/main/groovy/org/linkedin/zookeeper/cli/commands/GetCommand.groovy b/org.linkedin.zookeeper-cli-impl/src/main/groovy/org/linkedin/zookeeper/cli/commands/GetCommand.groovy index 044bdcd..0fd3b94 100644 --- a/org.linkedin.zookeeper-cli-impl/src/main/groovy/org/linkedin/zookeeper/cli/commands/GetCommand.groovy +++ b/org.linkedin.zookeeper-cli-impl/src/main/groovy/org/linkedin/zookeeper/cli/commands/GetCommand.groovy @@ -1,5 +1,6 @@ /* * Copyright 2010-2010 LinkedIn, Inc + * Portions Copyright (c) 2013 Yan Pujante * * 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 diff --git a/project-spec.groovy b/project-spec.groovy index ae19532..6a3017f 100644 --- a/project-spec.groovy +++ b/project-spec.groovy @@ -18,21 +18,21 @@ spec = [ name: 'linkedin-zookeeper', group: 'org.linkedin', - version: '1.5.glu47.0', + version: '1.5.0', versions: [ jdk: '1.6', groovy: '2.0.7', - linkedinUtils: '1.8.glu47.0', - slf4j: '1.6.2' // to be compatible with grails 2.0.7 + linkedinUtils: '1.9.0', + slf4j: '1.6.2' // to be compatible with grails 2.2.1 ], // information about the build framework itself build: [ type: "gradle", commands: [ - "snapshot": "gradlew release", - "release": "gradlew -Prelease=true release" + "snapshot": "./gradlew xxx", + "release": "./gradlew -Prelease=true xxx" ] ] ] @@ -44,7 +44,7 @@ spec.scmUrl = "git@github.com:linkedin/${spec.name}.git" */ spec.external = [ commonsCli: 'commons-cli:commons-cli:1.2', - groovy: "org.codehaus.groovy:groovy:${spec.versions.groovy}", + groovy: "org.codehaus.groovy:groovy-all:${spec.versions.groovy}", groovyTest: "org.codehaus.groovy:groovy-test:${spec.versions.groovy}", junit: 'junit:junit:4.10', linkedinUtilsCore: "org.linkedin:org.linkedin.util-core:${spec.versions.linkedinUtils}",