Repository: incubator-tamaya Updated Branches: refs/heads/master cd93d8d28 -> 5491c7d2b
fixed broken build changed mockito.version to latest 1.10.19 removed unused imports Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/5491c7d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/5491c7d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/5491c7d2 Branch: refs/heads/master Commit: 5491c7d2bbac61acb9c02d1e8639cc733e53c237 Parents: cd93d8d Author: Reinhard Sandtner <[email protected]> Authored: Sun Jan 25 19:44:23 2015 +0100 Committer: Reinhard Sandtner <[email protected]> Committed: Sun Jan 25 19:59:35 2015 +0100 ---------------------------------------------------------------------- .../org/apache/tamaya/core/internal/DefaultServiceContextTest.java | 2 -- .../org/apache/tamaya/core/internal/DefaultServiceContextTest.java | 1 - pom.xml | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5491c7d2/java7/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java ---------------------------------------------------------------------- diff --git a/java7/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java b/java7/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java index 795c80f..2711a2e 100644 --- a/java7/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java +++ b/java7/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java @@ -19,14 +19,12 @@ package org.apache.tamaya.core.internal; import org.apache.tamaya.ConfigException; -import org.apache.tamaya.spi.ConfigurationContext; import org.apache.tamaya.spi.ConfigurationProviderSpi; import org.junit.Assert; import org.junit.Test; import javax.annotation.Priority; import java.util.List; -import java.util.Optional; public class DefaultServiceContextTest { http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5491c7d2/java8/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java ---------------------------------------------------------------------- diff --git a/java8/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java b/java8/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java index d8f1fd7..eef3659 100644 --- a/java8/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java +++ b/java8/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java @@ -19,7 +19,6 @@ package org.apache.tamaya.core.internal; import org.apache.tamaya.ConfigException; -import org.apache.tamaya.spi.ConfigurationContext; import org.apache.tamaya.spi.ConfigurationProviderSpi; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5491c7d2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 84e6bc6..6f1d5fe 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ under the License. <!-- Must/should match the JRuby version used by AsciidoctorJ --> <jruby.version>1.7.16.1</jruby.version> <findbugs.version>3.0.0</findbugs.version> - <mockito.version>1.10.6</mockito.version> + <mockito.version>1.10.19</mockito.version> <rat.version>0.11</rat.version> <toolchains.plugin>1.1</toolchains.plugin> </properties>
