From 74c79cb81baa8aa73d006430bd527bb4884b41bd Mon Sep 17 00:00:00 2001
From: Alex Stuart <alex.stuart@jisc.ac.uk>
Date: Mon, 1 Nov 2021 12:17:07 +0000
Subject: [PATCH] Remove entity-level copy of scope from production aggregate

See ukf/ukf-meta#49 for details
---
 mdx/uk/README.md    | 6 ++++--
 mdx/uk/generate.xml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mdx/uk/README.md b/mdx/uk/README.md
index 454aa10..76e7265 100644
--- a/mdx/uk/README.md
+++ b/mdx/uk/README.md
@@ -61,8 +61,7 @@ when it appeared in the fallback aggregate, which would be too late to take corr
 
 Status:
 
-* The `test` aggregate does not include the entity-level copy of the scopes for an
-  identity provider (`ukf-meta#49`).
+* These aggregates are identical
 
 ### `cds-all` Aggregate vs. Production Aggregate
 
@@ -76,6 +75,9 @@ Status:
 
 Status:
 
+* The `production` aggregate does not include the entity-level copy of the scopes for an
+  identity provider (`ukf-meta#49`).
+
 * The `production` aggregate does not include the `<UKFederationMember>` label (`ukf-meta#34`).
 
 * The `production` aggregate adds `<EncryptionMethod>` elements with AES128-CBC
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 0766d87..5750d92 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -306,6 +306,7 @@
                 <ref bean="assembleAggregate"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>
+                <ref bean="stripEntityScopes"/>
 
                 <ref bean="uk_add_cbc_encryption"/>