Merge branch 'CURATOR-204' of github.com:madrob/curator into CURATOR-204
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/5b24948d Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/5b24948d Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/5b24948d Branch: refs/heads/CURATOR-3.0 Commit: 5b24948d2385d24132f1059d5bb52f6452e598b6 Parents: 2347b57 6f505c2 Author: randgalt <randg...@apache.org> Authored: Tue Apr 21 11:17:24 2015 -0500 Committer: randgalt <randg...@apache.org> Committed: Tue Apr 21 11:17:24 2015 -0500 ---------------------------------------------------------------------- pom.xml | 60 +----------------------------------------------------------- 1 file changed, 1 insertion(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/5b24948d/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 01592c7,3053832..14a66df --- a/pom.xml +++ b/pom.xml @@@ -62,21 -62,12 +62,12 @@@ <!-- versions --> <maven-project-info-reports-plugin-version>2.7</maven-project-info-reports-plugin-version> - <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version> - <maven-dependency-plugin-version>2.8</maven-dependency-plugin-version> - <maven-install-plugin-version>2.5.1</maven-install-plugin-version> - <maven-compiler-plugin-version>3.1</maven-compiler-plugin-version> <maven-bundle-plugin-version>2.3.7</maven-bundle-plugin-version> - <maven-surefire-plugin-version>2.17</maven-surefire-plugin-version> - <maven-site-plugin-version>3.3</maven-site-plugin-version> <doxia-module-confluence-version>1.5</doxia-module-confluence-version> - <maven-scm-publish-plugin-version>1.0</maven-scm-publish-plugin-version> <maven-license-plugin-version>1.9.0</maven-license-plugin-version> - <maven-release-plugin-version>2.5</maven-release-plugin-version> - <apache-rat-plugin-version>0.10</apache-rat-plugin-version> <javassist-version>3.18.1-GA</javassist-version> <commons-math-version>2.2</commons-math-version> - <jackson-mapper-asl-version>1.9.13</jackson-mapper-asl-version> + <jackson-version>2.3.2</jackson-version> <jersey-version>1.18.1</jersey-version> <jsr311-api-version>1.1.1</jsr311-api-version> <jetty-version>6.1.26</jetty-version>
