Merge pull request #233 from mcneilco/brianbolt/issue839

pom.xml

@@ -39,6 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<date>${maven.build.timestamp}</date>
 		<roo.version>1.3.2.RELEASE</roo.version>
 		<slf4j.version>1.7.5</slf4j.version>
+		<log4j.version>2.16.0</log4j.version>
 		<spring.version>3.2.11.RELEASE</spring.version>
 		<querydsl.version>3.4.3</querydsl.version>
 		<spring-security.version>3.2.5.RELEASE</spring-security.version>
@@ -163,12 +164,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.15.0</version>
+			<version>${log4j.version}</version>
 		  </dependency>
 		  <dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.15.0</version>
+			<version>${log4j.version}</version>
 		  </dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -181,9 +182,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<version>${slf4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
@@ -580,6 +581,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
     		<groupId>org.openscience.cdk</groupId>
     		<artifactId>cdk-inchi</artifactId>
     		<version>${cdk.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 	<build>

src/main/resources/log4j2.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+  <Appenders>
+    <Console name="STDOUT" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d{dd MMM yyyy HH:mm:ss} %-4r [%t] %-5p %c %x - %m%n"/>
+    </Console>
+  </Appenders>
+  <Loggers>
+    <Logger name="com.labsynch.labseer" level="info"/>
+    <Logger name="com.mangofactory.swagger" level="error"/>
+    <Logger name="org.springframework" level="info"/>
+    <Logger name="org.springframework.orm" level="info"/>
+    <Logger name="org.springframework.security" level="info"/>
+    <Logger name="org.springframework.web" level="info"/>
+    <Root level="info">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+  </Loggers>
+</Configuration>