directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/4] directory-kerby git commit: Updating SLF4J, assertj, mockito
Date Wed, 26 Apr 2017 10:36:07 GMT
Repository: directory-kerby
Updated Branches:
  refs/heads/trunk d390178c7 -> b7da10e38


Updating SLF4J, assertj, mockito


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/fe8e5529
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/fe8e5529
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/fe8e5529

Branch: refs/heads/trunk
Commit: fe8e552942c5a9b3315571a76dbfeb5619661410
Parents: d390178
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Apr 26 10:23:02 2017 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Apr 26 10:23:02 2017 +0100

----------------------------------------------------------------------
 kerby-kerb/kerb-util/pom.xml                                | 9 ++-------
 .../apache/kerby/kerberos/kerb/keytab/KeytabEntryTest.java  | 2 +-
 kerby-pkix/pom.xml                                          | 4 ++--
 pom.xml                                                     | 5 +++--
 4 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fe8e5529/kerby-kerb/kerb-util/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/pom.xml b/kerby-kerb/kerb-util/pom.xml
index 3d6fc94..d39fae1 100644
--- a/kerby-kerb/kerb-util/pom.xml
+++ b/kerby-kerb/kerb-util/pom.xml
@@ -44,13 +44,8 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.0</version>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fe8e5529/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/keytab/KeytabEntryTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/keytab/KeytabEntryTest.java
b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/keytab/KeytabEntryTest.java
index 2afc33f..8366a64 100644
--- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/keytab/KeytabEntryTest.java
+++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/keytab/KeytabEntryTest.java
@@ -54,7 +54,7 @@ public class KeytabEntryTest {
                          return 20;
                      }
                  }).when(mockKeytabInputStream).available();
-        doReturn(120).when(mockKeytabInputStream).readOctetsCount();
+        //doReturn(120).when(mockKeytabInputStream).readOctetsCount();
         doReturn(new byte[]{}).when(mockKeytabInputStream).readCountedOctets();
         doReturn(null).when(mockKeytabInputStream).readPrincipal(Matchers.any(Integer.class));
         doReturn(new KerberosTime()).when(mockKeytabInputStream).readTime();

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fe8e5529/kerby-pkix/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-pkix/pom.xml b/kerby-pkix/pom.xml
index 61e4992..8ceea65 100644
--- a/kerby-pkix/pom.xml
+++ b/kerby-pkix/pom.xml
@@ -47,8 +47,8 @@
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fe8e5529/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8993379..b38a4f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,13 +54,14 @@
     <log4j.version>1.2.17</log4j.version>
     <junit.version>4.12</junit.version>
     <nimbus.jose.version>3.10</nimbus.jose.version>
-    <slf4j.version>1.7.21</slf4j.version>
-    <assertj.version>2.4.1</assertj.version>
+    <slf4j.version>1.7.25</slf4j.version>
+    <assertj.version>2.6.0</assertj.version>
     <findbugs.version>3.0.3</findbugs.version>
     <buildtools.dir>${basedir}/build-tools</buildtools.dir>
     <skipTests>false</skipTests>
     <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
     <maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
+    <mockito.version>2.7.22</mockito.version>
   </properties>
 
   <prerequisites>


Mime
View raw message