From e04ba90563b39f43a743be7272640b5b93e31f6a Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 11:18:50 +0000
Subject: [PATCH 1/2] FISH-7166: Upgrade Smack.

---
 xmpp-notifier-core/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xmpp-notifier-core/pom.xml b/xmpp-notifier-core/pom.xml
index 4cbb1a5..69a245b 100644
--- a/xmpp-notifier-core/pom.xml
+++ b/xmpp-notifier-core/pom.xml
@@ -53,7 +53,7 @@
     <name>XMPP Notifier Implementation</name>
 
     <properties>
-        <smack.version>4.3.4</smack.version>
+        <smack.version>4.4.8</smack.version>
         <xpp3.version>1.1.4c_7</xpp3.version>
     </properties>
 
@@ -70,7 +70,7 @@
         <!-- Extra dependencies. Need copying into modules directory -->
         <dependency>
             <groupId>org.igniterealtime.smack</groupId>
-            <artifactId>smack-java7</artifactId>
+            <artifactId>smack-java8</artifactId>
             <version>${smack.version}</version>
         </dependency>
         <dependency>

From 70460f88dbd5a61faf942ba7d0091ae3cfab4f58 Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Mon, 4 Nov 2024 12:19:33 +0000
Subject: [PATCH 2/2] FISH-7166: Repackage Smack Core.

This just removes one of the imports.
---
 pom.xml                       |   1 +
 smack-core-repackager/pom.xml | 111 ++++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+)
 create mode 100644 smack-core-repackager/pom.xml

diff --git a/pom.xml b/pom.xml
index 8cdcd35..316a8c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
         <module>xmpp-notifier-core</module>
         <module>xmpp-notifier-console-plugin</module>
         <module>xmpp-notifier-console-plugin-l10n</module>
+        <module>smack-core-repackager</module>
     </modules>
 
     <dependencyManagement>
diff --git a/smack-core-repackager/pom.xml b/smack-core-repackager/pom.xml
new file mode 100644
index 0000000..f55b946
--- /dev/null
+++ b/smack-core-repackager/pom.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+  ~
+  ~  Copyright (c) 2024 Payara Foundation and/or its affiliates. All rights reserved.
+  ~
+  ~  The contents of this file are subject to the terms of either the GNU
+  ~  General Public License Version 2 only ("GPL") or the Common Development
+  ~  and Distribution License("CDDL") (collectively, the "License").  You
+  ~  may not use this file except in compliance with the License.  You can
+  ~  obtain a copy of the License at
+  ~  https://github.com/payara/Payara/blob/main/LICENSE.txt
+  ~  See the License for the specific
+  ~  language governing permissions and limitations under the License.
+  ~
+  ~  When distributing the software, include this License Header Notice in each
+  ~  file and include the License file at glassfish/legal/LICENSE.txt.
+  ~
+  ~  GPL Classpath Exception:
+  ~  The Payara Foundation designates this particular file as subject to the "Classpath"
+  ~  exception as provided by the Payara Foundation in the GPL Version 2 section of the License
+  ~  file that accompanied this code.
+  ~
+  ~  Modifications:
+  ~  If applicable, add the following below the License Header, with the fields
+  ~  enclosed by brackets [] replaced by your own identifying information:
+  ~  "Portions Copyright [year] [name of copyright owner]"
+  ~
+  ~  Contributor(s):
+  ~  If you wish your version of this file to be governed by only the CDDL or
+  ~  only the GPL Version 2, indicate your decision by adding "[Contributor]
+  ~  elects to include this software in this distribution under the [CDDL or GPL
+  ~  Version 2] license."  If you don't indicate a single choice of license, a
+  ~  recipient has the option to distribute your version of this file under
+  ~  either the CDDL, the GPL Version 2 or to extend the choice of license to
+  ~  its licensees as provided above.  However, if you add GPL Version 2 code
+  ~  and therefore, elected the GPL Version 2 license, then the option applies
+  ~  only if the new code is made subject to such option by the copyright
+  ~  holder.
+  ~
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>fish.payara.extensions.notifiers</groupId>
+        <artifactId>notifiers-parent</artifactId>
+        <version>2.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>smack-core-repackager</artifactId>
+    <name>Smack Core Repackaged</name>
+    <description>Smack Core repackaged as a module</description>
+    <packaging>jar</packaging>
+
+    <properties>
+        <smack.version>4.4.8</smack.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <configuration>
+                            <skipIfEmpty>true</skipIfEmpty>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Embed-Dependency>
+                            *;scope=compile;inline=true
+                        </Embed-Dependency>
+                        <!-- Export everything from smack-core in the final bundle -->
+                        <Export-Package>*;version=${smack.version}</Export-Package>
+                        <!-- Exclude unnecessary imports -->
+                        <Private-Package>!*</Private-Package>
+                        <Import-Package>!com.sun.*</Import-Package>
+                    </instructions>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>osgi-bundle</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>bundle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.igniterealtime.smack</groupId>
+            <artifactId>smack-core</artifactId>
+            <version>${smack.version}</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file