SHIBUI-1743

merging master to 1743 branch

backend/build.gradle

@@ -117,6 +117,13 @@ dependencies {
         compile "org.opensaml:${it}:${project.'opensaml.version'}"
     }
 
+//    Left here to save time later - when pac4j is/was updated, I needed all of these to get the runtime right with the SAML2 client
+//    runtimeOnly "org.bouncycastle:bcprov-jdk15on:1.69"
+//    runtimeOnly "org.bouncycastle:bcprov-ext-jdk15on:1.69"
+//    runtimeOnly "org.bouncycastle:bcutil-jdk15on:1.69"
+//    runtimeOnly "org.bouncycastle:bcpkix-jdk15on:1.69"
+
+
     // shibboleth idp deps
     ['idp-profile-spring', 'idp-profile-api'].each {
         compile "net.shibboleth.idp:${it}:${project.'shibboleth.version'}"

backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy

@@ -132,9 +132,8 @@ class SeleniumSIDETest extends Specification {
 //        'SHIBUI-1740: Verify admin-owned resource not visible to nonadmins' | '/SHIBUI-1740-3.side'
 //        'SHIBUI-1740: Verify nonadmin-owned resource visibility'            | '/SHIBUI-1740-4.side'
 //        'SHIBUI-1742: Verify enabler role allows enabling'                  | '/SHIBUI-1742-1.side'
-        'SHIBUI-1742: Verify role CRUD operations'                          | '/SHIBUI-1742-2.side'
-//        'SHIBUI-1743: Verify group regex CRUD operations'                   | '/SHIBUI-1743-1.side'
-//        'SHIBUI-1743: Verify nonadmin group regex validation'               | '/SHIBUI-1743-2.side'
+//        'SHIBUI-1742: Verify role CRUD operations'                          | '/SHIBUI-1742-2.side'
+        'SHIBUI-1743: Verify group regex CRUD operations'                   | '/SHIBUI-1743-1.side'
+        'SHIBUI-1743: Verify nonadmin group regex validation'               | '/SHIBUI-1743-2.side'
     }
-}
-
+}