diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerAdapter.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerAdapter.java deleted file mode 100644 index f1ab7b953..000000000 --- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerAdapter.java +++ /dev/null @@ -1,335 +0,0 @@ -/* - * This file is part of dependency-check-ant. - * - * 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. - * - * Copyright (c) 2015 The OWASP Foundation. All Rights Reserved. - */ -package org.owasp.dependencycheck.maven.slf4j; - -import org.apache.maven.plugin.logging.Log; -import org.slf4j.helpers.MarkerIgnoringBase; -import org.slf4j.helpers.MessageFormatter; - -/** - * Created on 6/14/15. - * - * @author colezlaw - */ -public class MavenLoggerAdapter extends MarkerIgnoringBase { - - /** - * A reference to the Maven log. - */ - private final Log log; - - /** - * Creates a new Maven Logger Adapter. - * - * @param log the Maven log - */ - public MavenLoggerAdapter(Log log) { - super(); - this.log = log; - } - - /** - * Returns true if trace is enabled. - * - * @return whether or not trace is enabled - */ - @Override - public boolean isTraceEnabled() { - if (log != null) { - return log.isDebugEnabled(); - } - return true; - } - - @Override - public void trace(String msg) { - if (log != null) { - log.debug(msg); - } else { - System.out.println(msg); - } - } - - @Override - public void trace(String format, Object arg) { - final String message = MessageFormatter.format(format, arg).getMessage(); - if (log != null) { - log.debug(message); - } else { - System.out.println(message); - } - } - - @Override - public void trace(String format, Object arg1, Object arg2) { - final String message = MessageFormatter.format(format, arg1, arg2).getMessage(); - if (log != null) { - log.debug(message); - } else { - System.out.println(message); - } - } - - @Override - public void trace(String format, Object... arguments) { - final String message = MessageFormatter.format(format, arguments).getMessage(); - if (log != null) { - log.debug(message); - } else { - System.out.println(message); - } - } - - @Override - public void trace(String msg, Throwable t) { - if (log != null) { - log.debug(msg, t); - } else { - System.out.println(msg); - t.printStackTrace(); - } - } - - @Override - public boolean isDebugEnabled() { - if (log != null) { - return log.isDebugEnabled(); - } - return true; - } - - @Override - public void debug(String msg) { - if (log != null) { - log.debug(msg); - } else { - System.out.println(msg); - } - } - - @Override - public void debug(String format, Object arg) { - final String message = MessageFormatter.format(format, arg).getMessage(); - if (log != null) { - log.debug(message); - } else { - System.out.println(message); - } - } - - @Override - public void debug(String format, Object arg1, Object arg2) { - final String message = MessageFormatter.format(format, arg1, arg2).getMessage(); - if (log != null) { - log.debug(message); - } else { - System.out.println(message); - } - } - - @Override - public void debug(String format, Object... arguments) { - final String message = MessageFormatter.format(format, arguments).getMessage(); - if (log != null) { - log.debug(message); - } else { - System.out.println(message); - } - } - - @Override - public void debug(String msg, Throwable t) { - if (log != null) { - log.debug(msg, t); - } else { - System.out.println(msg); - t.printStackTrace(); - } - } - - @Override - public boolean isInfoEnabled() { - if (log != null) { - return log.isInfoEnabled(); - } - return true; - } - - @Override - public void info(String msg) { - if (log != null) { - log.info(msg); - } else { - System.out.println(msg); - } - } - - @Override - public void info(String format, Object arg) { - final String message = MessageFormatter.format(format, arg).getMessage(); - if (log != null) { - log.info(message); - } else { - System.out.println(message); - } - } - - @Override - public void info(String format, Object arg1, Object arg2) { - final String message = MessageFormatter.format(format, arg1, arg2).getMessage(); - if (log != null) { - log.info(message); - } else { - System.out.println(message); - } - } - - @Override - public void info(String format, Object... arguments) { - final String message = MessageFormatter.format(format, arguments).getMessage(); - if (log != null) { - log.info(message); - } else { - System.out.println(message); - } - } - - @Override - public void info(String msg, Throwable t) { - if (log != null) { - log.info(msg, t); - } else { - System.out.println(msg); - t.printStackTrace(); - } - } - - @Override - public boolean isWarnEnabled() { - if (log != null) { - return log.isWarnEnabled(); - } - return true; - } - - @Override - public void warn(String msg) { - if (log != null) { - log.warn(msg); - } else { - System.out.println(msg); - } - } - - @Override - public void warn(String format, Object arg) { - final String message = MessageFormatter.format(format, arg).getMessage(); - if (log != null) { - log.warn(message); - } else { - System.out.println(message); - } - } - - @Override - public void warn(String format, Object arg1, Object arg2) { - final String message = MessageFormatter.format(format, arg1, arg2).getMessage(); - if (log != null) { - log.warn(message); - } else { - System.out.println(message); - } - } - - @Override - public void warn(String format, Object... arguments) { - final String message = MessageFormatter.format(format, arguments).getMessage(); - if (log != null) { - log.warn(message); - } else { - System.out.println(message); - } - } - - @Override - public void warn(String msg, Throwable t) { - if (log != null) { - log.warn(msg, t); - } else { - System.out.println(msg); - t.printStackTrace(); - } - } - - @Override - public boolean isErrorEnabled() { - if (log != null) { - return log.isErrorEnabled(); - } - return true; - } - - @Override - public void error(String msg) { - if (log != null) { - log.error(msg); - } else { - System.out.println(msg); - } - } - - @Override - public void error(String format, Object arg) { - final String message = MessageFormatter.format(format, arg).getMessage(); - if (log != null) { - log.error(message); - } else { - System.out.println(message); - } - } - - @Override - public void error(String format, Object arg1, Object arg2) { - final String message = MessageFormatter.format(format, arg1, arg2).getMessage(); - if (log != null) { - log.error(message); - } else { - System.out.println(message); - } - } - - @Override - public void error(String format, Object... arguments) { - final String message = MessageFormatter.format(format, arguments).getMessage(); - if (log != null) { - log.error(message); - } else { - System.out.println(message); - } - } - - @Override - public void error(String msg, Throwable t) { - if (log != null) { - log.error(msg, t); - } else { - System.out.println(msg); - t.printStackTrace(); - } - } -} diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerFactory.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerFactory.java deleted file mode 100644 index 639952939..000000000 --- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerFactory.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * This file is part of dependency-check-ant. - * - * 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. - * - * Copyright (c) 2015 The OWASP Foundation. All Rights Reserved. - */ -package org.owasp.dependencycheck.maven.slf4j; - -import org.apache.maven.plugin.logging.Log; -import org.slf4j.ILoggerFactory; -import org.slf4j.Logger; - -/** - * Created on 6/14/15. - * - * @author colezlaw - */ -public class MavenLoggerFactory implements ILoggerFactory { - - /** - * A reference to the Maven log adapter. - */ - private final MavenLoggerAdapter mavenLoggerAdapter; - - /** - * Constructs a new logger factory. - * - * @param log a reference to the Maven log - */ - public MavenLoggerFactory(Log log) { - super(); - this.mavenLoggerAdapter = new MavenLoggerAdapter(log); - } - - /** - * Returns the Maven Logger Adapter. - * - * @param name ignored in this implementation - * @return the maven logger adapter - */ - @Override - public Logger getLogger(String name) { - return mavenLoggerAdapter; - } -} diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/package-info.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/package-info.java deleted file mode 100644 index ea82c377b..000000000 --- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains the the slf4j adapter that wraps the maven logger. - */ -package org.owasp.dependencycheck.maven.slf4j; diff --git a/dependency-check-maven/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/dependency-check-maven/src/main/java/org/slf4j/impl/StaticLoggerBinder.java deleted file mode 100644 index af66c7ee3..000000000 --- a/dependency-check-maven/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * This file is part of dependency-check-ant. - * - * 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. - * - * Copyright (c) 2015 The OWASP Foundation. All Rights Reserved. - */ -package org.slf4j.impl; - -import org.apache.maven.plugin.logging.Log; -import org.owasp.dependencycheck.maven.slf4j.MavenLoggerFactory; -import org.slf4j.ILoggerFactory; -import org.slf4j.spi.LoggerFactoryBinder; - -/** - * The binding of org.slf4j.LoggerFactory class with an actual instance of - * org.slf4j.ILoggerFactory is performed using information returned by this - * class. - * - * @author colezlaw - */ -//CSOFF: FinalClass -public class StaticLoggerBinder implements LoggerFactoryBinder { -//CSON: FinalClass - - /** - * The unique instance of this class - */ - private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder(); - - /** - * Return the singleton of this class. - * - * @return the StaticLoggerBinder singleton - */ - public static final StaticLoggerBinder getSingleton() { - return SINGLETON; - } - - /** - * Maven mojos have their own logger, so we'll use one of those. - */ - private Log log = null; - - /** - * Set the Task which will this is to log through. - * - * @param log the task through which to log - */ - public void setLog(Log log) { - this.log = log; - loggerFactory = new MavenLoggerFactory(log); - } - - /** - * Declare the version of the SLF4J API this implementation is compiled - * against. The value of this filed is usually modified with each release. - */ - // to avoid constant folding by the compiler, this field must *not* be final - //CSOFF: StaticVariableName - //CSOFF: VisibilityModifier - public static String REQUESTED_API_VERSION = "1.7.12"; // final - //CSON: VisibilityModifier - //CSON: StaticVariableName - - /** - * The logger factory class string. - */ - private static final String LOGGER_FACTORY_CLASS = MavenLoggerFactory.class.getName(); - - /** - * The ILoggerFactory instance returned by the {@link #getLoggerFactory} - * method should always be the same object - */ - private ILoggerFactory loggerFactory; - - /** - * Constructs the static logger factory. - */ - private StaticLoggerBinder() { - loggerFactory = new MavenLoggerFactory(log); - } - - /** - * Returns the logger factory. - * - * @return the logger factory - */ - @Override - public ILoggerFactory getLoggerFactory() { - return loggerFactory; - } - - /** - * Returns the logger factory class string. - * - * @return the logger factory class string - */ - @Override - public String getLoggerFactoryClassStr() { - return LOGGER_FACTORY_CLASS; - } -} diff --git a/dependency-check-maven/src/main/java/org/slf4j/impl/package-info.java b/dependency-check-maven/src/main/java/org/slf4j/impl/package-info.java deleted file mode 100644 index cf998d0da..000000000 --- a/dependency-check-maven/src/main/java/org/slf4j/impl/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains the static binder for the slf4j-maven logger. - */ -package org.slf4j.impl;