Skip to content

Commit 07eca38

Browse files
yrodiereyrodiere
committed
HHH-14635 Upgrade to log4j 2
1 parent 0c74a92 commit 07eca38

File tree

46 files changed

+919
-720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+919
-720
lines changed

‎documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/features.xml

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959

6060
<bundle>mvn:com.fasterxml/classmate/0.8.0</bundle>
6161
<bundle>mvn:org.apache.logging.log4j/log4j-api/2.0</bundle>
62-
<bundle>mvn:log4j/log4j/1.2.17</bundle>
6362
<bundle>mvn:org.jboss.logging/jboss-logging/3.2.1.Final</bundle>
6463
<bundle>mvn:org.javassist/javassist/3.18.1-GA</bundle>
6564

‎documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/features.xml

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
<bundle>mvn:com.fasterxml/classmate/0.8.0</bundle>
3434
<bundle>mvn:org.apache.logging.log4j/log4j-api/2.0</bundle>
35-
<bundle>mvn:log4j/log4j/1.2.17</bundle>
3635
<bundle>mvn:org.jboss.logging/jboss-logging/3.2.1.Final</bundle>
3736
<bundle>mvn:org.javassist/javassist/3.18.1-GA</bundle>
3837

‎documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/features.xml

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040

4141
<bundle>mvn:com.fasterxml/classmate/0.8.0</bundle>
4242
<bundle>mvn:org.apache.logging.log4j/log4j-api/2.0</bundle>
43-
<bundle>mvn:log4j/log4j/1.2.17</bundle>
4443
<bundle>mvn:org.jboss.logging/jboss-logging/3.2.1.Final</bundle>
4544
<bundle>mvn:org.javassist/javassist/3.18.1-GA</bundle>
4645

‎documentation/src/test/resources/log4j.properties

-56
This file was deleted.

‎documentation/src/test/resources/log4j2.properties

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
#
2+
# Hibernate, Relational Persistence for Idiomatic Java
3+
#
4+
# License: GNU Lesser General Public License (LGPL), version 2.1 or later.
5+
# See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
6+
#
7+
appender.stdout.type=Console
8+
appender.stdout.name=STDOUT
9+
appender.stdout.layout.type=PatternLayout
10+
appender.stdout.layout.pattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
11+
12+
rootLogger.level=info
13+
rootLogger.appenderRef.stdout.ref=STDOUT
14+
15+
logger.hibernate.name=org.hibernate
16+
logger.hibernate.level=info
17+
#logger.hibernate.level=warn
18+
19+
logger.ejb.name=org.hibernate.ejb
20+
logger.ejb.level=info
21+
logger.ejb-packaging.name=org.hibernate.ejb.packaging
22+
logger.ejb-packaging.level=info
23+
logger.reflection.name=org.hibernate.reflection
24+
logger.reflection.level=info
25+
26+
logger.cascades.name=org.hibernate.engine.Cascades
27+
#logger.cascades.level=warn
28+
29+
### log just the SQL
30+
logger.sql.name=org.hibernate.SQL
31+
logger.sql.level=debug
32+
33+
### log JDBC bind parameters ###
34+
logger.hibernate-type.name=org.hibernate.type
35+
logger.hibernate-type.level=trace
36+
logger.type-sql.name=org.hibernate.type.descriptor.sql
37+
logger.type-sql.level=trace
38+
logger.table-generator.name=org.hibernate.id.enhanced.TableGenerator
39+
logger.table-generator.level=trace
40+
logger.identifier-generator-helper.name=org.hibernate.id.IdentifierGeneratorHelper
41+
logger.identifier-generator-helper.level=trace
42+
logger.abstract-entity-persister.name=org.hibernate.persister.entity.AbstractEntityPersister
43+
logger.abstract-entity-persister.level=trace
44+
logger.entity-reference-initializer-impl.name=org.hibernate.loader.plan.exec.process.internal.EntityReferenceInitializerImpl
45+
logger.entity-reference-initializer-impl.level=trace
46+
47+
### log schema export/update ###
48+
logger.hbm2ddl.name=org.hibernate.tool.hbm2ddl
49+
logger.hbm2ddl.level=info
50+
51+
### log HQL parse trees
52+
logger.hql.name=org.hibernate.hql
53+
#logger.hql.level=warn
54+
55+
### log cache activity ###
56+
logger.cache.name=org.hibernate.cache
57+
#logger.cache.level=warn
58+
59+
### log JDBC resource acquisition
60+
logger.hibernate-jdbc.name=org.hibernate.jdbc
61+
#logger.hibernate-jdbc.level=warn
62+
63+
### enable the following line if you want to track down connection ###
64+
### leakages when using DriverManagerConnectionProvider ###
65+
logger.driver-manager-connection-provider.name=org.hibernate.connection.DriverManagerConnectionProvider
66+
#logger.driver-manager-connection-provider.level=trace
67+
68+
### When entity copy merge functionality is enabled using:
69+
### hibernate.event.merge.entity_copy_observer=log, the following will
70+
### provide information about merged entity copies.
71+
logger.entity-copy-allowed-logged-observer.name=org.hibernate.event.internal.EntityCopyAllowedLoggedObserver
72+
#logger.entity-copy-allowed-logged-observer.level=warn
73+
74+
logger.userguide.name=org.hibernate.userguide
75+
logger.userguide.level=debug

