From f967033766498679a3d2bd2de8887514a5154ad7 Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Tue, 29 Aug 2023 22:50:25 +0200
Subject: [PATCH] move parent-pom.xml to parent/pom.xml as explained in
 SLF4J-437

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
---
 integration/pom.xml                |  2 +-
 jcl-over-slf4j/pom.xml             |  2 +-
 jul-to-slf4j/pom.xml               |  2 +-
 log4j-over-slf4j/pom.xml           |  2 +-
 osgi-over-slf4j/pom.xml            |  2 +-
 parent-pom.xml => parent/pom.xml   | 10 +++++-----
 pom.xml                            |  4 +++-
 slf4j-api/pom.xml                  |  2 +-
 slf4j-ext/pom.xml                  |  2 +-
 slf4j-jdk-platform-logging/pom.xml |  2 +-
 slf4j-jdk14/pom.xml                |  2 +-
 slf4j-log4j12/pom.xml              |  2 +-
 slf4j-migrator/pom.xml             |  2 +-
 slf4j-nop/pom.xml                  |  2 +-
 slf4j-reload4j/pom.xml             |  2 +-
 slf4j-simple/pom.xml               |  2 +-
 16 files changed, 22 insertions(+), 20 deletions(-)
 rename parent-pom.xml => parent/pom.xml (98%)

diff --git a/integration/pom.xml b/integration/pom.xml
index 74d846be..2db8d924 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>            
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>integration</artifactId>
diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
index 81b5d0ba..8d9e8049 100755
--- a/jcl-over-slf4j/pom.xml
+++ b/jcl-over-slf4j/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>        
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
index 8cfc0ee4..35aa2bb9 100755
--- a/jul-to-slf4j/pom.xml
+++ b/jul-to-slf4j/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>            
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>jul-to-slf4j</artifactId>
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
index 4a70d257..643a6094 100755
--- a/log4j-over-slf4j/pom.xml
+++ b/log4j-over-slf4j/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>            
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
 
diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
index 12ecf3d3..4e08401b 100755
--- a/osgi-over-slf4j/pom.xml
+++ b/osgi-over-slf4j/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>            
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>osgi-over-slf4j</artifactId>
diff --git a/parent-pom.xml b/parent/pom.xml
similarity index 98%
rename from parent-pom.xml
rename to parent/pom.xml
index 6e2f5fcc..a5382727 100644
--- a/parent-pom.xml
+++ b/parent/pom.xml
@@ -8,13 +8,13 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-bom</artifactId>
     <version>2.0.8</version>
-    <relativePath>pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>slf4j-parent</artifactId>
   <packaging>pom</packaging>
-  <name>SLF4J Parent OM</name>
-  <description>Top SLF4J project parent pom.xml file</description>
+  <name>SLF4J Parent POM</name>
+  <description>SLF4J project parent pom.xml file</description>
   <url>http://www.slf4j.org</url>
 
   <organization>
@@ -38,7 +38,7 @@
 
   <properties>
     <!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
-    <project.build.outputTimestamp>2023-08-29T20:08:00Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-08-29T21:48:00Z</project.build.outputTimestamp>
     <latest.1.version>1.7.36</latest.1.version>
     <!-- java.util.ServiceLoader requires Java 6 -->
     <jdk.version>8</jdk.version>
@@ -116,7 +116,7 @@
       </resource>
 
       <resource>
-        <directory>.</directory>
+        <directory>..</directory>
         <targetPath>META-INF</targetPath>
         <includes>
           <include>LICENSE.txt</include>
diff --git a/pom.xml b/pom.xml
index 6089a353..4cc517e8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,10 @@
   <name>SLF4J BOM</name>
   <description>SLF4J project BOM</description>
 
+  <!-- Inspired by Improving the Maven Bill of Materials (BOM) Pattern  -->
+  <!-- https://www.garretwilson.com/blog/2023/06/14/improve-maven-bom-pattern -->
   <modules>
-    <module>parent-pom.xml</module>
+    <module>parent</module>
     <module>slf4j-api</module>
     <module>slf4j-simple</module>
     <module>slf4j-nop</module>
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
index 328cee70..6605f5cf 100755
--- a/slf4j-api/pom.xml
+++ b/slf4j-api/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>slf4j-api</artifactId>
diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
index 992618be..166d783d 100755
--- a/slf4j-ext/pom.xml
+++ b/slf4j-ext/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>    
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>slf4j-ext</artifactId>
diff --git a/slf4j-jdk-platform-logging/pom.xml b/slf4j-jdk-platform-logging/pom.xml
index 1ee3dfbe..fdc45aca 100644
--- a/slf4j-jdk-platform-logging/pom.xml
+++ b/slf4j-jdk-platform-logging/pom.xml
@@ -9,7 +9,7 @@
     <artifactId>slf4j-parent</artifactId>
     <groupId>org.slf4j</groupId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>    
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>slf4j-jdk-platform-logging</artifactId>
diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
index f74687f4..5bce2ee5 100755
--- a/slf4j-jdk14/pom.xml
+++ b/slf4j-jdk14/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>    
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>slf4j-jdk14</artifactId>
diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
index b3b9b631..948170bc 100755
--- a/slf4j-log4j12/pom.xml
+++ b/slf4j-log4j12/pom.xml
@@ -9,7 +9,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>    
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   
   <artifactId>slf4j-log4j12</artifactId>
diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml
index a72cee82..a9e74c5d 100755
--- a/slf4j-migrator/pom.xml
+++ b/slf4j-migrator/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>            
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>slf4j-migrator</artifactId>
diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
index d0d7a40c..04081ef3 100755
--- a/slf4j-nop/pom.xml
+++ b/slf4j-nop/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>    
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>slf4j-nop</artifactId>
diff --git a/slf4j-reload4j/pom.xml b/slf4j-reload4j/pom.xml
index 522db4e4..ed0ad9be 100644
--- a/slf4j-reload4j/pom.xml
+++ b/slf4j-reload4j/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>        
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>slf4j-reload4j</artifactId>
diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
index 8125e32f..595c14f7 100755
--- a/slf4j-simple/pom.xml
+++ b/slf4j-simple/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
     <version>2.0.8</version>
-    <relativePath>../parent-pom.xml</relativePath>    
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>slf4j-simple</artifactId>