You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by ra...@apache.org on 2015/10/09 06:17:31 UTC
[26/50] [abbrv] lens git commit: LENS-399 : Fix powermock test
failure on jdk8
LENS-399 : Fix powermock test failure on jdk8
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/5f60bdc6
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/5f60bdc6
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/5f60bdc6
Branch: refs/heads/current-release-line
Commit: 5f60bdc62f8e5db288fa8967fa0f865a044386d1
Parents: f4c6c11
Author: Raju Bairishetti <ra...@apache.org>
Authored: Mon Sep 21 11:23:33 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Sep 21 11:23:33 2015 +0530
----------------------------------------------------------------------
.../test/java/org/apache/lens/server/rewrite/TestRewriting.java | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/5f60bdc6/lens-server/src/test/java/org/apache/lens/server/rewrite/TestRewriting.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/rewrite/TestRewriting.java b/lens-server/src/test/java/org/apache/lens/server/rewrite/TestRewriting.java
index 7be9793..2827b96 100644
--- a/lens-server/src/test/java/org/apache/lens/server/rewrite/TestRewriting.java
+++ b/lens-server/src/test/java/org/apache/lens/server/rewrite/TestRewriting.java
@@ -57,7 +57,7 @@ import com.codahale.metrics.MetricRegistry;
*/
@PrepareForTest(RewriteUtil.class)
@PowerMockIgnore({"org.apache.log4j.*", "javax.management.*", "javax.xml.*",
- "com.sun.org.apache.xerces.internal.jaxp.*", "ch.qos.logback.*", "org.slf4j.*", "org.w3c.dom*"})
+ "com.sun.org.apache.xerces.internal.jaxp.*", "ch.qos.logback.*", "org.slf4j.*", "org.w3c.dom*", "org.mockito.*"})
public class TestRewriting {
/**
* We need a special {@link IObjectFactory}.
http://git-wip-us.apache.org/repos/asf/lens/blob/5f60bdc6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index adba544..10f9bc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
<!-- test -->
<testng.version>6.8</testng.version>
<mockito.version>1.9.5</mockito.version>
- <powermock.version>1.4.12</powermock.version>
+ <powermock.version>1.5.6</powermock.version>
<!-- maven plugins -->
<jaxb2.plugin.version>0.12.3</jaxb2.plugin.version>