cxf git commit: Build fix

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 6b9d2d649 -> b12af728a


Build fix


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

Branch: refs/heads/3.1.x-fixes
Commit: b12af728a7f136c412ee07ea64616a216a63fd00
Parents: 6b9d2d6
Author: Colm O hEigeartaigh 
Authored: Mon Apr 24 16:46:22 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Apr 24 16:46:22 2017 +0100

--
 .../main/java/org/apache/cxf/configuration/jsse/SSLUtils.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b12af728/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java 
b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
index 9f911e7..b9c4a44 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
@@ -22,11 +22,12 @@ package org.apache.cxf.configuration.jsse;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.io.InputStream;
+import java.lang.reflect.Method;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.NoSuchAlgorithmException;
@@ -246,7 +247,7 @@ public final class SSLUtils {
  new Object[]{trustStoreLocation, e.getMessage()});
 } 
 } else {
-try (FileInputStream trustStoreInputStream = new 
FileInputStream(trustStoreLocation)) {
+try (InputStream trustStoreInputStream = 
Files.newInputStream(Paths.get(trustStoreLocation))) {
 trustedCertStore.load(trustStoreInputStream, null);
 }
 }

[3/3] cxf git commit: Build fix

[coheigea]

Build fix


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4eb8d15a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4eb8d15a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4eb8d15a

Branch: refs/heads/3.0.x-fixes
Commit: 4eb8d15a2a2658fe7255fdbedb1e2d7ffb53366e
Parents: a6e28de
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Jul 20 21:44:32 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Jul 20 21:44:32 2015 +0100

--
 .../java/org/apache/cxf/sts/token/validator/X509TokenValidator.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4eb8d15a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
index 1cf2ee7..8f2224e 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
@@ -29,7 +29,6 @@ import javax.security.auth.callback.CallbackHandler;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.Text;
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.DOMUtils;