‎etc/log4j.properties

-54
This file was deleted.

‎etc/log4j2.properties

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
#
2+
# Hibernate, Relational Persistence for Idiomatic Java
3+
#
4+
# License: GNU Lesser General Public License (LGPL), version 2.1 or later.
5+
# See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
6+
#
7+
8+
### direct log messages to stdout ###
9+
appender.stdout.type=Console
10+
appender.stdout.name=STDOUT
11+
appender.stdout.layout.type=PatternLayout
12+
appender.stdout.layout.pattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
13+
14+
### direct messages to file hibernate.log ###
15+
#appender.file.type=File
16+
#appender.file.name=file
17+
#appender.file.fileName=hibernate.log
18+
#appender.file.layout.type=PatternLayout
19+
#appender.file.layout.pattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
20+
21+
### set log levels - for more verbose logging change 'info' to 'debug' ###
22+
23+
rootLogger.level=warn
24+
rootLogger.appenderRef.stdout.ref=STDOUT
25+
26+
logger.hibernate.name=org.hibernate
27+
#logger.hibernate.level=info
28+
logger.hibernate.level=debug
29+
30+
### log HQL query parser activity
31+
logger.hql-ast.name=org.hibernate.hql.ast.AST
32+
#logger.hql-ast.level=debug
33+
34+
### log just the SQL
35+
logger.sql.name=org.hibernate.SQL
36+
#logger.sql.level=debug
37+
38+
### log JDBC bind parameters ###
39+
logger.hibernate-type.name=org.hibernate.type
40+
logger.hibernate-type.level=info
41+
#logger.hibernate-type.level=debug
42+
43+
### log schema export/update ###
44+
logger.hbm2ddl.name=org.hibernate.tool.hbm2ddl
45+
logger.hbm2ddl.level=debug
46+
47+
### log HQL parse trees
48+
logger.hql.name=org.hibernate.hql
49+
#logger.hql.level=debug
50+
51+
### log cache activity ###
52+
logger.cache.name=org.hibernate.cache
53+
#logger.cache.level=debug
54+
55+
### log transaction activity
56+
logger.hibernate-transaction.name=org.hibernate.transaction
57+
#logger.hibernate-transaction.level=debug
58+
59+
### log JDBC resource acquisition
60+
logger.hibernate-jdbc.name=org.hibernate.jdbc
61+
#logger.hibernate-jdbc.level=debug
62+
63+
### enable the following line if you want to track down connection ###
64+
### leakages when using DriverManagerConnectionProvider ###
65+
logger.driver-manager-connection-provider.name=org.hibernate.connection.DriverManagerConnectionProvider
66+
#logger.driver-manager-connection-provider.level=trace

‎gradle/java-module.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ dependencies {
7171
testCompile( libraries.byteman_install )
7272
testCompile( libraries.byteman_bmunit )
7373

74-
testRuntime( libraries.log4j )
74+
testRuntime( libraries.log4j2 )
7575
testRuntime( libraries.javassist )
7676
testRuntime( libraries.byteBuddy )
7777

‎gradle/libraries.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ ext {
120120

121121
// ~~~~~~~~~~~~~~~~~~~~~~~~~~ testing
122122

123-
log4j: "log4j:log4j:1.2.17",
123+
log4j2: "org.apache.logging.log4j:log4j-core:2.14.1",
124124
junit: "junit:junit:${junitVersion}",
125125
byteman: "org.jboss.byteman:byteman:${bytemanVersion}",
126126
byteman_install: "org.jboss.byteman:byteman-install:${bytemanVersion}",

‎hibernate-agroal/src/test/resources/log4j.properties

-60
This file was deleted.

0 commit comments

Comments
 (0)