diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..e0f15db2e
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic"
+}
\ No newline at end of file
diff --git a/build-and-test.sh b/build-and-test.sh
deleted file mode 100755
index 861f1eeba..000000000
--- a/build-and-test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (C) 2012 Brian Ferris <bdferris@onebusaway.org>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-mvn -U clean install \
-    -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 \
-    -Dlicense.skip=true \
-    -Dmaven.javadoc.skip=true \
-    -Dvalidate.silent=true \
-    -Dlog4j.configuration=
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 4287bc68b..7a0c87b75 100755
--- a/build.sh
+++ b/build.sh
@@ -15,10 +15,69 @@
 # limitations under the License.
 #
 
-mvn -U clean install \
-    -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 \
-    -DskipTests=true \
-    -Dlicense.skip=true \
-    -Dmaven.javadoc.skip=true \
-    -Dvalidate.silent=true \
-    -Dlog4j.configuration=
\ No newline at end of file
+#!/bin/bash
+
+# Function to print help message
+print_help() {
+    echo "Usage: $0 [OPTIONS]"
+    echo "Wrapper script for Maven build command with customizable options."
+    echo
+    echo "Options:"
+    echo "  --help              Display this help message"
+    echo "  --clean             Run the clean phase before building (optional)"
+    echo "  --check-updates     Force a check for updated releases and snapshots"
+    echo "  --test              Run tests (disabled by default)"
+    echo "  --javadoc           Generate JavaDoc (disabled by default)"
+    echo "  --validate-silent VALUE  Set the validate.silent option (default: true)"
+    echo "  --log4j-config VALUE     Set the log4j.configuration option (default: empty)"
+    echo
+    echo "Example:"
+    echo "  $0 --clean --check-updates --test --javadoc --validate-silent false --log4j-config my-log4j.properties"
+}
+
+# Default values
+clean=""
+check_updates=""
+run_tests="false"
+generate_javadoc="false"
+validate_silent="true"
+log4j_config=""
+
+# Parse command line arguments
+while [[ "$#" -gt 0 ]]; do
+    case $1 in
+        --help) print_help; exit 0;;
+        --clean) clean="clean ";;
+        --check-updates) check_updates="-U ";;
+        --test) run_tests="true";;
+        --javadoc) generate_javadoc="true";;
+        --validate-silent) validate_silent="$2"; shift;;
+        --log4j-config) log4j_config="$2"; shift;;
+        *) echo "Unknown parameter: $1"; print_help; exit 1;;
+    esac
+    shift
+done
+
+# Construct the Maven command
+cmd="mvn ${check_updates}${clean}install"
+
+# Add options based on parsed arguments
+if [ "$run_tests" = "false" ]; then
+    cmd="$cmd -DskipTests=true"
+fi
+
+if [ "$generate_javadoc" = "false" ]; then
+    cmd="$cmd -Dmaven.javadoc.skip=true"
+fi
+
+cmd="$cmd -Dvalidate.silent=$validate_silent"
+
+if [ -n "$log4j_config" ]; then
+    cmd="$cmd -Dlog4j.configuration=$log4j_config"
+else
+    cmd="$cmd -Dlog4j.configuration="
+fi
+
+# Execute the command
+echo "Executing: $cmd"
+eval $cmd
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 6aa6b9af5..72a25c7c2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,19 @@
+#
+# Copyright (C) 2012 Brian Ferris <bdferris@onebusaway.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 services:
   builder:
     build:
diff --git a/onebusaway-admin-webapp/pom.xml b/onebusaway-admin-webapp/pom.xml
index 4058c53b8..58cebba52 100644
--- a/onebusaway-admin-webapp/pom.xml
+++ b/onebusaway-admin-webapp/pom.xml
@@ -1,12 +1,14 @@
-<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>org.onebusaway</groupId>
-		<artifactId>onebusaway-application-modules</artifactId>
-		<version>2.5.13-otsf</version>
-	</parent>
-	<artifactId>onebusaway-admin-webapp</artifactId>
-	<packaging>war</packaging>
+<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>org.onebusaway</groupId>
+        <artifactId>onebusaway-application-modules</artifactId>
+        <version>2.5.13-otsf</version>
+    </parent>
+    <artifactId>onebusaway-admin-webapp</artifactId>
+    <packaging>war</packaging>
 
     <name>onebusaway-admin-webapp</name>
     <properties>
@@ -373,7 +375,8 @@
                     <skipPoms>false</skipPoms>
                     <generateGitPropertiesFile>false</generateGitPropertiesFile>
                     <generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
-                    <!--  travis takes some shortcuts with git so we need to tell the plugin to ignore git errors -->
+                    <!--  travis takes some shortcuts with git so we need to tell the plugin to
+                    ignore git errors -->
                     <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
                     <failOnNoGitDirectory>false</failOnNoGitDirectory>
                     <gitDescribe>
@@ -385,17 +388,6 @@
                     </gitDescribe>
                 </configuration>
             </plugin>
-            <!--
-                          <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-compiler-plugin</artifactId>
-                            <version>3.3</version>
-                            <configuration>
-                              <source>1.7</source>
-                              <target>1.7</target>
-                            </configuration>
-                          </plugin>
-            -->
         </plugins>
         <resources>
             <resource>
@@ -421,7 +413,8 @@
                     </configuration>
                 </plugin>
 
-                <!--This plugin's configuration is used to store Eclipse m2e settings
+                <!--This
+                plugin's configuration is used to store Eclipse m2e settings
                     only. It has no influence on the Maven build itself. -->
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
@@ -477,4 +470,4 @@
             </plugins>
         </pluginManagement>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-agency-metadata/pom.xml b/onebusaway-agency-metadata/pom.xml
index d5b312f4d..6d42f0e27 100644
--- a/onebusaway-agency-metadata/pom.xml
+++ b/onebusaway-agency-metadata/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onebusaway</groupId>
@@ -76,10 +78,10 @@
   <build>
     <resources>
       <resource>
-	<directory>src/main/resources</directory>
-	<filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
       </resource>
     </resources>
   </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-alerts-api/pom.xml b/onebusaway-alerts-api/pom.xml
index 99f6859a9..e3222a426 100644
--- a/onebusaway-alerts-api/pom.xml
+++ b/onebusaway-alerts-api/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <parent>
         <artifactId>onebusaway-application-modules</artifactId>
         <groupId>org.onebusaway</groupId>
@@ -53,11 +55,10 @@
                               We don't actually want to build gtfs-realtime.proto, since it's included in
                               io.mobilitydata.transit:gtfs-realtime-bindings, but we do need it to be available for the extension
                               .proto files to import. Thus, it is excluded here.
-                             -->
-                            com/google/transit/realtime/gtfs-realtime.proto
-                        </exclude>
+                             --> com/google/transit/realtime/gtfs-realtime.proto </exclude>
                     </excludes>
-                    <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>
+                        com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
                 </configuration>
             </plugin>
             <!-- This is where we control the master plugin version used by all modules -->
diff --git a/onebusaway-alerts-persistence/pom.xml b/onebusaway-alerts-persistence/pom.xml
index b65b9b92c..82c3165a1 100644
--- a/onebusaway-alerts-persistence/pom.xml
+++ b/onebusaway-alerts-persistence/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<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">
+<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>org.onebusaway</groupId>
@@ -43,11 +45,11 @@
 			<artifactId>gson</artifactId>
 			<version>2.1</version>
 		</dependency>
-			<dependency>
-				<groupId>joda-time</groupId>
-				<artifactId>joda-time</artifactId>
-				<version>2.0</version>
-			</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>2.0</version>
+		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
@@ -94,10 +96,10 @@
 			<artifactId>onebusaway-gtfs-realtime-api</artifactId>
 			<version>${gtfs-api-version}</version>
 		</dependency>
-	<dependency>
-		<groupId>org.apache.httpcomponents</groupId>
-		<artifactId>httpclient</artifactId>
-	</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<!-- This is where we control the master plugin version used by all modules -->
@@ -110,4 +112,4 @@
 	</build>
 
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-api-core/pom.xml b/onebusaway-api-core/pom.xml
index a15febb8b..068bf8df9 100644
--- a/onebusaway-api-core/pom.xml
+++ b/onebusaway-api-core/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onebusaway</groupId>
@@ -36,4 +38,4 @@
     </dependency>
   </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-api-webapp/pom.xml b/onebusaway-api-webapp/pom.xml
index 50560afcf..eec5f2bcb 100644
--- a/onebusaway-api-webapp/pom.xml
+++ b/onebusaway-api-webapp/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onebusaway</groupId>
@@ -10,9 +12,9 @@
 
   <name>onebusaway-api-webapp</name>
 
