From 9c9f89f1d5149e2cd499ff1b8320e56f88902b18 Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Fri, 9 Apr 2021 14:52:55 +0100
Subject: [PATCH] ARTEMIS-3106 - remove sha-1 references from the test

---
 .../artemis/tests/integration/amqp/sasl/SaslScramTest.java      | 2 --
 tests/integration-tests/src/test/resources/broker-saslscram.xml | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/sasl/SaslScramTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/sasl/SaslScramTest.java
index d114372ffd..9e39a300b5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/sasl/SaslScramTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/sasl/SaslScramTest.java
@@ -69,7 +69,6 @@ public class SaslScramTest extends ActiveMQTestBase {
     */
    @Test
    public void testUnencryptedWorksWithAllMechanism() throws JMSException {
-      sendRcv("SCRAM-SHA-1", "hello", "ogre1234");
       sendRcv("SCRAM-SHA-256", "hello", "ogre1234");
    }
 
@@ -79,7 +78,6 @@ public class SaslScramTest extends ActiveMQTestBase {
     */
    @Test
    public void testEncryptedWorksWithAllMechanism() throws JMSException {
-      sendRcv("SCRAM-SHA-1", "multi", "worksforall");
       sendRcv("SCRAM-SHA-256", "multi", "worksforall");
    }
 
diff --git a/tests/integration-tests/src/test/resources/broker-saslscram.xml b/tests/integration-tests/src/test/resources/broker-saslscram.xml
index a0252ac7e3..f471dc55ca 100644
--- a/tests/integration-tests/src/test/resources/broker-saslscram.xml
+++ b/tests/integration-tests/src/test/resources/broker-saslscram.xml
@@ -28,7 +28,7 @@ under the License.
         <security-enabled>true</security-enabled>
 
         <acceptors>
-            <acceptor name="amqp">tcp://localhost:5672?protocols=AMQP;saslMechanisms=SCRAM-SHA-256,SCRAM-SHA-1;saslLoginConfigScope=amqp-sasl-scram
+            <acceptor name="amqp">tcp://localhost:5672?protocols=AMQP;saslMechanisms=SCRAM-SHA-256;saslLoginConfigScope=amqp-sasl-scram
             </acceptor>
         </acceptors>
         <security-settings>