From c75df47d8b8178cc0826abdffc766d15a3c97226 Mon Sep 17 00:00:00 2001
From: timburke-hackit <tim.burke@hackney.gov.uk>
Date: Tue, 21 Jan 2025 15:42:28 +0000
Subject: [PATCH 1/5] remove shade plugin, add assembly

---
 external-lib/pom.xml | 59 ++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/external-lib/pom.xml b/external-lib/pom.xml
index 524a8c6ae..3033d64f6 100644
--- a/external-lib/pom.xml
+++ b/external-lib/pom.xml
@@ -5,13 +5,14 @@
   <artifactId>java-lib</artifactId>
   <version>1.0-SNAPSHOT</version>
   <name>java-lib</name>
-  <!-- FIXME change it to the project's website -->
   <url>http://www.example.com</url>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -25,41 +26,40 @@
       <version>0.13.7</version>
     </dependency>
   </dependencies>
+
   <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.7.1</version>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+            </manifest>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+
     <pluginManagement>
-      <!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>3.2.4</version>
-          <executions>
-            <execution>
-              <phase>package</phase>
-              <goals>
-                <goal>shade</goal>
-              </goals>
-              <configuration>
-                <artifactSet>
-                  <excludes>
-                    <exclude>classworlds:classworlds</exclude>
-                    <exclude>junit:junit</exclude>
-                    <exclude>jmock:*</exclude>
-                    <exclude>*:xml-apis</exclude>
-                    <exclude>org.apache.maven:lib:tests</exclude>
-                    <exclude>log4j:log4j:jar:</exclude>
-                  </excludes>
-                </artifactSet>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
           <version>3.1.0</version>
         </plugin>
-        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
           <version>3.0.2</version>
@@ -84,7 +84,6 @@
           <artifactId>maven-deploy-plugin</artifactId>
           <version>2.8.2</version>
         </plugin>
-        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
           <version>3.7.1</version>

From 88ff9ce37ff67c622472038282592c0206812c28 Mon Sep 17 00:00:00 2001
From: timburke-hackit <tim.burke@hackney.gov.uk>
Date: Tue, 21 Jan 2025 16:11:13 +0000
Subject: [PATCH 2/5] change assembly version and configs

---
 external-lib/pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/external-lib/pom.xml b/external-lib/pom.xml
index 3033d64f6..dac819de8 100644
--- a/external-lib/pom.xml
+++ b/external-lib/pom.xml
@@ -31,7 +31,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.7.1</version>
+        <version>3.3.0</version>
         <configuration>
           <descriptorRefs>
             <descriptorRef>jar-with-dependencies</descriptorRef>
@@ -41,6 +41,9 @@
               <addClasspath>true</addClasspath>
             </manifest>
           </archive>
+          <appendAssemblyId>true</appendAssemblyId>
+          <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
+          <includeProjectArtifact>false</includeProjectArtifact>
         </configuration>
         <executions>
           <execution>

From ba3e5b8332537b79f08bb43d86ec52df1ef41e4e Mon Sep 17 00:00:00 2001
From: timburke-hackit <tim.burke@hackney.gov.uk>
Date: Tue, 21 Jan 2025 16:11:30 +0000
Subject: [PATCH 3/5] use package command

---
 external-lib/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external-lib/Makefile b/external-lib/Makefile
index b4638b8fb..acf161ed8 100644
--- a/external-lib/Makefile
+++ b/external-lib/Makefile
@@ -3,7 +3,7 @@
 all: target/java-lib-1.0-SNAPSHOT-jar-with-dependencies.jar target/deequ-1.0.3.jar target/pydeequ-1.0.1.zip
 
 target/java-lib-1.0-SNAPSHOT-jar-with-dependencies.jar: pom.xml
-	mvn assembly:single -DdescriptorId=jar-with-dependencies
+	mvn package
 
 target/deequ-1.0.3.jar:
 	wget https://repo1.maven.org/maven2/com/amazon/deequ/deequ/1.0.3/deequ-1.0.3.jar -O target/deequ-1.0.3.jar

From b163ddd539f3cf5410504ab9cfdaba785f3c01ab Mon Sep 17 00:00:00 2001
From: timburke-hackit <tim.burke@hackney.gov.uk>
Date: Tue, 21 Jan 2025 16:12:36 +0000
Subject: [PATCH 4/5] dummy change to trigger core workflow

---
 terraform/core/05-departments.tf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/terraform/core/05-departments.tf b/terraform/core/05-departments.tf
index 20e8de370..0cfe60694 100644
--- a/terraform/core/05-departments.tf
+++ b/terraform/core/05-departments.tf
@@ -1,3 +1,4 @@
+#dummy to trigger workflow
 data "aws_ssoadmin_instances" "sso_instances" {
   count = local.is_live_environment ? 1 : 0
 

From 0d2daae1909a705dcf4b2d0f001bd2ac95fe360d Mon Sep 17 00:00:00 2001
From: timburke-hackit <tim.burke@hackney.gov.uk>
Date: Tue, 21 Jan 2025 16:24:28 +0000
Subject: [PATCH 5/5] Revert "dummy change to trigger core workflow"

This reverts commit b163ddd539f3cf5410504ab9cfdaba785f3c01ab.
---
 terraform/core/05-departments.tf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/terraform/core/05-departments.tf b/terraform/core/05-departments.tf
index 0cfe60694..20e8de370 100644
--- a/terraform/core/05-departments.tf
+++ b/terraform/core/05-departments.tf
@@ -1,4 +1,3 @@
-#dummy to trigger workflow
 data "aws_ssoadmin_instances" "sso_instances" {
   count = local.is_live_environment ? 1 : 0