From 0cb4982ab7f494274ede24fb6c6c75e1d1475c55 Mon Sep 17 00:00:00 2001
From: Derek Smart <derek@grindaga.com>
Date: Fri, 13 Jan 2023 09:34:19 -0500
Subject: [PATCH 1/4] package shaded jar

Signed-off-by: Derek Smart <derek@grindaga.com>
---
 pom.xml                                       | 41 ++++++++++++++++++-
 .../ext/resource/git/GitPathHandler.java      |  1 -
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0511981..6daa5c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.liquibase.ext</groupId>
     <artifactId>liquibase-git-resource</artifactId>
-    <version>0.1.1-SNAPSHOT</version>
+    <version>0.1.1</version>
     <packaging>jar</packaging>
 
     <name>Liquibase Git Resource</name>
@@ -53,7 +53,7 @@
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
             <version>4.18.0</version>
-            <scope>provided</scope>
+<!--            <scope>provided</scope>-->
         </dependency>
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
@@ -230,6 +230,43 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <Implementation-Title>Hashicorp Vault Extension</Implementation-Title>
+                                        <Bundle-Vendor>Liquibase</Bundle-Vendor>
+                                        <Bundle-Version>${project.version}</Bundle-Version>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <filters>
+                                <filter>
+                                    <!-- filter out signature files from signed dependencies, else repackaging fails with security ex -->
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
diff --git a/src/main/java/org/liquibase/ext/resource/git/GitPathHandler.java b/src/main/java/org/liquibase/ext/resource/git/GitPathHandler.java
index d9ff636..53b3f6d 100644
--- a/src/main/java/org/liquibase/ext/resource/git/GitPathHandler.java
+++ b/src/main/java/org/liquibase/ext/resource/git/GitPathHandler.java
@@ -16,7 +16,6 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
-import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

From a457bed41b9ae33f93224a5b08e177bb394dae71 Mon Sep 17 00:00:00 2001
From: Derek Smart <derek@grindaga.com>
Date: Fri, 13 Jan 2023 09:36:04 -0500
Subject: [PATCH 2/4] liquibase core is provided

Signed-off-by: Derek Smart <derek@grindaga.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6daa5c0..8db1492 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
             <version>4.18.0</version>
-<!--            <scope>provided</scope>-->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jgit</groupId>

From 14a906d2b5a7da23534f747835522fc595a83190 Mon Sep 17 00:00:00 2001
From: Derek Smart <derek@grindaga.com>
Date: Fri, 13 Jan 2023 09:37:43 -0500
Subject: [PATCH 3/4] simplify shaded jar

Signed-off-by: Derek Smart <derek@grindaga.com>
---
 pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8db1492..b6c212a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,13 +242,6 @@
                         <configuration>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <manifestEntries>
-                                        <Implementation-Title>Hashicorp Vault Extension</Implementation-Title>
-                                        <Bundle-Vendor>Liquibase</Bundle-Vendor>
-                                        <Bundle-Version>${project.version}</Bundle-Version>
-                                    </manifestEntries>
-                                </transformer>
                             </transformers>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <filters>

From 6edb0913820456bfe6ff01b463b9510470cedb92 Mon Sep 17 00:00:00 2001
From: Derek Smart <derek@grindaga.com>
Date: Fri, 13 Jan 2023 09:39:36 -0500
Subject: [PATCH 4/4] switch to os workflows

Signed-off-by: Derek Smart <derek@grindaga.com>
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b8479d3..3f4dc93 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build-test:
-    uses: liquibase/build-logic/.github/workflows/pro-extension-test.yml@v0.2.4
+    uses: liquibase/build-logic/.github/workflows/os-extension-test.yml@v0.2.4
     secrets: inherit
 
   integration-test: