Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2E3C9200BA1 for ; Mon, 12 Sep 2016 03:16:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2CC0F160AC7; Mon, 12 Sep 2016 01:16:08 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 03088160AD6 for ; Mon, 12 Sep 2016 03:16:06 +0200 (CEST) Received: (qmail 41087 invoked by uid 500); 12 Sep 2016 01:16:06 -0000 Mailing-List: contact commits-help@zest.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zest.apache.org Delivered-To: mailing list commits@zest.apache.org Received: (qmail 41042 invoked by uid 99); 12 Sep 2016 01:16:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Sep 2016 01:16:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 03885E0667; Mon, 12 Sep 2016 01:16:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulmerlin@apache.org To: commits@zest.apache.org Date: Mon, 12 Sep 2016 01:16:07 -0000 Message-Id: <607979b1cbf94f60acb41d794c9251f2@git.apache.org> In-Reply-To: <62649fce7de2465d8d7073b7d687ded0@git.apache.org> References: <62649fce7de2465d8d7073b7d687ded0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/8] zest-java git commit: Trivial 3rd party libraries upgrades archived-at: Mon, 12 Sep 2016 01:16:08 -0000 Trivial 3rd party libraries upgrades Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/3f4227c2 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/3f4227c2 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/3f4227c2 Branch: refs/heads/develop Commit: 3f4227c267eaf1df45368fb1dac10e86dc079882 Parents: 52e1e57 Author: Paul Merlin Authored: Sun Sep 11 14:58:08 2016 -0700 Committer: Paul Merlin Committed: Sun Sep 11 15:02:51 2016 -0700 ---------------------------------------------------------------------- build.gradle | 2 +- libraries.gradle | 24 ++++++++++---------- .../circuitbreaker/CircuitBreakerTest.java | 4 ++-- settings.gradle | 1 - 4 files changed, 15 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/3f4227c2/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index eab2046..73c8e39 100644 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,7 @@ allprojects { if( version == 'unspecified' ) { version = System.properties.version ?: "0" } - + // UTF-8 For all compilations and javadocs // Deprecation warnings for all compilations // Unchecked warnings for non-test core compilations http://git-wip-us.apache.org/repos/asf/zest-java/blob/3f4227c2/libraries.gradle ---------------------------------------------------------------------- diff --git a/libraries.gradle b/libraries.gradle index 5f8fd5e..e026904 100644 --- a/libraries.gradle +++ b/libraries.gradle @@ -28,43 +28,43 @@ def derbyVersion = '10.12.1.1' def dnsJavaVersion = '2.1.7' def ehcacheVersion = '2.10.2.2.21' // 3.x exists def elasticsearchVersion = '1.7.5' // 2.x exists -def freemarkerVersion = '2.3.24-incubating' +def freemarkerVersion = '2.3.25-incubating' def geodeVersion = '1.0.0-incubating.M2' def groovyVersion = '2.4.7' def h2Version = '1.4.192' -def hazelcastVersion = '3.6.3' +def hazelcastVersion = '3.7.1' def hamcrestVersion = '1.3' def httpClientVersion = '4.5.2' -def jacksonVersion = '2.7.5' +def jacksonVersion = '2.8.2' def javascriptVersion = '1.7.7.1' def javasqlgeneratorVersion = '0.3.2' def jcloudsVersion = '1.9.2' def jdbmVersion = '2.4' -def jedisVersion = '2.8.1' +def jedisVersion = '2.9.0' def jettyVersion = '9.2.17.v20160517' // 9.3.x Tests fail! def jgoodiesLooksVersion = '2.7.0' def jtaVersion = '1.1' -def leveldbVersion = '0.7' +def leveldbVersion = '0.9' def leveldbJniVersion = '1.8' def liquibaseVersion = '3.5.1' -def logbackVersion = '1.1.3' -def mongodbVersion = '2.14.2' // 3.0.x Fails to compile! +def logbackVersion = '1.1.7' +def mongodbVersion = '2.14.3' // 3.3.x Fails to compile! def mysqlVersion = '5.1.39' // 6.x exists def orgJsonVersion = '20130213' def osgiVersion = '4.2.0' // 4.3.0 Fails to compile! - 5.0.0 exists def pdfboxVersion = '1.8.12' // 2.x exists -def postgresqlVersion = '9.4.1208' +def postgresqlVersion = '9.4.1210' def prefuseVersion = '1.0.1' def restletVersion = '2.3.7' def rdfVersion = '2.7.16' // 2.8.x change query results!! 4.x exists def riakVersion = '1.4.4' // 2.0.x Fails to compile! def scalaVersion = '2.11.8' def servletVersion = '3.1.0' -def shiroVersion = '1.2.4' // 1.2.5 exists but has wrong POM +def shiroVersion = '1.3.1' def skedVersion = '2.1' def slf4jVersion = '1.7.21' def solrVersion = "1.4.1" // 4.x Fails to compile! -def springVersion = '4.3.0.RELEASE' +def springVersion = '4.3.2.RELEASE' def spymemcachedVersion = '2.12.1' def sqliteVersion = '3.8.11.2' def velocityVersion = '1.7' @@ -74,7 +74,7 @@ def woodstoxVersion = '4.4.1' def yammerMetricsVersion = '2.2.0' // 3.x exists, relocated to io.dropwizard def antVersion = '1.9.7' -def awaitilityVersion = '1.7.0' +def awaitilityVersion = '2.0.0' def easyMockVersion = '3.4' def junitVersion = '4.12' def mockitoVersion = '1.10.19' @@ -232,7 +232,7 @@ rootProject.ext { "org.hamcrest:hamcrest-core:$hamcrestVersion", "org.hamcrest:hamcrest-library:$hamcrestVersion" ], - awaitility: "com.jayway.awaitility:awaitility:$awaitilityVersion", + awaitility: "org.awaitility:awaitility:$awaitilityVersion", easymock: "org.easymock:easymock:$easyMockVersion", mockito: "org.mockito:mockito-core:$mockitoVersion", http://git-wip-us.apache.org/repos/asf/zest-java/blob/3f4227c2/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/CircuitBreakerTest.java ---------------------------------------------------------------------- diff --git a/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/CircuitBreakerTest.java b/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/CircuitBreakerTest.java index 94288c2..90c09ba 100644 --- a/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/CircuitBreakerTest.java +++ b/libraries/circuitbreaker/src/test/java/org/apache/zest/library/circuitbreaker/CircuitBreakerTest.java @@ -29,8 +29,8 @@ import org.hamcrest.CoreMatchers; import org.junit.Before; import org.junit.Test; -import static com.jayway.awaitility.Awaitility.await; -import static com.jayway.awaitility.Duration.ONE_SECOND; +import static org.awaitility.Awaitility.await; +import static org.awaitility.Duration.ONE_SECOND; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; http://git-wip-us.apache.org/repos/asf/zest-java/blob/3f4227c2/settings.gradle ---------------------------------------------------------------------- diff --git a/settings.gradle b/settings.gradle index 7cabe8b..ddc9698 100644 --- a/settings.gradle +++ b/settings.gradle @@ -135,4 +135,3 @@ def validateProject(project, parentName) validateProject(child, project.name) } } -