From 85d1bb55346e8b35369a569bda4eb9f5e8a76644 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <mail@leonard.io>
Date: Tue, 3 Sep 2024 10:44:34 +0200
Subject: [PATCH] Clean up variables

---
 onebusaway-gtfs-hibernate-cli/pom.xml   |  2 +-
 onebusaway-gtfs-hibernate/pom.xml       |  2 +-
 onebusaway-gtfs-merge-cli/pom.xml       |  2 +-
 onebusaway-gtfs-merge/pom.xml           |  2 +-
 onebusaway-gtfs-transformer-cli/pom.xml |  2 +-
 onebusaway-gtfs-transformer/pom.xml     |  3 ++-
 onebusaway-gtfs/pom.xml                 |  2 --
 pom.xml                                 | 13 ++++++-------
 8 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/onebusaway-gtfs-hibernate-cli/pom.xml b/onebusaway-gtfs-hibernate-cli/pom.xml
index e8977ba5..81ca63a3 100644
--- a/onebusaway-gtfs-hibernate-cli/pom.xml
+++ b/onebusaway-gtfs-hibernate-cli/pom.xml
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j_version}</version>
+      <version>${slf4j.version}</version>
     </dependency>
   </dependencies>
 
diff --git a/onebusaway-gtfs-hibernate/pom.xml b/onebusaway-gtfs-hibernate/pom.xml
index 23b79b46..b99b8a8d 100644
--- a/onebusaway-gtfs-hibernate/pom.xml
+++ b/onebusaway-gtfs-hibernate/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j_version}</version>
+      <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/onebusaway-gtfs-merge-cli/pom.xml b/onebusaway-gtfs-merge-cli/pom.xml
index c9405293..451dcbc6 100644
--- a/onebusaway-gtfs-merge-cli/pom.xml
+++ b/onebusaway-gtfs-merge-cli/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j_version}</version>
+      <version>${slf4j.version}</version>
     </dependency>
   </dependencies>
 
diff --git a/onebusaway-gtfs-merge/pom.xml b/onebusaway-gtfs-merge/pom.xml
index 08722635..f5da8965 100644
--- a/onebusaway-gtfs-merge/pom.xml
+++ b/onebusaway-gtfs-merge/pom.xml
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j_version}</version>
+      <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/onebusaway-gtfs-transformer-cli/pom.xml b/onebusaway-gtfs-transformer-cli/pom.xml
index 66cf5537..3dc4b136 100644
--- a/onebusaway-gtfs-transformer-cli/pom.xml
+++ b/onebusaway-gtfs-transformer-cli/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j_version}</version>
+      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
diff --git a/onebusaway-gtfs-transformer/pom.xml b/onebusaway-gtfs-transformer/pom.xml
index 36f420eb..8266afa1 100644
--- a/onebusaway-gtfs-transformer/pom.xml
+++ b/onebusaway-gtfs-transformer/pom.xml
@@ -40,7 +40,8 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j_version}</version>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
diff --git a/onebusaway-gtfs/pom.xml b/onebusaway-gtfs/pom.xml
index 79f53dbe..f309c6e1 100644
--- a/onebusaway-gtfs/pom.xml
+++ b/onebusaway-gtfs/pom.xml
@@ -27,7 +27,6 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>${slf4j_version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -42,7 +41,6 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j_version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index bc6679b3..52dd56cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,12 @@
   </developers>
 
   <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <onebusaway_csv_entities_version>1.1.7</onebusaway_csv_entities_version>
     <onebusaway_collections_version>1.2.8</onebusaway_collections_version>
-    <slf4j_version>2.0.6</slf4j_version>
+    <slf4j.version>2.0.6</slf4j.version>
     <onebusaway_cloud_version>0.0.13</onebusaway_cloud_version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <junit.version>5.11.0</junit.version>
   </properties>
 
@@ -74,7 +74,6 @@
     <module>onebusaway-gtfs-hibernate-cli</module>
     <module>onebusaway-gtfs-transformer</module>
     <module>onebusaway-gtfs-transformer-cli</module>
-    <!--module>onebusaway-gtfs-transformer-cli-aws</module-->
     <module>onebusaway-gtfs-merge</module>
     <module>onebusaway-gtfs-merge-cli</module>
   </modules>
@@ -106,17 +105,17 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j</artifactId>
-        <version>${slf4j_version}</version>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>${slf4j_version}</version>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>
-        <version>${slf4j_version}</version>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>