From e8e229cf8b8eda147e6cf87f0130bc31e98c2ed4 Mon Sep 17 00:00:00 2001
From: Andrew DeMaria <lostonamountain@gmail.com>
Date: Wed, 23 Aug 2017 17:41:20 -0600
Subject: [PATCH] Move jdbc dependencies into the default war

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
---
 airsonic-main/pom.xml | 44 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/airsonic-main/pom.xml b/airsonic-main/pom.xml
index 3b323679..4925b480 100644
--- a/airsonic-main/pom.xml
+++ b/airsonic-main/pom.xml
@@ -465,6 +465,24 @@
             <version>1.5.5</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.1.4</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.43</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>2.1.0</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -559,31 +577,5 @@
                 <boot.artifact.excludes>spring-boot-starter-tomcat</boot.artifact.excludes>
             </properties>
         </profile>
-        <profile>
-            <id>jdbc-extra</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <version>42.1.4</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <version>5.1.43</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.mariadb.jdbc</groupId>
-                    <artifactId>mariadb-java-client</artifactId>
-                    <version>2.1.0</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <finalName>airsonic-jdbc-extra</finalName>
-            </build>
-        </profile>
     </profiles>
 </project>