diff options
11 files changed, 127 insertions, 82 deletions
diff --git a/demo/app/pom.xml b/demo/app/pom.xml index 47a8a99..adeaf3e 100644 --- a/demo/app/pom.xml +++ b/demo/app/pom.xml @@ -75,17 +75,21 @@ <version>${project.version}</version> </dependency> - <!-- Logs --> + <!-- Logging --> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> + <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.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> diff --git a/demo/app/src/main/resources/log4j.properties b/demo/app/src/main/resources/log4j.properties deleted file mode 100644 index a05d9eb..0000000 --- a/demo/app/src/main/resources/log4j.properties +++ /dev/null @@ -1,20 +0,0 @@ -log4j.rootLogger=DEBUG, Console - -# -# PF4J log -# -log4j.logger.org.pf4j=DEBUG, Console -# !!! Put the bellow classes on level TRACE when you are in trouble -log4j.logger.org.pf4j.PluginClassLoader=DEBUG, Console -log4j.logger.org.pf4j.AbstractExtensionFinder=DEBUG, Console -log4j.additivity.org.pf4j=false -log4j.additivity.org.pf4j.PluginClassLoader=false -log4j.additivity.org.pf4j.AbstractExtensionFinder=false - -# -# Appenders -# -log4j.appender.Console=org.apache.log4j.ConsoleAppender -log4j.appender.Console.layout=org.apache.log4j.PatternLayout -#log4j.appender.Console.layout.conversionPattern=%-5p - %-32.32c{1} - %m\n -log4j.appender.Console.layout.ConversionPattern=%d %p %c - %m%n diff --git a/demo/app/src/main/resources/log4j2.properties b/demo/app/src/main/resources/log4j2.properties new file mode 100644 index 0000000..958b8d2 --- /dev/null +++ b/demo/app/src/main/resources/log4j2.properties @@ -0,0 +1,27 @@ +# +# Appenders +# +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +#appender.console.layout.pattern = %-5p - %-32.32c{1} - %m\n +appender.console.layout.pattern = %d %p %c - %m%n + +# +# Loggers +# + +# PF4J log +logger.pf4j.name = org.pf4j +logger.pf4j.level = debug +logger.pf4j.additivity = false +logger.pf4j.appenderRef.console.ref = console + +# !!! Uncomment below loggers when you are in trouble +#logger.loader.name = org.pf4j.PluginClassLoader +#logger.loader.level = trace +#logger.finder.name = org.pf4j.AbstractExtensionFinder +#logger.finder.level = trace + +rootLogger.level = debug +rootLogger.appenderRef.console.ref = console diff --git a/maven-archetypes/quickstart/src/main/resources/archetype-resources/app/pom.xml b/maven-archetypes/quickstart/src/main/resources/archetype-resources/app/pom.xml index 986c0a3..f4bf2ff 100644 --- a/maven-archetypes/quickstart/src/main/resources/archetype-resources/app/pom.xml +++ b/maven-archetypes/quickstart/src/main/resources/archetype-resources/app/pom.xml @@ -63,17 +63,21 @@ <version>${pf4j.version}</version> </dependency> - <!-- Logs --> + <!-- Logging --> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> + <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.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> diff --git a/maven-archetypes/quickstart/src/main/resources/archetype-resources/app/src/main/resources/log4j.properties b/maven-archetypes/quickstart/src/main/resources/archetype-resources/app/src/main/resources/log4j.properties deleted file mode 100755 index a05d9eb..0000000 --- a/maven-archetypes/quickstart/src/main/resources/archetype-resources/app/src/main/resources/log4j.properties +++ /dev/null @@ -1,20 +0,0 @@ -log4j.rootLogger=DEBUG, Console - -# -# PF4J log -# -log4j.logger.org.pf4j=DEBUG, Console -# !!! Put the bellow classes on level TRACE when you are in trouble -log4j.logger.org.pf4j.PluginClassLoader=DEBUG, Console -log4j.logger.org.pf4j.AbstractExtensionFinder=DEBUG, Console -log4j.additivity.org.pf4j=false -log4j.additivity.org.pf4j.PluginClassLoader=false -log4j.additivity.org.pf4j.AbstractExtensionFinder=false - -# -# Appenders -# -log4j.appender.Console=org.apache.log4j.ConsoleAppender -log4j.appender.Console.layout=org.apache.log4j.PatternLayout -#log4j.appender.Console.layout.conversionPattern=%-5p - %-32.32c{1} - %m\n -log4j.appender.Console.layout.ConversionPattern=%d %p %c - %m%n diff --git a/maven-archetypes/quickstart/src/main/resources/archetype-resources/app/src/main/resources/log4j2.properties b/maven-archetypes/quickstart/src/main/resources/archetype-resources/app/src/main/resources/log4j2.properties new file mode 100755 index 0000000..958b8d2 --- /dev/null +++ b/maven-archetypes/quickstart/src/main/resources/archetype-resources/app/src/main/resources/log4j2.properties @@ -0,0 +1,27 @@ +# +# Appenders +# +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +#appender.console.layout.pattern = %-5p - %-32.32c{1} - %m\n +appender.console.layout.pattern = %d %p %c - %m%n + +# +# Loggers +# + +# PF4J log +logger.pf4j.name = org.pf4j +logger.pf4j.level = debug +logger.pf4j.additivity = false +logger.pf4j.appenderRef.console.ref = console + +# !!! Uncomment below loggers when you are in trouble +#logger.loader.name = org.pf4j.PluginClassLoader +#logger.loader.level = trace +#logger.finder.name = org.pf4j.AbstractExtensionFinder +#logger.finder.level = trace + +rootLogger.level = debug +rootLogger.appenderRef.console.ref = console diff --git a/maven-archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/quickstart/src/main/resources/archetype-resources/pom.xml index 13ed127..5a4bade 100755 --- a/maven-archetypes/quickstart/src/main/resources/archetype-resources/pom.xml +++ b/maven-archetypes/quickstart/src/main/resources/archetype-resources/pom.xml @@ -27,6 +27,7 @@ <pf4j.version>{{project.version}}</pf4j.version> <slf4j.version>1.7.7</slf4j.version> + <log4j.version>2.13.1</log4j.version> </properties> <build> diff --git a/pf4j/pom.xml b/pf4j/pom.xml index dd8e519..c67e0f2 100644 --- a/pf4j/pom.xml +++ b/pf4j/pom.xml @@ -73,12 +73,6 @@ <version>${slf4j.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.github.zafarkhaja</groupId> <artifactId>java-semver</artifactId> <version>0.9.0</version> @@ -90,6 +84,26 @@ <optional>true</optional> </dependency> + <!-- Logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j.version}</version> + <scope>test</scope> + </dependency> + <!-- Testing --> <dependency> <groupId>org.hamcrest</groupId> diff --git a/pf4j/src/test/resources/log4j.properties b/pf4j/src/test/resources/log4j.properties deleted file mode 100644 index 7edd29c..0000000 --- a/pf4j/src/test/resources/log4j.properties +++ /dev/null @@ -1,20 +0,0 @@ -log4j.rootLogger=DEBUG, Console - -# -# PF4J log -# -log4j.logger.org.pf4j=DEBUG, Console -# !!! Put the bellow classes on level TRACE when you are in trouble -log4j.logger.org.pf4j.PluginClassLoader=WARN, Console -log4j.logger.org.pf4j.AbstractExtensionFinder=DEBUG, Console -log4j.additivity.org.pf4j=false -log4j.additivity.org.pf4j.PluginClassLoader=false -log4j.additivity.org.pf4j.AbstractExtensionFinder=false - -# -# Appenders -# -log4j.appender.Console=org.apache.log4j.ConsoleAppender -log4j.appender.Console.layout=org.apache.log4j.PatternLayout -#log4j.appender.Console.layout.conversionPattern=%-5p - %-32.32c{1} - %m\n -log4j.appender.Console.layout.ConversionPattern=%d %p %c - %m%n diff --git a/pf4j/src/test/resources/log4j2.properties b/pf4j/src/test/resources/log4j2.properties new file mode 100644 index 0000000..958b8d2 --- /dev/null +++ b/pf4j/src/test/resources/log4j2.properties @@ -0,0 +1,27 @@ +# +# Appenders +# +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +#appender.console.layout.pattern = %-5p - %-32.32c{1} - %m\n +appender.console.layout.pattern = %d %p %c - %m%n + +# +# Loggers +# + +# PF4J log +logger.pf4j.name = org.pf4j +logger.pf4j.level = debug +logger.pf4j.additivity = false +logger.pf4j.appenderRef.console.ref = console + +# !!! Uncomment below loggers when you are in trouble +#logger.loader.name = org.pf4j.PluginClassLoader +#logger.loader.level = trace +#logger.finder.name = org.pf4j.AbstractExtensionFinder +#logger.finder.level = trace + +rootLogger.level = debug +rootLogger.appenderRef.console.ref = console @@ -46,6 +46,7 @@ <maven.compiler.release>8</maven.compiler.release> <slf4j.version>1.7.25</slf4j.version> + <log4j.version>2.13.1</log4j.version> <asm.version>7.1</asm.version> <junit.version>5.4.0</junit.version> |