Major reorg. Fix for logback.

noboomu · Apr 7, 2017 · 4a47da2 · 4a47da2
1 parent 6c3b8d6
commit 4a47da2
Show file tree

Hide file tree

Showing 29 changed files with 1,184 additions and 1,172 deletions.
diff --git a/assets/video.mp4 b/assets/video.mp4
diff --git a/conf/application.conf b/conf/application.conf
@@ -14,7 +14,7 @@ application {
   tmpdir = ${java.io.tmpdir}/${application.name}
 
   # path (a.k.a. as contextPath)
-  path = /
+  path = "/v1"
 
   # localhost
   host = "localhost"

diff --git a/conf/logback.xml b/conf/logback.xml
@@ -1,17 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="15 seconds" debug="false">
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-
-    <withJansi>true</withJansi>
-
-    <encoder>
-      <!--   <pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>  -->
-      			<pattern>[%d{ISO8601}]-[%thread] %highlight(%-5level) [%boldCyan(%logger)] - %boldWhite(%message) %n
-      			</pattern>
-
-    </encoder>
-  </appender>
+<configuration packagingData="true">
 
+	<turboFilter class="ch.qos.logback.classic.turbo.DuplicateMessageFilter" />
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<withJansi>true</withJansi>
+		<encoder>
+			<pattern>%date{ISO8601} %highlight(%-5level) [%boldCyan(%logger)] [%boldYellow(%method %F) ] - %boldWhite(%message) %n %red(%ex)
+			</pattern>
+		</encoder>
+	</appender>
 
 	<logger name="org.apache.http" level="ERROR" />
 
@@ -22,7 +19,8 @@
 
 	<logger name="io.netty" level="ERROR" />
 	<logger name="io.netty.handler" level="ERROR" />
-
+
+	<logger name="com.wurrly.server.swagger" level="ERROR" />
 
 	<logger name="com.relayrides" level="ERROR" />
 	<logger name="org.apache.activemq" level="ERROR" />
@@ -75,8 +73,9 @@
 	<logger name="com.squareup.okhttp" level="WARN" />
 
 	<logger name="org.hibernate.validator" level="ERROR" />
+	<logger name="org.xnio.nio" level="ERROR" />
 
-
+   
 	<logger name="org.apache.camel" level="ERROR" />
 	<logger name="org.apache.activemq" level="ERROR" />
 	<logger name="sun.net" level="ERROR" />

diff --git a/conf/swagger.conf b/conf/swagger.conf
@@ -5,8 +5,8 @@ swagger {
     title = ${application.name}
     version = ${application.version}
   }
-  theme="material"
-  basePath= "/"${api.version}"/swagger"
+  theme="default"
+  basePath= ${application.path}"/swagger"
   specFilename="swagger.json"
   consumes: ["application/json"]
   produces: ["application/json"]

diff --git a/pom.xml b/pom.xml
@@ -53,11 +53,23 @@
   			<groupId>io.swagger</groupId>
   			<artifactId>swagger-core</artifactId>
   			<version>1.5.12</version>
+  			<exclusions>
+  				<exclusion>
+  					<groupId>org.slf4j</groupId>
+  					<artifactId>slf4j-api</artifactId>
+  				</exclusion>
+  			</exclusions>
   		</dependency>
   		<dependency>
   			<groupId>ch.qos.logback</groupId>
   			<artifactId>logback-classic</artifactId>
-  			<version>1.2.1</version>
+  			<version>1.2.3</version>
+  			<exclusions>
+  				<exclusion>
+  					<groupId>org.slf4j</groupId>
+  					<artifactId>slf4j-api</artifactId>
+  				</exclusion>
+  			</exclusions>
   		</dependency>
 
     <dependency>
@@ -149,11 +161,23 @@
     	<groupId>net.openhft</groupId>
     	<artifactId>compiler</artifactId>
     	<version>2.3.0</version>
+    	<exclusions>
+    		<exclusion>
+    			<groupId>org.slf4j</groupId>
+    			<artifactId>slf4j-api</artifactId>
+    		</exclusion>
+    	</exclusions>
     </dependency>
     <dependency>
     	<groupId>io.swagger</groupId>
     	<artifactId>swagger-parser</artifactId>
     	<version>1.0.28</version>
+    	<exclusions>
+    		<exclusion>
+    			<groupId>org.slf4j</groupId>
+    			<artifactId>slf4j-api</artifactId>
+    		</exclusion>
+    	</exclusions>
     </dependency>
     <dependency>
     	<groupId>io.swagger</groupId>
@@ -169,17 +193,38 @@
     	<groupId>com.mitchellbosecke</groupId>
     	<artifactId>pebble</artifactId>
     	<version>2.3.0</version>
-    </dependency>
-    <dependency>
-    	<groupId>org.webjars</groupId>
-    	<artifactId>swagger-ui</artifactId>
-    	<version>3.0.4</version>
+    	<exclusions>
+    		<exclusion>
+    			<groupId>org.slf4j</groupId>
+    			<artifactId>slf4j-api</artifactId>
+    		</exclusion>
+    	</exclusions>
     </dependency>
 
     <dependency>
     	<groupId>com.auth0</groupId>
     	<artifactId>java-jwt</artifactId>
     	<version>3.1.0</version>
     </dependency>
+    <dependency>
+    	<groupId>com.j256.simplemagic</groupId>
+    	<artifactId>simplemagic</artifactId>
+    	<version>[1.1,)</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.slf4j</groupId>
+    	<artifactId>slf4j-api</artifactId>
+    	<version>1.7.25</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.slf4j</groupId>
+    	<artifactId>slf4j-ext</artifactId>
+    	<version>1.7.25</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.fusesource.jansi</groupId>
+    	<artifactId>jansi</artifactId>
+    	<version>1.15</version>
+    </dependency>
   </dependencies>
 </project>