From 803b760e4d482430607d5e7bbc06b17105605f1d Mon Sep 17 00:00:00 2001
From: Mark Wickens <mark@wickensonline.co.uk>
Date: Tue, 19 Nov 2024 00:06:08 +0000
Subject: [PATCH 1/3] - next snapshot

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 54e24f7..3d169d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>uk.m0nom</groupId>
     <artifactId>adif-processor</artifactId>
-    <version>1.4.16</version>
+    <version>1.4.17-SNAPSHOT</version>
 
   <name>ADIF Processor</name>
   <url>https://github.com/urbancamo/adif-processor</url>

From 84c6fb595fe6a17e8210d391eb06ac010ca734c1 Mon Sep 17 00:00:00 2001
From: Mark Wickens <mark@wickensonline.co.uk>
Date: Tue, 19 Nov 2024 19:58:52 +0000
Subject: [PATCH 2/3] - fix vulnerabilities

---
 pom.xml | 76 ++++++---------------------------------------------------
 1 file changed, 7 insertions(+), 69 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3d169d4..018d725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,12 @@
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>6.1.15</version>
+    </dependency>
+
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
@@ -202,7 +208,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.12.0</version>
+      <version>2.14.0</version>
     </dependency>
 
     <dependency>
@@ -343,74 +349,6 @@
         <spring.profiles.active>prod</spring.profiles.active>
       </properties>
     </profile>
-
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.13</version>
-            <extensions>true</extensions>
-            <configuration>
-              <serverId>ossrh</serverId>
-              <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>true</autoReleaseAfterClose>
-              <stagingProgressTimeoutMinutes>20</stagingProgressTimeoutMinutes>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>3.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.4.1</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-                <configuration>
-                  <!-- Prevent gpg from using pinentry programs. Fixes: gpg: signing
-                      failed: Inappropriate ioctl for device -->
-                  <gpgArguments>
-                    <arg>--pinentry-mode</arg>
-                    <arg>loopback</arg>
-                  </gpgArguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
   <build>

From 1eb03cded9d9e4cf2bbe94340cdbdd78ddfa2eb5 Mon Sep 17 00:00:00 2001
From: Mark Wickens <mark@wickensonline.co.uk>
Date: Tue, 19 Nov 2024 20:41:41 +0000
Subject: [PATCH 3/3] - technical update

---
 pom.xml                                       | 26 +++++++------------
 .../CommentParsingAdifRecordTransformer.java  |  2 +-
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 018d725..6444e9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.2.6</version>
+    <version>3.3.5</version>
   </parent>
 
   <description>
@@ -22,7 +22,7 @@
 
     <groupId>uk.m0nom</groupId>
     <artifactId>adif-processor</artifactId>
-    <version>1.4.17-SNAPSHOT</version>
+    <version>1.4.17</version>
 
   <name>ADIF Processor</name>
   <url>https://github.com/urbancamo/adif-processor</url>
@@ -69,24 +69,12 @@
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>6.1.15</version>
-    </dependency>
-
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
       <scope>runtime</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-s3</artifactId>
-      <version>1.12.663</version>
-    </dependency>
-
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
@@ -96,13 +84,19 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.4.14</version>
+      <version>1.5.12</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.18.1</version>
     </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-core</artifactId>
-      <version>1.4.14</version>
+      <version>1.5.12</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
diff --git a/src/main/java/uk/m0nom/adifproc/adif3/transform/CommentParsingAdifRecordTransformer.java b/src/main/java/uk/m0nom/adifproc/adif3/transform/CommentParsingAdifRecordTransformer.java
index 91742a1..4430f31 100644
--- a/src/main/java/uk/m0nom/adifproc/adif3/transform/CommentParsingAdifRecordTransformer.java
+++ b/src/main/java/uk/m0nom/adifproc/adif3/transform/CommentParsingAdifRecordTransformer.java
@@ -115,7 +115,7 @@ private void processPotaRefs(Qso qso, TransformResults results) {
                 }
             }
             if (potaIds.getPotaList().size() > 1) {
-                results.addContactWithDubiousLocation(String.format("Multiple POTA Ids: %s, using last ref as location", potaIds.getValue()));
+                results.addContactWithDubiousLocation(String.format("Multiple POTA Ids: %s, using first ref as location", potaIds.getValue()));
             }
         }
     }