From 99b90f2215fe5daec25cf9afeb7053199cc9a8a6 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Wed, 11 Sep 2024 16:09:57 -0400
Subject: [PATCH 1/2] ci(snapshots): remove trailing slash (#461)

(cherry picked from commit b521ed6d934521b85bb44f703fac1e7bb523aa97)

# Conflicts:
#	pom.xml
---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 32d9ee9c..9c7a2d7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -374,8 +374,12 @@
                     <maven-central>
                       <active>ALWAYS</active>
                       <url>https://s01.oss.sonatype.org/service/local</url>
+<<<<<<< HEAD
                       <snapshotUrl>https://s01.oss.sonatype.org/content/repositories/snapshots/</snapshotUrl>
                       <verifyPom>false</verifyPom><!-- FIXME remove this once the Adoptium JMC repository is removed -->
+=======
+                      <snapshotUrl>https://s01.oss.sonatype.org/content/repositories/snapshots</snapshotUrl>
+>>>>>>> b521ed6 (ci(snapshots): remove trailing slash (#461))
                       <closeRepository>true</closeRepository>
                       <releaseRepository>true</releaseRepository>
                       <stagingRepositories>target/staging-deploy</stagingRepositories>

From 1ebe7a0d25dc9885acde01a626b8ee232497f3d1 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Wed, 11 Sep 2024 16:13:05 -0400
Subject: [PATCH 2/2] fixup! ci(snapshots): remove trailing slash (#461)

---
 pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9c7a2d7f..8b5fa6a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -374,12 +374,8 @@
                     <maven-central>
                       <active>ALWAYS</active>
                       <url>https://s01.oss.sonatype.org/service/local</url>
-<<<<<<< HEAD
-                      <snapshotUrl>https://s01.oss.sonatype.org/content/repositories/snapshots/</snapshotUrl>
-                      <verifyPom>false</verifyPom><!-- FIXME remove this once the Adoptium JMC repository is removed -->
-=======
                       <snapshotUrl>https://s01.oss.sonatype.org/content/repositories/snapshots</snapshotUrl>
->>>>>>> b521ed6 (ci(snapshots): remove trailing slash (#461))
+                      <verifyPom>false</verifyPom><!-- FIXME remove this once the Adoptium JMC repository is removed -->
                       <closeRepository>true</closeRepository>
                       <releaseRepository>true</releaseRepository>
                       <stagingRepositories>target/staging-deploy</stagingRepositories>