From b2369f9be92c573bd37b3ccc3142b9900625434f Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Thu, 20 Mar 2014 17:29:51 +0000 Subject: QPID-5600: Advance the version number on trunk to 0.29 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579690 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/client/src/main/java/client.bnd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/client/src/main') diff --git a/qpid/java/client/src/main/java/client.bnd b/qpid/java/client/src/main/java/client.bnd index 63b1e3b34c..c2abcd55b5 100755 --- a/qpid/java/client/src/main/java/client.bnd +++ b/qpid/java/client/src/main/java/client.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.27.0 +ver: 0.29.0 Bundle-SymbolicName: qpid-client Bundle-Version: ${ver} -- cgit v1.2.1 From eeba35b5cda54b962b7b1e10659418c12c3ba324 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 21 Mar 2014 23:08:42 +0000 Subject: QPID-5639 : [Java Broker] Add SCRAM-SHA-1 SASL support git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580082 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/client/security/CallbackHandlerRegistry.properties | 2 ++ .../org/apache/qpid/client/security/DynamicSaslRegistrar.properties | 1 + 2 files changed, 3 insertions(+) (limited to 'qpid/java/client/src/main') diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties index 8855a040ea..109ff9942a 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties @@ -31,3 +31,5 @@ CRAM-MD5.4=org.apache.qpid.client.security.UsernamePasswordCallbackHandler AMQPLAIN.5=org.apache.qpid.client.security.UsernamePasswordCallbackHandler PLAIN.6=org.apache.qpid.client.security.UsernamePasswordCallbackHandler ANONYMOUS.7=org.apache.qpid.client.security.UsernamePasswordCallbackHandler +SCRAM-SHA1.8=org.apache.qpid.client.security.UsernamePasswordCallbackHandler + diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties b/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties index b903208927..c2cd671bdf 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties @@ -19,3 +19,4 @@ AMQPLAIN=org.apache.qpid.client.security.amqplain.AmqPlainSaslClientFactory CRAM-MD5-HASHED=org.apache.qpid.client.security.crammd5hashed.CRAMMD5HashedSaslClientFactory ANONYMOUS=org.apache.qpid.client.security.anonymous.AnonymousSaslClientFactory +SCRAM-SHA1=org.apache.qpid.client.security.scram.ScramSHA1SaslClientFactory -- cgit v1.2.1