You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2018/02/27 05:29:37 UTC
[accumulo] branch master updated (abdf269 -> d98843b)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from abdf269 ACCUMULO-4829 Avoid a dependency-analysis issue with hadoop-client-runtime
new 0afbd3d ACCUMULO-4817 Fix bouncycastle deprecation warning
new 08e7dfa ACCUMULO-4828 Update commons-vfs2 to 2.2
new f0684b2 Merge branch '1.7' into 1.8
new d98843b Merge branch '1.8'
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.
[accumulo] 01/04: ACCUMULO-4817 Fix bouncycastle deprecation warning
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 0afbd3d6a79b42751445d7990830dddb6e5c68d7
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Mon Feb 26 23:10:32 2018 -0500
ACCUMULO-4817 Fix bouncycastle deprecation warning
* Remove use of deprecated bouncycastle library calls
* Fix empty paragraph javadoc warning
---
.../org/apache/accumulo/core/client/ClientConfiguration.java | 1 -
.../src/test/java/org/apache/accumulo/test/util/CertUtils.java | 10 +++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 70dafaf..e6264ad 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -216,7 +216,6 @@ public class ClientConfiguration extends CompositeConfiguration {
* <p>
* A client configuration will then be read from each location using <em>PropertiesConfiguration</em> to construct a configuration. That means the latest item
* will be the one in the configuration.
- * <p>
*
* @see PropertiesConfiguration
* @see File#pathSeparator
diff --git a/test/src/test/java/org/apache/accumulo/test/util/CertUtils.java b/test/src/test/java/org/apache/accumulo/test/util/CertUtils.java
index a49e1cd..6c55b43 100644
--- a/test/src/test/java/org/apache/accumulo/test/util/CertUtils.java
+++ b/test/src/test/java/org/apache/accumulo/test/util/CertUtils.java
@@ -59,10 +59,10 @@ import org.bouncycastle.asn1.x509.Extension;
import org.bouncycastle.asn1.x509.KeyUsage;
import org.bouncycastle.cert.CertIOException;
import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils;
import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.provider.X509CertificateObject;
import org.bouncycastle.operator.OperatorCreationException;
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
import org.slf4j.Logger;
@@ -250,7 +250,7 @@ public class CertUtils {
PrivateKey signerKey = findPrivateKey(signerKeystore, signerPasswordArray);
KeyPair kp = generateKeyPair();
- X509CertificateObject cert = generateCert(keyName, kp, false, signerCert.getPublicKey(), signerKey);
+ Certificate cert = generateCert(keyName, kp, false, signerCert.getPublicKey(), signerKey);
char[] password = keystorePassword.toCharArray();
KeyStore keystore = KeyStore.getInstance(keystoreType);
@@ -270,7 +270,7 @@ public class CertUtils {
KeyPair kp = generateKeyPair();
- X509CertificateObject cert = generateCert(keyName, kp, true, kp.getPublic(), kp.getPrivate());
+ Certificate cert = generateCert(keyName, kp, true, kp.getPublic(), kp.getPrivate());
char[] password = keystorePassword.toCharArray();
KeyStore keystore = KeyStore.getInstance(keystoreType);
@@ -288,7 +288,7 @@ public class CertUtils {
return gen.generateKeyPair();
}
- private X509CertificateObject generateCert(String keyName, KeyPair kp, boolean isCertAuthority, PublicKey signerPublicKey, PrivateKey signerPrivateKey)
+ private Certificate generateCert(String keyName, KeyPair kp, boolean isCertAuthority, PublicKey signerPublicKey, PrivateKey signerPrivateKey)
throws IOException, CertIOException, OperatorCreationException, CertificateException, NoSuchAlgorithmException {
Calendar startDate = Calendar.getInstance();
Calendar endDate = Calendar.getInstance();
@@ -305,7 +305,7 @@ public class CertUtils {
certGen.addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.keyCertSign));
}
X509CertificateHolder cert = certGen.build(new JcaContentSignerBuilder(signingAlgorithm).build(signerPrivateKey));
- return new X509CertificateObject(cert.toASN1Structure());
+ return new JcaX509CertificateConverter().getCertificate(cert);
}
static Certificate findCert(KeyStore keyStore) throws KeyStoreException {
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.
[accumulo] 03/04: Merge branch '1.7' into 1.8
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit f0684b2e31ae202b2bb9e98b80c9db8d3f979ff2
Merge: fc75402 08e7dfa
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Mon Feb 26 23:11:37 2018 -0500
Merge branch '1.7' into 1.8
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc pom.xml
index b8d2e6b,6491202..44273de
--- a/pom.xml
+++ b/pom.xml
@@@ -374,19 -356,9 +374,19 @@@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</dependency>
<dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-test</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.
[accumulo] 04/04: Merge branch '1.8'
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit d98843b4ac67308b151e2a2ad9dde7ac4a9e0fff
Merge: abdf269 f0684b2
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Mon Feb 26 23:12:06 2018 -0500
Merge branch '1.8'
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.
[accumulo] 02/04: ACCUMULO-4828 Update commons-vfs2 to 2.2
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 08e7dfa0b74632cd4644588035be1028d6649b83
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Mon Feb 26 23:10:46 2018 -0500
ACCUMULO-4828 Update commons-vfs2 to 2.2
Improve VFS stability by updating to the latest bugfix release of
commons-vfs2, which is version 2.2.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 751ca6c..6491202 100644
--- a/pom.xml
+++ b/pom.xml
@@ -356,7 +356,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.