Merged develop into feature/shibui-1744

TIER · Sep 10, 2021 · 8b116e4 · 8b116e4
2 parents 9319c71 + f4f6df0
commit 8b116e4
Show file tree

Hide file tree

Showing 58 changed files with 23,023 additions and 256 deletions.
diff --git a/backend/build.gradle b/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'}"
@@ -353,4 +360,4 @@ dockerRun {
     daemonize true
     command '--spring.profiles.include=very-dangerous,dev', '--shibui.default-password={noop}password'
     clean true
-}
+}
diff --git a/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -123,16 +123,16 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1385: Restore a metadata provider version'                  | '/SHIBUI-1385-2.side'
         'SHIBUI-1391: Regex Validation'                                     | '/SHIBUI-1391.side'
         'SHIBUI-1407: Metadata source comparison highlights'                | '/SHIBUI-1407-1.side'
-        'SHIBUI-1407: Metadata provider comparison highlights'              | '/SHIBUI-1407-2.side'
+        'SHIBUI-1407: Metadata provider comparison highlights'              | '/SHIBUI-1407-2.side'*/
         'SHIBUI-1503: Non-admin can create metadata source'                 | '/SHIBUI-1503-1.side'
         'SHIBUI-1503: User can be deleted'                                  | '/SHIBUI-1503-2.side'
-        'SHIBUI-1503: User can be enabled'                                  | '/SHIBUI-1503-3.side'*/
+/*        'SHIBUI-1503: User can be enabled'                                  | '/SHIBUI-1503-3.side'
         'SHIBUI-1740: Group can be created, edited, deleted'                | '/SHIBUI-1740-1.side'
         'SHIBUI-1740: Verify dev profile group membership'                  | '/SHIBUI-1740-2.side'
         '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-1742: Verify role CRUD operations'                          | '/SHIBUI-1742-2.side'*/
     }
 }