From d0f010493b91796d5bf376e1c27ccc335fb65f01 Mon Sep 17 00:00:00 2001
From: Pushkar Kulkarni <pushkar.kulkarni@canonical.com>
Date: Fri, 20 Sep 2024 13:25:10 +0530
Subject: [PATCH 1/2] Package as a content-snap

---
 pom.xml        |  3 +++
 snapcraft.yaml | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 snapcraft.yaml

diff --git a/pom.xml b/pom.xml
index 3cbbe83..a7fd4e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,9 @@
                             <arguments>
                                 <argument>test-solib</argument>
                             </arguments>
+                            <skip>
+                                ${skipGenerateTestResources}
+                            </skip>
                         </configuration>
                     </execution>
                     <execution>
diff --git a/snapcraft.yaml b/snapcraft.yaml
new file mode 100644
index 0000000..0561cb9
--- /dev/null
+++ b/snapcraft.yaml
@@ -0,0 +1,28 @@
+name: openssl-java-fips
+base: core24
+version: "0.0.1"
+summary: OpenSSL-based Java FIPS Provider
+description: |
+  This content-snap contains the OpenSSL Java FIPS provider JAR.
+
+
+grade: stable
+confinement: strict
+
+parts:
+  openssl-fips-java-jar:
+    plugin: maven
+    source: .
+    maven-parameters:
+      - -DskipTests=true -DskipGenerateTestResources=true -B package --file pom.xml
+
+build-packages:
+  [openjdk-21-jdk, maven, libssl-dev]
+
+slots:
+  shared-jar:
+    interface: content
+    content: shared-jar
+    source:
+     - $SNAP/target
+    write: $SNAP_COMMON/shared-jar

From 6cfb72f9f1138916190eabcd9308ab63075f13a2 Mon Sep 17 00:00:00 2001
From: Pushkar Kulkarni <pushkar.kulkarni@canonical.com>
Date: Fri, 20 Sep 2024 16:13:47 +0530
Subject: [PATCH 2/2] Corrections

---
 snapcraft.yaml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 0561cb9..47156dd 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
-name: openssl-java-fips
-base: core24
+name: openssl-fips-java
+base: core22
 version: "0.0.1"
 summary: OpenSSL-based Java FIPS Provider
 description: |
@@ -10,19 +10,20 @@ grade: stable
 confinement: strict
 
 parts:
-  openssl-fips-java-jar:
+  openssl-fips-provider-jar:
     plugin: maven
     source: .
     maven-parameters:
       - -DskipTests=true -DskipGenerateTestResources=true -B package --file pom.xml
-
-build-packages:
-  [openjdk-21-jdk, maven, libssl-dev]
+    build-packages:
+      - openjdk-21-jdk
+      - maven
+      - libssl-dev
 
 slots:
-  shared-jar:
+  openssl-fips-provider-jar:
     interface: content
-    content: shared-jar
+    content: openssl-fips-provider-jar
     source:
-     - $SNAP/target
-    write: $SNAP_COMMON/shared-jar
+      read:
+        - $SNAP/jar