-    <properties>
-        <log4j.appender>ROLL</log4j.appender>
-    </properties>
+  <properties>
+    <log4j.appender>ROLL</log4j.appender>
+  </properties>
 
   <dependencies>
 
@@ -46,25 +48,26 @@
     </dependency>
     -->
     <dependency>
-        <groupId>org.onebusaway</groupId>
-        <artifactId>onebusaway-siri-api-v13</artifactId>
-        <version>${onebusaway-siri-1-api-version}</version>
+      <groupId>org.onebusaway</groupId>
+      <artifactId>onebusaway-siri-api-v13</artifactId>
+      <version>${onebusaway-siri-1-api-version}</version>
     </dependency>
     <dependency>
-        <groupId>org.onebusaway</groupId>
-        <artifactId>onebusaway-siri-api-v20</artifactId>
-        <version>${onebusaway-siri-2-api-version}</version>
+      <groupId>org.onebusaway</groupId>
+      <artifactId>onebusaway-siri-api-v20</artifactId>
+      <version>${onebusaway-siri-2-api-version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.onebusaway</groupId>
       <artifactId>onebusaway-siri-core</artifactId>
       <version>${onebusaway-siri-version}</version>
-        <exclusions>
-            <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-            </exclusion></exclusions>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- For GTFS-realtime support -->
@@ -72,11 +75,12 @@
       <groupId>org.onebusaway</groupId>
       <artifactId>onebusaway-gtfs-realtime-api</artifactId>
       <version>${gtfs-api-version}</version>
-        <exclusions>
-            <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-            </exclusion></exclusions>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
 
@@ -99,40 +103,40 @@
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-convention-plugin</artifactId>
     </dependency>
-      <dependency>
+    <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-rest-plugin</artifactId>
     </dependency>
     <!-- This provides support for Struts2 Rome rss result type -->
     <!-- rome is no longer supported -->
-<!--    <dependency>-->
-<!--        <groupId>com.googlecode.s2rome</groupId>-->
-<!--        <artifactId>struts2-rome-plugin</artifactId>-->
-<!--        <version>0.3</version>-->
-<!--        <exclusions>-->
-<!--            <exclusion>-->
-<!--                <groupId>org.slf4j</groupId>-->
-<!--                <artifactId>slf4j-api</artifactId>-->
-<!--            </exclusion>-->
-<!--        </exclusions>-->
-<!--    </dependency>-->
-      <dependency>
-          <groupId>net.sf.json-lib</groupId>
-          <artifactId>json-lib</artifactId>
-          <version>2.4</version>
-          <classifier>jdk15</classifier>
-      </dependency>
+    <!--    <dependency>-->
+    <!--        <groupId>com.googlecode.s2rome</groupId>-->
+    <!--        <artifactId>struts2-rome-plugin</artifactId>-->
+    <!--        <version>0.3</version>-->
+    <!--        <exclusions>-->
+    <!--            <exclusion>-->
+    <!--                <groupId>org.slf4j</groupId>-->
+    <!--                <artifactId>slf4j-api</artifactId>-->
+    <!--            </exclusion>-->
+    <!--        </exclusions>-->
+    <!--    </dependency>-->
+    <dependency>
+      <groupId>net.sf.json-lib</groupId>
+      <artifactId>json-lib</artifactId>
+      <version>2.4</version>
+      <classifier>jdk15</classifier>
+    </dependency>
     <!-- Rome framework for RSS support -->
     <dependency>
-        <groupId>com.rometools</groupId>
-        <artifactId>rome</artifactId>
-        <version>1.7.0</version>
-        <exclusions>
-            <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-            </exclusion>
-        </exclusions>
+      <groupId>com.rometools</groupId>
+      <artifactId>rome</artifactId>
+      <version>1.7.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- We use HttpServletRequest in XmlResult -->
     <dependency>
@@ -146,33 +150,33 @@
       <groupId>com.notnoop.apns</groupId>
       <artifactId>apns</artifactId>
       <version>0.1.6</version>
-        <exclusions>
-            <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-            </exclusion>
-        </exclusions>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
-<!--       Log4j 2 -->
-      <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-api</artifactId>
-          <version>${log4j.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-          <version>${log4j.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j-impl</artifactId>
-          <version>${log4j.version}</version>
-      </dependency>
+    <!--       Log4j 2 -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
 
-      <!-- Log4j 1 -->
-<!--      <dependency>
+    <!-- Log4j 1 -->
+    <!--      <dependency>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>
           <version>${slf4j.version}</version>
@@ -182,7 +186,7 @@
           <artifactId>slf4j-log4j12</artifactId>
           <version>${slf4j.version}</version>
       </dependency>-->
-<!--      <dependency>
+    <!--      <dependency>
           <groupId>log4j</groupId>
           <artifactId>log4j</artifactId>
           <version>1.2.16</veapi-webapprsion>
@@ -194,11 +198,11 @@
       </dependency>-->
 
 
-      <dependency>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-          <version>1.2</version>
-      </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>
@@ -207,71 +211,72 @@
     </dependency>
 
     <!--  support mysql out of the box -->
-      <dependency>
-          <groupId>com.mysql</groupId>
-          <artifactId>mysql-connector-j</artifactId>
-      </dependency>
+    <dependency>
+      <groupId>com.mysql</groupId>
+      <artifactId>mysql-connector-j</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-   	<dependency>
-		<groupId>org.tuckey</groupId>
-		<artifactId>urlrewritefilter</artifactId>
-		<version>3.2.0</version>
-		<type>jar</type>
-		<scope>compile</scope>
-	</dependency>
-	<dependency>
-    	<groupId>com.brsanthu</groupId>
-    	<artifactId>google-analytics-java</artifactId>
-        <exclusions>
-            <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>jcl-over-slf4j</artifactId>
-            </exclusion>
-        </exclusions>
-	</dependency>
-	<dependency>
-		<groupId>org.apache.httpcomponents</groupId>
-		<artifactId>httpclient</artifactId>
-	</dependency>
+    <dependency>
+      <groupId>org.tuckey</groupId>
+      <artifactId>urlrewritefilter</artifactId>
+      <version>3.2.0</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.brsanthu</groupId>
+      <artifactId>google-analytics-java</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl-over-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
     <finalName>onebusaway-api-webapp</finalName>
     <plugins>
-	  <plugin>
-		<groupId>pl.project13.maven</groupId>
-		<artifactId>git-commit-id-plugin</artifactId>
-		<version>2.2.1</version>
-		<executions>
-		  <execution>
-		    <goals>
-			  <goal>revision</goal>
-			</goals>
-		  </execution>
-		</executions>
-		<configuration>
-		  <prefix>git</prefix>
-		  <dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
-		  <verbose>false</verbose>
-		  <skipPoms>false</skipPoms>
-		  <generateGitPropertiesFile>true</generateGitPropertiesFile>
-		  <generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
-  		  <!--  travis takes some shortcuts with git so we need to tell the plugin to ignore git errors -->
-		  <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
-		  <failOnNoGitDirectory>false</failOnNoGitDirectory>
-		  <gitDescribe>
-			<skip>false</skip>
-			<always>true</always>
-			<abbrev>7</abbrev>
-			<dirty>-dirty</dirty>
-			<forceLongFormat>false</forceLongFormat>
-		  </gitDescribe>
-		</configuration>
-	  </plugin>
+      <plugin>
+        <groupId>pl.project13.maven</groupId>
+        <artifactId>git-commit-id-plugin</artifactId>
+        <version>2.2.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>revision</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <prefix>git</prefix>
+          <dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
+          <verbose>false</verbose>
+          <skipPoms>false</skipPoms>
+          <generateGitPropertiesFile>true</generateGitPropertiesFile>
+          <generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
+          <!--  travis takes some shortcuts with git so we need to tell the plugin to ignore git
+          errors -->
+          <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
+          <failOnNoGitDirectory>false</failOnNoGitDirectory>
+          <gitDescribe>
+            <skip>false</skip>
+            <always>true</always>
+            <abbrev>7</abbrev>
+            <dirty>-dirty</dirty>
+            <forceLongFormat>false</forceLongFormat>
+          </gitDescribe>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -296,10 +301,10 @@
     </plugins>
     <resources>
       <resource>
-          <directory>src/main/resources</directory>
-          <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
       </resource>
     </resources>
   </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-combined-webapp/pom.xml b/onebusaway-combined-webapp/pom.xml
index 42ded9fe5..4c67f06c9 100644
--- a/onebusaway-combined-webapp/pom.xml
+++ b/onebusaway-combined-webapp/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onebusaway</groupId>
@@ -59,4 +61,4 @@
     </plugins>
   </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-container/pom.xml b/onebusaway-container/pom.xml
index 565781219..9fc0ae52b 100644
--- a/onebusaway-container/pom.xml
+++ b/onebusaway-container/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onebusaway</groupId>
@@ -15,8 +17,7 @@
     </properties>
 
     <dependencies>
-
-        <!--       Log4j 2 -->
+        <!-- Log4j 2 -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
@@ -144,4 +145,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-core/pom.xml b/onebusaway-core/pom.xml
index d5ab2a4bb..1274682f1 100644
--- a/onebusaway-core/pom.xml
+++ b/onebusaway-core/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onebusaway</groupId>
@@ -35,4 +37,4 @@
         </dependency>
 
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-enterprise-acta-webapp/pom.xml b/onebusaway-enterprise-acta-webapp/pom.xml
index 1db61b03b..b13e411e9 100644
--- a/onebusaway-enterprise-acta-webapp/pom.xml
+++ b/onebusaway-enterprise-acta-webapp/pom.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0"?>
-<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>
-    <artifactId>onebusaway-application-modules</artifactId>
-    <groupId>org.onebusaway</groupId>
-    <version>2.5.13-otsf</version>
-  </parent>
-  <artifactId>onebusaway-enterprise-acta-webapp</artifactId>
-  <packaging>war</packaging>
+<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>
+		<artifactId>onebusaway-application-modules</artifactId>
+		<groupId>org.onebusaway</groupId>
+		<version>2.5.13-otsf</version>
+	</parent>
+	<artifactId>onebusaway-enterprise-acta-webapp</artifactId>
+	<packaging>war</packaging>
 
-  <name>onebusaway-enterprise-acta-webapp</name>
+	<name>onebusaway-enterprise-acta-webapp</name>
 
 
-  	<properties>
+	<properties>
 		<branding-webapp>{project.name}</branding-webapp>
 		<jetty.version>9.4.51.v20230217</jetty.version>
 		<xwiki.integration.version>1.0.1</xwiki.integration.version>
@@ -27,16 +29,16 @@
 		</repository>
 	</repositories>
 
-  <dependencies>
-    <dependency>
-		<groupId>org.onebusaway</groupId>
-		<artifactId>onebusaway-enterprise-webapp</artifactId>
-		<version>${project.version}</version>
-		<type>war</type>
-	</dependency>
-  </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.onebusaway</groupId>
+			<artifactId>onebusaway-enterprise-webapp</artifactId>
+			<version>${project.version}</version>
+			<type>war</type>
+		</dependency>
+	</dependencies>
 
-  <profiles>
+	<profiles>
 		<profile>
 			<id>cloud</id> <!-- aka services-dev --> <!-- aka staging, production -->
 			<activation>
@@ -55,9 +57,12 @@
 		<profile>
 			<id>local-front-end</id>
 			<properties>
-				<tds.path>http://sms.dev.obanyc.com:8080/onebusaway-nyc-transit-data-federation-webapp</tds.path>
-				<vtms.path>http://sms.dev.obanyc.com:8080/onebusaway-nyc-transit-data-federation-webapp</vtms.path>
-				<config.path>http://sms.dev.obanyc.com:8080/onebusaway-nyc-transit-data-federation-webapp</config.path>
+				<tds.path>
+					http://sms.dev.obanyc.com:8080/onebusaway-nyc-transit-data-federation-webapp</tds.path>
+				<vtms.path>
+					http://sms.dev.obanyc.com:8080/onebusaway-nyc-transit-data-federation-webapp</vtms.path>
+				<config.path>
+					http://sms.dev.obanyc.com:8080/onebusaway-nyc-transit-data-federation-webapp</config.path>
 				<archive.path>http://archive.dev.obanyc.com/onebusaway-nyc-report-archive</archive.path>
 				<log4j.appender>stdout</log4j.appender>
 				<create-apikey>true</create-apikey>
@@ -101,7 +106,7 @@
 		<profile>
 			<id>eclipse-only</id>
 			<dependencies>
-					<!-- OneBusAway Dependencies -->
+				<!-- OneBusAway Dependencies -->
 				<dependency>
 					<groupId>org.onebusaway</groupId>
 					<artifactId>onebusaway-presentation</artifactId>
@@ -159,42 +164,43 @@
 					<version>1.2.2</version>
 				</dependency>
 				<dependency>
-			      <groupId>javax.servlet</groupId>
-			      <artifactId>jsp-api</artifactId>
-			      <scope>provided</scope>
-			    </dependency>
-			    <dependency>
-			      <groupId>javax.servlet</groupId>
-			      <artifactId>jstl</artifactId>
-			    </dependency>
+					<groupId>javax.servlet</groupId>
+					<artifactId>jsp-api</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>javax.servlet</groupId>
+					<artifactId>jstl</artifactId>
+				</dependency>
 			</dependencies>
 		</profile>
 	</profiles>
-  <build>
-    <finalName>onebusaway-enterprise-acta-webapp</finalName>
-    <plugins>
+	<build>
+		<finalName>onebusaway-enterprise-acta-webapp</finalName>
+		<plugins>
 
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-maven-plugin</artifactId>				<version>${jetty.version}</version>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>${jetty.version}</version>
 				<configuration>
 					<contextPath>/</contextPath>
 				</configuration>
 			</plugin>
-	</plugins>
-	<resources>
-		<resource>
-			<directory>src/main/resources</directory>
-			<filtering>true</filtering>
-			<includes>
-				<include>**/*.properties</include>
-				<include>**/*.xml</include>
-			</includes>
-		</resource>
-	</resources>
-	<pluginManagement>
+		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>**/*.properties</include>
+					<include>**/*.xml</include>
+				</includes>
+			</resource>
+		</resources>
+		<pluginManagement>
 			<plugins>
-			<!-- This tells eclipse to when to execute the git-commit plugin -->
+				<!-- This tells eclipse to when to execute the git-commit plugin -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
@@ -229,24 +235,24 @@
 					</configuration>
 				</plugin>
 				<plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <archive>
-                            <manifestEntries>
-                                <Implementation-Build>${gitDescribe}</Implementation-Build>
-                            </manifestEntries>
-                        </archive>
-                        <overlays>
-                        	<overlay>
-              					<groupId>org.onebusaway</groupId>
-              					<artifactId>onebusaway-enterprise-webapp</artifactId>
-              				</overlay>
-                        </overlays>
-                    </configuration>
-                </plugin>
-                <plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-war-plugin</artifactId>
+					<version>2.1</version>
+					<configuration>
+						<archive>
+							<manifestEntries>
+								<Implementation-Build>${gitDescribe}</Implementation-Build>
+							</manifestEntries>
+						</archive>
+						<overlays>
+							<overlay>
+								<groupId>org.onebusaway</groupId>
+								<artifactId>onebusaway-enterprise-webapp</artifactId>
+							</overlay>
+						</overlays>
+					</configuration>
+				</plugin>
+				<plugin>
 					<groupId>com.mycila</groupId>
 					<artifactId>license-maven-plugin</artifactId>
 					<configuration>
@@ -261,5 +267,5 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
-  </build>
-</project>
+	</build>
+</project>
\ No newline at end of file
diff --git a/onebusaway-enterprise-webapp/pom.xml b/onebusaway-enterprise-webapp/pom.xml
index 5fc7f0772..fce52d10c 100644
--- a/onebusaway-enterprise-webapp/pom.xml
+++ b/onebusaway-enterprise-webapp/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<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">
+<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>
@@ -54,10 +56,10 @@
 		</dependency>
 
 		<dependency>
-	      <groupId>org.onebusaway</groupId>
-	      <artifactId>onebusaway-agency-metadata</artifactId>
-	      <version>${project.version}</version>
-	    </dependency>
+			<groupId>org.onebusaway</groupId>
+			<artifactId>onebusaway-agency-metadata</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>org.onebusaway</groupId>
@@ -105,12 +107,12 @@
 			<version>${xwiki.integration.version}</version>
 		</dependency>
 
-        <!-- Rome framework for RSS support -->
-        <dependency>
-            <groupId>com.rometools</groupId>
-            <artifactId>rome</artifactId>
-            <version>1.7.0</version>
-        </dependency>
+		<!-- Rome framework for RSS support -->
+		<dependency>
+			<groupId>com.rometools</groupId>
+			<artifactId>rome</artifactId>
+			<version>1.7.0</version>
+		</dependency>
 
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
@@ -165,13 +167,13 @@
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>
 		</dependency>
-		 <!-- for maps -->
-        <dependency>
-            <groupId>org.onebusaway</groupId>
-            <artifactId>onebusaway-frontend-webapp</artifactId>
-            <version>${project.version}</version>
-            <type>war</type>
-        </dependency>
+		<!-- for maps -->
+		<dependency>
+			<groupId>org.onebusaway</groupId>
+			<artifactId>onebusaway-frontend-webapp</artifactId>
+			<version>${project.version}</version>
+			<type>war</type>
+		</dependency>
 
 	</dependencies>
 
@@ -263,7 +265,8 @@
 					<skipPoms>false</skipPoms>
 					<generateGitPropertiesFile>false</generateGitPropertiesFile>
 					<generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
-					<!--  travis takes some shortcuts with git so we need to tell the plugin to ignore git errors -->
+					<!--  travis takes some shortcuts with git so we need to tell the plugin to
+					ignore git errors -->
 					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
 					<gitDescribe>
@@ -331,42 +334,42 @@
 					</configuration>
 				</plugin>
 				<plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <archive>
-                            <manifestEntries>
-                                <Implementation-Build>${gitDescribe}</Implementation-Build>
-                            </manifestEntries>
-                        </archive>
-                        <overlays>
-                            <overlay>
-                                <groupId>org.onebusaway</groupId>
-                                <artifactId>onebusaway-frontend-webapp</artifactId>
-                            </overlay>
-                        </overlays>
-                    </configuration>
-                </plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-war-plugin</artifactId>
+					<version>2.1</version>
+					<configuration>
+						<archive>
+							<manifestEntries>
+								<Implementation-Build>${gitDescribe}</Implementation-Build>
+							</manifestEntries>
+						</archive>
+						<overlays>
+							<overlay>
+								<groupId>org.onebusaway</groupId>
+								<artifactId>onebusaway-frontend-webapp</artifactId>
+							</overlay>
+						</overlays>
+					</configuration>
+				</plugin>
 				<plugin>
-				  <groupId>com.mycila</groupId>
-				  <artifactId>license-maven-plugin</artifactId>
-				  <version>2.12</version>
+					<groupId>com.mycila</groupId>
+					<artifactId>license-maven-plugin</artifactId>
+					<version>2.12</version>
 
-				<configuration>
-					<excludes combine.children="append">
-						<exclude>**/dateFormat.js</exclude>
-						<exclude>**/popover.js</exclude>
-						<exclude>**/GoogleTranslate.js</exclude>
-						<exclude>**/markerManager.js</exclude>
-						<exclude>**/markerAnimate.js</exclude>
-						<exclude>**/rgbcolor.js</exclude>
-						<exclude>**/*.properties</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
+					<configuration>
+						<excludes combine.children="append">
+							<exclude>**/dateFormat.js</exclude>
+							<exclude>**/popover.js</exclude>
+							<exclude>**/GoogleTranslate.js</exclude>
+							<exclude>**/markerManager.js</exclude>
+							<exclude>**/markerAnimate.js</exclude>
+							<exclude>**/rgbcolor.js</exclude>
+							<exclude>**/*.properties</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-federations-webapp/pom.xml b/onebusaway-federations-webapp/pom.xml
index 1411db56a..2006cbc3c 100644
--- a/onebusaway-federations-webapp/pom.xml
+++ b/onebusaway-federations-webapp/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>onebusaway-application-modules</artifactId>
@@ -102,66 +104,6 @@
                     </execution>
                 </executions>
             </plugin>
-<!--            <plugin>-->
-<!--                <groupId>org.codehaus.cargo</groupId>-->
-<!--                <artifactId>cargo-maven2-plugin</artifactId>-->
-<!--                <configuration>-->
-<!--                    <configuration>-->
-<!--                        <home>${project.build.directory}/tomcat7x/container</home>-->
-<!--                        <properties>-->
-<!--                            <cargo.jvmargs>${cargo.jvmargs}</cargo.jvmargs>-->
-<!--                            <cargo.servlet.port>${org_onebusaway_test_port}</cargo.servlet.port>-->
-<!--                            <cargo.tomcat.ajp.port>${org_onebusaway_test_ajp_port}</cargo.tomcat.ajp.port>-->
-<!--                            <cargo.rmi.port>${org_onebusaway_test_rmi_port}</cargo.rmi.port>-->
-<!--                        </properties>-->
-<!--                    </configuration>-->
-<!--                    <container>-->
-<!--                        <containerId>tomcat7x</containerId>-->
-<!--                        <zipUrlInstaller>-->
-<!--                            <url>http://developer.onebusaway.org/dist/apache-tomcat-${tomcat-version}.zip</url>-->
-<!--                            <extractDir>${java.io.tmpdir}/cargo-installs</extractDir>-->
-<!--                        </zipUrlInstaller>-->
-<!--                    </container>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>start-container</id>-->
-<!--                        <phase>pre-integration-test</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>start</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                    <execution>-->
-<!--                        <id>deploy-service-registry</id>-->
-<!--                        <phase>pre-integration-test</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>deployer-deploy</goal>-->
-<!--                        </goals>-->
-<!--                        <configuration>-->
-<!--                            <deployer>-->
-<!--                                <type>installed</type>-->
-<!--                            </deployer>-->
-<!--                            <deployables>-->
-<!--                                <deployable>-->
-<!--                                    <groupId>org.onebusaway</groupId>-->
-<!--                                    <artifactId>onebusaway-federations-webapp</artifactId>-->
-<!--                                    <type>war</type>-->
-<!--                                    <properties>-->
-<!--                                        <context>onebusaway-federations-webapp</context>-->
-<!--                                    </properties>-->
-<!--                                    <pingURL>http://localhost:${org_onebusaway_test_port}/onebusaway-federations-webapp/remoting/index.action</pingURL>-->
-<!--                                </deployable>-->
-<!--                            </deployables>-->
-<!--                        </configuration>-->
-<!--                    </execution>-->
-<!--                    <execution>-->
-<!--                        <phase>post-integration-test</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>stop</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-federations/pom.xml b/onebusaway-federations/pom.xml
index cc73cce8d..03ccab726 100644
--- a/onebusaway-federations/pom.xml
+++ b/onebusaway-federations/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onebusaway</groupId>
@@ -51,7 +53,6 @@
         </dependency>
 
 
-
         <!-- RMI-like service for wiring up services between VMs -->
         <dependency>
             <groupId>com.caucho</groupId>
@@ -75,10 +76,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-        	<groupId>org.mortbay.jetty</groupId>
-        	<artifactId>jetty</artifactId>
-        	<version>6.1.22</version>
-        	<scope>test</scope>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.22</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-frontend-webapp/pom.xml b/onebusaway-frontend-webapp/pom.xml
index 8df30ac1f..54e0e5f2a 100644
--- a/onebusaway-frontend-webapp/pom.xml
+++ b/onebusaway-frontend-webapp/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <parent>
         <artifactId>onebusaway-application-modules</artifactId>
         <groupId>org.onebusaway</groupId>
@@ -115,4 +117,4 @@
             </plugins>
         </pluginManagement>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-geocoder/pom.xml b/onebusaway-geocoder/pom.xml
index d8545f6ad..389285947 100644
--- a/onebusaway-geocoder/pom.xml
+++ b/onebusaway-geocoder/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>onebusaway-application-modules</artifactId>
@@ -10,7 +12,7 @@
     <name>onebusaway-geocoder</name>
 
     <properties>
-    	<geotools.version>20.5</geotools.version>
+        <geotools.version>20.5</geotools.version>
     </properties>
 
     <repositories> <!-- remove after copying to repo.camsys-apps.com -->
@@ -80,27 +82,27 @@
             <artifactId>hsqldb</artifactId>
             <scope>test</scope>
         </dependency>
-          <dependency>
+        <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
         <dependency>
-			<groupId>org.geotools</groupId>
-			<artifactId>gt-main</artifactId>
-			<version>${geotools.version}</version>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-main</artifactId>
+            <version>${geotools.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-core</artifactId>
                 </exclusion>
             </exclusions>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.4</version>
-			<scope>provided</scope>
-		</dependency>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.4</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- java 11 does not bundle xml parsers -->
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
@@ -114,4 +116,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-geospatial/pom.xml b/onebusaway-geospatial/pom.xml
index b52bf6fea..cf808eee2 100644
--- a/onebusaway-geospatial/pom.xml
+++ b/onebusaway-geospatial/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>onebusaway-application-modules</artifactId>
@@ -32,4 +34,4 @@
 		</dependency>
 	</dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-gtfs-hibernate-spring/pom.xml b/onebusaway-gtfs-hibernate-spring/pom.xml
index 594b1b093..097f252cb 100644
--- a/onebusaway-gtfs-hibernate-spring/pom.xml
+++ b/onebusaway-gtfs-hibernate-spring/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>onebusaway-gtfs-hibernate-spring</artifactId>
   <name>onebusaway-gtfs-hibernate-spring</name>
@@ -20,4 +22,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-gtfs-realtime-archiver/pom.xml b/onebusaway-gtfs-realtime-archiver/pom.xml
index 5cd0e91da..4a5f424f3 100644
--- a/onebusaway-gtfs-realtime-archiver/pom.xml
+++ b/onebusaway-gtfs-realtime-archiver/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onebusaway</groupId>
@@ -132,4 +134,4 @@
     </resources>
   </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-gtfs-realtime-model/pom.xml b/onebusaway-gtfs-realtime-model/pom.xml
index 4d8ddaf56..5e3896f2e 100644
--- a/onebusaway-gtfs-realtime-model/pom.xml
+++ b/onebusaway-gtfs-realtime-model/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onebusaway</groupId>
@@ -10,49 +12,41 @@
   <packaging>jar</packaging>
 
   <dependencies>
-   <!--
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.onebusaway</groupId>
-      <artifactId>onebusaway-gtfs-realtime-api</artifactId>
-      <version>${gtfs-api-version}</version>
-    </dependency> -->
-
-      <!--       Log4j 2 -->
-      <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-api</artifactId>
-          <version>${log4j.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-          <version>${log4j.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j-impl</artifactId>
-          <version>${log4j.version}</version>
-      </dependency>
-	    <dependency>
-	      <groupId>org.onebusaway</groupId>
-	      <artifactId>onebusaway-container</artifactId>
-	      <version>2.5.13-otsf</version>
-	    </dependency>
+      <artifactId>onebusaway-container</artifactId>
+      <version>2.5.13-otsf</version>
+    </dependency>
 
-	<dependency>
+    <dependency>
       <groupId>org.onebusaway</groupId>
       <artifactId>onebusaway-gtfs-realtime-api</artifactId>
       <version>${gtfs-api-version}</version>
     </dependency>
 
-     <dependency>
+    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
       <version>3.8.1</version>
     </dependency>
 
 
-	</dependencies>
+  </dependencies>
 
 
   <build>
@@ -65,4 +59,4 @@
     </plugins>
   </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-gtfsrt-integration-tests/pom.xml b/onebusaway-gtfsrt-integration-tests/pom.xml
index 700b4182d..72e7d85d0 100644
--- a/onebusaway-gtfsrt-integration-tests/pom.xml
+++ b/onebusaway-gtfsrt-integration-tests/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onebusaway</groupId>
@@ -43,9 +45,9 @@
 
     <!-- for S3BundleStoreImpl -->
     <dependency>
-        <groupId>org.onebusaway</groupId>
-        <artifactId>onebusaway-cloud-aws</artifactId>
-        <version>0.0.12</version>
+      <groupId>org.onebusaway</groupId>
+      <artifactId>onebusaway-cloud-aws</artifactId>
+      <version>0.0.12</version>
     </dependency>
 
 
@@ -95,18 +97,18 @@
       <scope>test</scope>
     </dependency>
 
-   <dependency>
-   		<groupId>com.google.code.gson</groupId>
-   		<artifactId>gson</artifactId>
-   		<version>2.8.9</version>
-   		<type>jar</type>
-   		<scope>compile</scope>
-   </dependency>
-	 <dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>2.0</version>
-		</dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.8.9</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.0</version>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-jaxb-annotations</artifactId>
@@ -132,4 +134,4 @@
 
   </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-gwt-common/pom.xml b/onebusaway-gwt-common/pom.xml
index 5b31eee94..39113d0e8 100644
--- a/onebusaway-gwt-common/pom.xml
+++ b/onebusaway-gwt-common/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.onebusaway</groupId>
         <artifactId>onebusaway-application-modules</artifactId>
@@ -68,16 +70,6 @@
                 <artifactId>gwt-maven-plugin</artifactId>
                 <configuration>
                     <modules>
-                        <!--
-                        <module>org.onebusaway.webapp.gwt.AgenciesMap</module>
-                        <module>org.onebusaway.webapp.gwt.BookmarkEditApplication</module>
-                        <module>org.onebusaway.webapp.gwt.MobileApplication</module>
-                        <module>org.onebusaway.webapp.gwt.NotificationWidgetApplication</module>
-                        <module>org.onebusaway.webapp.gwt.OneBusAwayStandardApplication</module>
-                        <module>org.onebusaway.webapp.gwt.SearchLocationLibrary</module>
-                        <module>org.onebusaway.webapp.gwt.WhereStopFinderRefineViewApplication</module>
-                        <module>org.onebusaway.webapp.gwt.WhereStopFinderStandardApplication</module>
-                        -->
                     </modules>
                     <gwtVersion>${gwt-version}</gwtVersion>
                     <webappDirectory>${project.build.directory}/gwt</webappDirectory>
@@ -96,4 +88,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-nextbus-api-webapp/pom.xml b/onebusaway-nextbus-api-webapp/pom.xml
index a1f4d9fae..24922a117 100644
--- a/onebusaway-nextbus-api-webapp/pom.xml
+++ b/onebusaway-nextbus-api-webapp/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.onebusaway</groupId>
@@ -219,7 +221,8 @@
 					<skipPoms>false</skipPoms>
 					<generateGitPropertiesFile>true</generateGitPropertiesFile>
 					<generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
-					<!--  travis takes some shortcuts with git so we need to tell the plugin to ignore git errors -->
+					<!--  travis takes some shortcuts with git so we need to tell the plugin to
+					ignore git errors -->
 					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
 					<gitDescribe>
@@ -255,4 +258,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-phone-webapp/pom.xml b/onebusaway-phone-webapp/pom.xml
index d8d6ef292..85ab2fee4 100644
--- a/onebusaway-phone-webapp/pom.xml
+++ b/onebusaway-phone-webapp/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<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">
+<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>
         <artifactId>onebusaway-application-modules</artifactId>
@@ -24,14 +26,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-	      <groupId>javax.servlet</groupId>
-	      <artifactId>jsp-api</artifactId>
-	      <scope>provided</scope>
-	    </dependency>
-	    <dependency>
-	      <groupId>javax.servlet</groupId>
-	      <artifactId>jstl</artifactId>
-	    </dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -61,4 +63,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-phone/pom.xml b/onebusaway-phone/pom.xml
index 18e29fbb8..7a9d1ef73 100644
--- a/onebusaway-phone/pom.xml
+++ b/onebusaway-phone/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onebusaway</groupId>
@@ -87,13 +89,16 @@
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>withAllDependencies</shadedClassifierName>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.onebusaway.phone.PhoneServerMain</mainClass>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/spring.handlers</resource>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/spring.schemas</resource>
                                 </transformer>
                             </transformers>
@@ -104,4 +109,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-presentation/pom.xml b/onebusaway-presentation/pom.xml
index 66b1315e0..3376b57cc 100644
--- a/onebusaway-presentation/pom.xml
+++ b/onebusaway-presentation/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onebusaway</groupId>
@@ -40,10 +42,10 @@
             <version>${project.version}</version>
             <!-- exclude xml-apis so legacy gwt support code works -->
             <exclusions>
-            	<exclusion>
-            		<artifactId>xml-apis</artifactId>
-            		<groupId>xml-apis</groupId>
-            	</exclusion>
+                <exclusion>
+                    <artifactId>xml-apis</artifactId>
+                    <groupId>xml-apis</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -56,16 +58,16 @@
             <artifactId>onebusaway-geocoder</artifactId>
             <version>${project.version}</version>
         </dependency>
-	    <dependency>
-			<groupId>org.onebusaway</groupId>
-			<artifactId>onebusaway-util</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.onebusaway</groupId>
-			<artifactId>onebusaway-siri-core</artifactId>
-			<version>${onebusaway-siri-version}</version>
-	    </dependency>
+        <dependency>
+            <groupId>org.onebusaway</groupId>
+            <artifactId>onebusaway-util</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onebusaway</groupId>
+            <artifactId>onebusaway-siri-core</artifactId>
+            <version>${onebusaway-siri-version}</version>
+        </dependency>
 
         <!-- RMI-like service for wiring up services between VMs -->
         <dependency>
@@ -85,27 +87,27 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
         </dependency>
-      <dependency>
-          <groupId>org.ow2.asm</groupId>
-          <artifactId>asm</artifactId>
-          <version>${asm-version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.ow2.asm</groupId>
-          <artifactId>asm-commons</artifactId>
-          <version>${asm-version}</version>
-      </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>${asm-version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
         </dependency>
 
         <dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts2-sitemesh-plugin</artifactId>
-		</dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-sitemesh-plugin</artifactId>
+        </dependency>
 
-		<dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
@@ -156,18 +158,18 @@
             <version>2.8.1</version>
         </dependency>
         <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onebusaway.util</groupId>
+            <artifactId>comparators</artifactId>
+            <version>1.0.0</version>
         </dependency>
-		<dependency>
-			<groupId>org.onebusaway.util</groupId>
-			<artifactId>comparators</artifactId>
-			<version>1.0.0</version>
-		</dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
         </dependency>
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-quickstart/pom.xml b/onebusaway-quickstart/pom.xml
index c01bde840..de7f6b33e 100644
--- a/onebusaway-quickstart/pom.xml
+++ b/onebusaway-quickstart/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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>org.onebusaway</groupId>
@@ -49,4 +51,4 @@
     </dependencies>
   </dependencyManagement>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-realtime-api/pom.xml b/onebusaway-realtime-api/pom.xml
index 85b8e589a..f05eda69e 100644
--- a/onebusaway-realtime-api/pom.xml
+++ b/onebusaway-realtime-api/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onebusaway</groupId>
@@ -17,4 +19,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-sms-webapp/pom.xml b/onebusaway-sms-webapp/pom.xml
index 2ca8033b2..757daa1fc 100644
--- a/onebusaway-sms-webapp/pom.xml
+++ b/onebusaway-sms-webapp/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<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">
+<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>
@@ -53,28 +55,28 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-	      <groupId>javax.servlet</groupId>
-	      <artifactId>jsp-api</artifactId>
-	      <scope>provided</scope>
-	    </dependency>
-	    <dependency>
-	      <groupId>javax.servlet</groupId>
-	      <artifactId>jstl</artifactId>
-	    </dependency>
-	      <dependency>
-    	  <groupId>com.brsanthu</groupId>
-    	  <artifactId>google-analytics-java</artifactId>
-          <exclusions>
-              <exclusion>
-                  <groupId>org.slf4j</groupId>
-                  <artifactId>jcl-over-slf4j</artifactId>
-              </exclusion>
-          </exclusions>
-		</dependency>
-	    <dependency>
-		  <groupId>org.apache.httpcomponents</groupId>
-		  <artifactId>httpclient</artifactId>
-		</dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.brsanthu</groupId>
+            <artifactId>google-analytics-java</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -104,4 +106,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-status-agent/pom.xml b/onebusaway-status-agent/pom.xml
index 2aa4c506f..a17872d5d 100644
--- a/onebusaway-status-agent/pom.xml
+++ b/onebusaway-status-agent/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <parent>
         <artifactId>onebusaway-application-modules</artifactId>
         <groupId>org.onebusaway</groupId>
@@ -49,13 +51,16 @@
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>withAllDependencies</shadedClassifierName>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.onebusaway.statusagent.StatusAgentMain</mainClass>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/spring.handlers</resource>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/spring.schemas</resource>
                                 </transformer>
                             </transformers>
diff --git a/onebusaway-transit-data-federation-builder/pom.xml b/onebusaway-transit-data-federation-builder/pom.xml
index e2ef3d634..dd33ccaf9 100644
--- a/onebusaway-transit-data-federation-builder/pom.xml
+++ b/onebusaway-transit-data-federation-builder/pom.xml
@@ -1,11 +1,13 @@
-<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>
-    <artifactId>onebusaway-application-modules</artifactId>
-    <groupId>org.onebusaway</groupId>
-    <version>2.5.13-otsf</version>
-  </parent>
-  <artifactId>onebusaway-transit-data-federation-builder</artifactId>
+<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>
+		<artifactId>onebusaway-application-modules</artifactId>
+		<groupId>org.onebusaway</groupId>
+		<version>2.5.13-otsf</version>
+	</parent>
+	<artifactId>onebusaway-transit-data-federation-builder</artifactId>
 
 	<name>onebusaway-transit-data-federation-builder</name>
 
@@ -48,7 +50,7 @@
 
 		<dependency>
 			<groupId>org.onebusaway</groupId>
-  			<artifactId>onebusaway-csv-entities</artifactId>
+			<artifactId>onebusaway-csv-entities</artifactId>
 			<exclusions>
 				<exclusion>
 					<artifactId>slf4j-api</artifactId>
@@ -129,7 +131,8 @@
 					<skipPoms>false</skipPoms>
 					<generateGitPropertiesFile>true</generateGitPropertiesFile>
 					<generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
-					<!--  travis takes some shortcuts with git so we need to tell the plugin to ignore git errors -->
+					<!--  travis takes some shortcuts with git so we need to tell the plugin to
+					ignore git errors -->
 					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
 					<gitDescribe>
@@ -153,13 +156,17 @@
 							<shadedArtifactAttached>true</shadedArtifactAttached>
 							<shadedClassifierName>withAllDependencies</shadedClassifierName>
 							<transformers>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>org.onebusaway.transit_data_federation.bundle.FederatedTransitDataBundleCreatorMain</mainClass>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>
+										org.onebusaway.transit_data_federation.bundle.FederatedTransitDataBundleCreatorMain</mainClass>
 								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
 									<resource>META-INF/spring.handlers</resource>
 								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
 									<resource>META-INF/spring.schemas</resource>
 								</transformer>
 							</transformers>
@@ -187,4 +194,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-transit-data-federation-webapp/pom.xml b/onebusaway-transit-data-federation-webapp/pom.xml
index 9ad631073..aefb1e3e6 100644
--- a/onebusaway-transit-data-federation-webapp/pom.xml
+++ b/onebusaway-transit-data-federation-webapp/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onebusaway</groupId>
@@ -110,4 +112,4 @@
     </resources>
   </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-transit-data-federation/pom.xml b/onebusaway-transit-data-federation/pom.xml
index 8e95ec0a1..d6127ff96 100644
--- a/onebusaway-transit-data-federation/pom.xml
+++ b/onebusaway-transit-data-federation/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onebusaway</groupId>
@@ -63,15 +65,15 @@
     </dependency>
 
     <dependency>
-        <groupId>org.onebusaway</groupId>
-        <artifactId>onebusaway-siri-api-v13</artifactId>
-        <version>${onebusaway-siri-1-api-version}</version>
+      <groupId>org.onebusaway</groupId>
+      <artifactId>onebusaway-siri-api-v13</artifactId>
+      <version>${onebusaway-siri-1-api-version}</version>
     </dependency>
     <!-- -->
     <dependency>
-        <groupId>org.onebusaway</groupId>
-        <artifactId>onebusaway-siri-api-v20</artifactId>
-        <version>${onebusaway-siri-2-api-version}</version>
+      <groupId>org.onebusaway</groupId>
+      <artifactId>onebusaway-siri-api-v20</artifactId>
+      <version>${onebusaway-siri-2-api-version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -95,9 +97,9 @@
     </dependency>
     <!-- for S3BundleStoreImpl -->
     <dependency>
-        <groupId>org.onebusaway</groupId>
-        <artifactId>onebusaway-cloud-aws</artifactId>
-        <version>0.0.12</version>
+      <groupId>org.onebusaway</groupId>
+      <artifactId>onebusaway-cloud-aws</artifactId>
+      <version>0.0.12</version>
     </dependency>
     <dependency>
       <groupId>org.onebusaway</groupId>
@@ -173,18 +175,18 @@
       <scope>test</scope>
     </dependency>
 
-   <dependency>
-   		<groupId>com.google.code.gson</groupId>
-   		<artifactId>gson</artifactId>
-   		<version>1.7.1</version>
-   		<type>jar</type>
-   		<scope>compile</scope>
-   </dependency>
-	 <dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>2.0</version>
-		</dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>1.7.1</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.0</version>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-jaxb-annotations</artifactId>
@@ -207,13 +209,13 @@
       <artifactId>jsch</artifactId>
       <version>0.1.53</version>
     </dependency>
-      <dependency>
-          <groupId>org.onebusaway</groupId>
-          <artifactId>onebusaway-api-core</artifactId>
-          <version>2.5.13-otsf</version>
-          <scope>compile</scope>
-      </dependency>
+    <dependency>
+      <groupId>org.onebusaway</groupId>
+      <artifactId>onebusaway-api-core</artifactId>
+      <version>2.5.13-otsf</version>
+      <scope>compile</scope>
+    </dependency>
 
   </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-transit-data/pom.xml b/onebusaway-transit-data/pom.xml
index 1fd151a17..f3c06550a 100644
--- a/onebusaway-transit-data/pom.xml
+++ b/onebusaway-transit-data/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onebusaway</groupId>
@@ -11,12 +13,6 @@
     <name>onebusaway-transit-data</name>
 
     <dependencies>
-
-        <!--
-            Note that there is no dependency on GTFS here. We abstract it away. You shouldn't go adding it unless you
-            have a very good reason.
-        -->
-
         <dependency>
             <groupId>org.onebusaway</groupId>
             <artifactId>onebusaway-federations</artifactId>
@@ -40,4 +36,4 @@
 
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-twilio-webapp/pom.xml b/onebusaway-twilio-webapp/pom.xml
index 7951fb7b0..00d0fcf1f 100644
--- a/onebusaway-twilio-webapp/pom.xml
+++ b/onebusaway-twilio-webapp/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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>
 		<artifactId>onebusaway-application-modules</artifactId>
@@ -109,4 +111,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-users/pom.xml b/onebusaway-users/pom.xml
index c388c3142..008ed97e2 100644
--- a/onebusaway-users/pom.xml
+++ b/onebusaway-users/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onebusaway</groupId>
@@ -65,15 +67,15 @@
             <version>${spring-security.version}</version>
             <groupId>org.springframework.security</groupId>
         </dependency>
-         <dependency>
-         	<artifactId>spring-security-config</artifactId>
-         	<version>${spring-security.version}</version>
-        	<groupId>org.springframework.security</groupId>
-	    </dependency>
         <dependency>
-	        <groupId>org.springframework</groupId>
-	        <artifactId>spring-test</artifactId>
-	      </dependency>
+            <artifactId>spring-security-config</artifactId>
+            <version>${spring-security.version}</version>
+            <groupId>org.springframework.security</groupId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
@@ -110,4 +112,4 @@
 
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-util/pom.xml b/onebusaway-util/pom.xml
index 20df8a1b9..6457bdb55 100644
--- a/onebusaway-util/pom.xml
+++ b/onebusaway-util/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<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">
+<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>org.onebusaway</groupId>
@@ -38,11 +40,11 @@
 			<artifactId>gson</artifactId>
 			<version>2.1</version>
 		</dependency>
-			<dependency>
-				<groupId>joda-time</groupId>
-				<artifactId>joda-time</artifactId>
-				<version>2.0</version>
-			</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>2.0</version>
+		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
@@ -75,8 +77,8 @@
 			<artifactId>commons-lang</artifactId>
 		</dependency>
 		<dependency>
-    	<groupId>com.brsanthu</groupId>
-    	<artifactId>google-analytics-java</artifactId>
+			<groupId>com.brsanthu</groupId>
+			<artifactId>google-analytics-java</artifactId>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -84,19 +86,19 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-	<dependency>
-		<groupId>org.apache.httpcomponents</groupId>
-		<artifactId>httpclient</artifactId>
-	</dependency>
-	<dependency>
-		<groupId>org.onebusaway</groupId>
-		<artifactId>onebusaway-realtime-api</artifactId>
-		<version>${project.version}</version>
-	</dependency>
-	<dependency>
-		<groupId>javax.annotation</groupId>
-		<artifactId>javax.annotation-api</artifactId>
-	</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.onebusaway</groupId>
+			<artifactId>onebusaway-realtime-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+		</dependency>
 
 
 	</dependencies>
@@ -116,4 +118,4 @@
 	</build>
 
 
-</project>
+</project>
\ No newline at end of file
diff --git a/onebusaway-watchdog-webapp/pom.xml b/onebusaway-watchdog-webapp/pom.xml
index 04eed586c..5856370fd 100644
--- a/onebusaway-watchdog-webapp/pom.xml
+++ b/onebusaway-watchdog-webapp/pom.xml
@@ -1,4 +1,6 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.onebusaway</groupId>
@@ -10,8 +12,6 @@
 	<name>onebusaway-watchdog-webapp</name>
 
 	<dependencies>
-
-		<!--       Log4j 2 -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
@@ -62,32 +62,12 @@
 			<artifactId>jersey-spring5</artifactId>
 			<version>2.31</version>
 		</dependency>
-		<!-- wink conflicts with tomcat 8.5.82 and above -->
-<!--	<dependency>-->
-<!--		<groupId>org.apache.wink</groupId>-->
-<!--		<artifactId>wink-common</artifactId>-->
-<!--		<version>1.4</version>-->
-<!--		<exclusions>-->
-<!--			<exclusion>-->
-<!--				<groupId>xml-apis</groupId>-->
-<!--				<artifactId>xml-apis</artifactId>-->
-<!--			</exclusion>-->
-<!--			<exclusion>-->
-<!--				<groupId>org.apache.geronimo.specs</groupId>-->
-<!--				<artifactId>geronimo-jaxrs_1.1_spec</artifactId>-->
-<!--			</exclusion>-->
-<!--			<exclusion>-->
-<!--				<groupId>org.apache.geronimo.specs</groupId>-->
-<!--				<artifactId>geronimo-annotation_1.1_spec</artifactId>-->
-<!--			</exclusion>-->
-<!--		</exclusions>-->
-<!--	</dependency>-->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 			<version>${jackson-version}</version>
 		</dependency>
-   		<dependency>
+		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 			<scope>provided</scope>
@@ -105,7 +85,6 @@
 			<groupId>taglibs</groupId>
 			<artifactId>standard</artifactId>
 		</dependency>
-   <!--  support mysql out of the box -->
 		<dependency>
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>
@@ -145,4 +124,4 @@
 		</resources>
 	</build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b9d92cff8..949f41d26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>onebusaway</artifactId>
-    <groupId>org.onebusaway</groupId>
-    <version>1.2.10.1</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>onebusaway-application-modules</artifactId>
-  <version>2.5.13-otsf</version>
-  <packaging>pom</packaging>
+<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/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>onebusaway</artifactId>
+        <groupId>org.onebusaway</groupId>
+        <version>1.2.10.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>onebusaway-application-modules</artifactId>
+    <version>2.5.13-otsf</version>
+    <packaging>pom</packaging>
 
     <name>onebusaway-application-modules</name>
     <description>The core OneBusAway application suite.</description>
     <url>https://github.com/onebusaway/onebusaway-application-modules/wiki/</url>
 
-
-  <!-- Common Software Dependency Versions -->
-  <properties>
-    <asm-version>8.0.1</asm-version>
-    <struts-version>2.5.33</struts-version>
-    <gwt-version>2.4.0</gwt-version>
-    <spring-version>5.2.24.RELEASE</spring-version>
-    <csv-entities-version>1.1.7</csv-entities-version>
-    <collections-version>1.2.8</collections-version>
-    <gtfs-version>1.4.17</gtfs-version>
-    <gtfs-api-version>1.2.32</gtfs-api-version>
-    <jackson-version>2.12.0</jackson-version>
-    <jersey-version>2.31</jersey-version>
-    <onebusaway-siri-version>1.0.6</onebusaway-siri-version>
-    <onebusaway-siri-1-api-version>1.0.1</onebusaway-siri-1-api-version>
-    <onebusaway-siri-2-api-version>1.0.5</onebusaway-siri-2-api-version>
-    <wiki_integration_version>1.0.0</wiki_integration_version>
-    <!-- slf4j 2+ is not compatible with log4j2+ -->
-    <slf4j.version>1.7.5</slf4j.version>
-    <guava-version>16.0.1</guava-version>
-    <log4j.version>2.17.2</log4j.version>
-      <!-- bump protobuf to support mac m2s aaarch -->
-    <protobuf.version>3.17.3</protobuf.version>
-     <!--  These properties are primarily used in configuring joint integration tests -->
-    <org_onebusaway_test_port>9900</org_onebusaway_test_port>
-    <org_onebusaway_test_ajp_port>9901</org_onebusaway_test_ajp_port>
-    <org_onebusaway_test_rmi_port>9902</org_onebusaway_test_rmi_port>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <!-- this needs to match cloud-services -->
-    <aws.version>1.11.602</aws.version>
-  </properties>
-
+    <!-- Common Software Dependency Versions -->
+    <properties>
+        <asm-version>8.0.1</asm-version>
+        <struts-version>2.5.33</struts-version>
+        <gwt-version>2.4.0</gwt-version>
+        <spring-version>5.2.24.RELEASE</spring-version>
+        <csv-entities-version>1.1.7</csv-entities-version>
+        <collections-version>1.2.8</collections-version>
+        <gtfs-version>1.4.17</gtfs-version>
+        <gtfs-api-version>1.2.32</gtfs-api-version>
+        <jackson-version>2.12.0</jackson-version>
+        <jersey-version>2.31</jersey-version>
+        <onebusaway-siri-version>1.0.6</onebusaway-siri-version>
+        <onebusaway-siri-1-api-version>1.0.1</onebusaway-siri-1-api-version>
+        <onebusaway-siri-2-api-version>1.0.5</onebusaway-siri-2-api-version>
+        <wiki_integration_version>1.0.0</wiki_integration_version>
+        <!-- slf4j 2+ is not compatible with log4j2+ -->
+        <slf4j.version>1.7.5</slf4j.version>
+        <guava-version>16.0.1</guava-version>
+        <log4j.version>2.17.2</log4j.version>
+        <!-- bump protobuf to support mac m2s aaarch -->
+        <protobuf.version>3.17.3</protobuf.version>
+        <!--  These properties are primarily used in configuring joint integration tests -->
+        <org_onebusaway_test_port>9900</org_onebusaway_test_port>
+        <org_onebusaway_test_ajp_port>9901</org_onebusaway_test_ajp_port>
+        <org_onebusaway_test_rmi_port>9902</org_onebusaway_test_rmi_port>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <!-- this needs to match cloud-services -->
+        <aws.version>1.11.602</aws.version>
+    </properties>
 
     <repositories>
         <repository>
@@ -130,7 +130,7 @@
         <module>onebusaway-phone-webapp</module>
         <module>onebusaway-twilio-webapp</module>
         <module>onebusaway-presentation</module>
-<!--    <module>onebusaway-quickstart</module>--> <!-- deprecated -->
+        <!--    <module>onebusaway-quickstart</module>--> <!-- deprecated -->
         <module>onebusaway-sms-webapp</module>
         <module>onebusaway-realtime-api</module>
         <module>onebusaway-transit-data</module>
@@ -141,7 +141,7 @@
         <module>onebusaway-util</module>
         <module>onebusaway-alerts-persistence</module>
         <module>onebusaway-watchdog-webapp</module>
-<!--        <module>onebusaway-status-agent</module>-->
+        <!--        <module>onebusaway-status-agent</module>-->
         <module>onebusaway-alerts-api</module>
         <module>onebusaway-gtfsrt-integration-tests</module>
     </modules>
@@ -421,7 +421,8 @@
                       as an official part of Eclipse, m2e introduced the concept of Lifecycle Mappings for Maven plugins:
                         http://wiki.eclipse.org/M2E_plugin_execution_not_covered
                       This basically means that every Maven plugin needs to have explicit behavior defined about how it
-                      should be integrated integrated into the Eclipse build cycle.  Many plugins already have mappings defined
+                      should be integrated integrated into the Eclipse build cycle.  Many plugins already have mappings
+                    defined
                       by defined, but some don't.  We define those lifecycle mappings below.
                     -->
                     <groupId>org.eclipse.m2e</groupId>
@@ -457,14 +458,16 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>3.0.0-M3</version>
-                    <!-- By default, we exclude anything in the org.onebusaway.integration package from regular unit test -->
+                    <!-- By default, we exclude anything in the org.onebusaway.integration package
+                    from regular unit test -->
                     <configuration>
                         <excludes>
                             <exclude>org/onebusaway/integration/**</exclude>
                         </excludes>
                     </configuration>
                     <executions>
-                        <!-- Instead, we add a special integration-test execution that runs any tests in the org.onebusaway.integration
+                        <!-- Instead, we add a special integration-test execution that runs any
+                        tests in the org.onebusaway.integration
                           package -->
                         <execution>
                             <id>integration-tests</id>
@@ -480,7 +483,8 @@
                                 <includes>
                                     <include>org/onebusaway/integration/**/*Test.java</include>
                                 </includes>
-                                <!-- Don't stop the build if integration tests fail because we still want post-integration-test cleanup to
+                                <!-- Don't stop the build if integration tests fail because we still
+                                want post-integration-test cleanup to
                                   run -->
                                 <testFailureIgnore>true</testFailureIgnore>
                             </configuration>
@@ -532,81 +536,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.3</version>
-<!--                <configuration>-->
-<!--                    <reportPlugins>-->
-<!--                        <plugin>-->
-<!--                            <groupId>org.apache.maven.plugins</groupId>-->
-<!--                            <artifactId>maven-project-info-reports-plugin</artifactId>-->
-<!--                            <version>2.3.1</version>-->
-<!--                            <reportSets>-->
-<!--                                <reportSet>-->
-<!--                                    <reports>-->
-<!--                                        <report>project-team</report>-->
-<!--                                        <report>mailing-list</report>-->
-<!--                                        <report>cim</report>-->
-<!--                                        <report>issue-tracking</report>-->
-<!--                                        <report>license</report>-->
-<!--                                        <report>scm</report>-->
-<!--                                        <report>summary</report>-->
-<!--                                    </reports>-->
-<!--                                </reportSet>-->
-<!--                            </reportSets>-->
-<!--                        </plugin>-->
-<!--                        <plugin>-->
-<!--                            <groupId>org.apache.maven.plugins</groupId>-->
-<!--                            <artifactId>maven-javadoc-plugin</artifactId>-->
-<!--                            <version>2.10.3</version>-->
-
-<!--                            <configuration>-->
-<!--                                &lt;!&ndash;-->
-<!--                                  bdferris: I ran into an issue where the javadoc process crashed with the following exception:-->
-<!--                                  java.lang.ClassCastException:-->
-<!--                                    com.sun.tools.javadoc.ClassDocImpl cannot be cast to com.sun.javadoc.AnnotationTypeDoc-->
-<!--                                  After some debugging, this turned out to be because we had class defined in the com.google.gwt.user.client.ui-->
-<!--                                  package, which in turn caused that package to be included in the javadoc build, which in turn caused-->
-<!--                                  a GWT annotation class to be examined in the Javadoc process, which in turn caused javadoc to crash-->
-<!--                                  because of a bug in the javadoc application:-->
-<!--                                    http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6442982-->
-<!--                                  Thus, we exclude this package to avoid the bug.-->
-<!--                                   &ndash;&gt;-->
-<!--                                <excludePackageNames>com.google.gwt.user.client.ui</excludePackageNames>-->
-<!--                                &lt;!&ndash; Turn off Java 8 strict Javadoc checking &ndash;&gt;-->
-<!--                                <additionalparam>-Xdoclint:none</additionalparam>-->
-
-<!--                            </configuration>-->
-<!--                            <reportSets>-->
-<!--                                <reportSet>-->
-<!--                                    <id>main</id>-->
-<!--                                    <reports>-->
-<!--                                        <report>aggregate</report>-->
-<!--                                        <report>javadoc</report>-->
-<!--                                    </reports>-->
-<!--                                </reportSet>-->
-<!--                                <reportSet>-->
-<!--                                    <id>configuration-doclet</id>-->
-<!--                                    <configuration>-->
-<!--                                        <doclet>org.onebusaway.configuration_doclet.ConfigurationDoclet</doclet>-->
-<!--                                        <docletArtifact>-->
-<!--                                            <groupId>org.onebusaway</groupId>-->
-<!--                                            <artifactId>onebusaway-configuration-doclet</artifactId>-->
-<!--                                            <version>1.0.1</version>-->
-<!--                                        </docletArtifact>-->
-<!--                                        <useStandardDocletOptions>false</useStandardDocletOptions>-->
-<!--                                        <additionalparam>-d ${project.build.directory}/site/oba-configs -annotationType-->
-<!--                                            org.onebusaway.container.ConfigurationParameter-->
-<!--                                        </additionalparam>-->
-<!--                                        <destDir>oba-configs</destDir>-->
-<!--                                        <name>OBA Configs</name>-->
-<!--                                        <description>OBA Configuration documentation.</description>-->
-<!--                                    </configuration>-->
-<!--                                    <reports>-->
-<!--                                        <report>aggregate</report>-->
-<!--                                    </reports>-->
-<!--                                </reportSet>-->
-<!--                            </reportSets>-->
-<!--                        </plugin>-->
-<!--                    </reportPlugins>-->
-<!--                </configuration>-->
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -624,6 +553,7 @@
                 <version>3.0</version>
                 <configuration>
                     <excludes combine.children="append">
+                        <exclude>**/build/**</exclude>
                         <exclude>**/data-sources.xml</exclude>
                         <exclude>**/*.action</exclude>
                         <exclude>**/*.ai</exclude>
@@ -632,9 +562,9 @@
                         <exclude>**/*.mp3</exclude>
                         <exclude>**/*.wav</exclude>
                         <exclude>bin/**</exclude>
-            <exclude>.github/**</exclude>
+                        <exclude>.github/**</exclude>
                         <exclude>src/test/resources/**</exclude>
-            <exclude>onebusaway-quickstart/**</exclude>
+                        <exclude>onebusaway-quickstart/**</exclude>
                         <exclude>**/git.properties</exclude>
                         <exclude>**/log4j2.xml</exclude>
                         <exclude>**/log4j-stdout.xml</exclude>
@@ -664,4 +594,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
+</project>
\ No newline at end of file