You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2021/03/27 22:22:35 UTC
[logging-log4j2] branch release-2.x updated (5b34274 -> cfc1606)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 5b34274 BasicAsyncLoggerContextSelector documentation
new e60ec4b Add convenience comment.
new 12bca7b Update some dependencies.
new cfc1606 Update some dependencies.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../core/pattern/MessageJansiConverterTest.java | 1 +
.../core/appender/db/jpa/JpaDatabaseManager.java | 48 ++++++++++------------
pom.xml | 12 +++---
src/changes/changes.xml | 17 ++++++++
4 files changed, 45 insertions(+), 33 deletions(-)
[logging-log4j2] 02/03: Update some dependencies.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 12bca7b17a8db1981bfb458bcc4bf4cbee105d62
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 27 09:54:41 2021 -0400
Update some dependencies.
- net.javacrumbs.json-unit:json-unit .................. 2.24.0 -> 2.25.0
- org.fusesource.jansi:jansi ............................ 2.3.1 -> 2.3.2
- org.springframework:spring-aop ........................ 5.3.3 -> 5.3.5
- org.springframework:spring-beans ...................... 5.3.3 -> 5.3.5
- org.springframework:spring-context .................... 5.3.3 -> 5.3.5
- org.springframework:spring-context-support ............ 5.3.3 -> 5.3.5
- org.springframework:spring-core ....................... 5.3.3 -> 5.3.5
- org.springframework:spring-expression ................. 5.3.3 -> 5.3.5
- org.springframework:spring-oxm ........................ 5.3.3 -> 5.3.5
- org.springframework:spring-test ....................... 5.3.3 -> 5.3.5
- org.springframework:spring-web ........................ 5.3.3 -> 5.3.5
- org.springframework:spring-webmvc ..................... 5.3.3 -> 5.3.5
- org.tukaani:xz ............................................ 1.8 -> 1.9
---
pom.xml | 8 ++++----
src/changes/changes.xml | 15 +++++++++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a46a550..ce0a437 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,7 +190,7 @@
<jackson1Version>1.9.13</jackson1Version>
<jackson2Version>2.12.2</jackson2Version>
<spring-boot.version>2.3.6.RELEASE</spring-boot.version>
- <springVersion>5.3.3</springVersion>
+ <springVersion>5.3.5</springVersion>
<kubernetes-client.version>4.6.1</kubernetes-client.version>
<flumeVersion>1.9.0</flumeVersion>
<disruptorVersion>3.4.2</disruptorVersion>
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -848,7 +848,7 @@
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit</artifactId>
- <version>2.24.0</version>
+ <version>2.25.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -897,7 +897,7 @@
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
<scope>test</scope>
</dependency>
<!-- Used for the CSV layout -->
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 825222f..fbd1eed 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -61,6 +61,21 @@
<action issue="LOG4J2-2940" dev="ckozak" type="fix">
Slf4j implementations walk the stack at most once rather than twice to determine the caller's class loader.
</action>
+ <action dev="ggregory" type="update">
+ - net.javacrumbs.json-unit:json-unit .................. 2.24.0 -> 2.25.0
+ - org.fusesource.jansi:jansi ............................ 2.3.1 -> 2.3.2
+ - org.springframework:spring-aop ........................ 5.3.3 -> 5.3.5
+ - org.springframework:spring-beans ...................... 5.3.3 -> 5.3.5
+ - org.springframework:spring-context .................... 5.3.3 -> 5.3.5
+ - org.springframework:spring-context-support ............ 5.3.3 -> 5.3.5
+ - org.springframework:spring-core ....................... 5.3.3 -> 5.3.5
+ - org.springframework:spring-expression ................. 5.3.3 -> 5.3.5
+ - org.springframework:spring-oxm ........................ 5.3.3 -> 5.3.5
+ - org.springframework:spring-test ....................... 5.3.3 -> 5.3.5
+ - org.springframework:spring-web ........................ 5.3.3 -> 5.3.5
+ - org.springframework:spring-webmvc ..................... 5.3.3 -> 5.3.5
+ - org.tukaani:xz ............................................ 1.8 -> 1.9
+ </action>
</release>
<release version="2.14.1" date="2021-03-06" description="GA Release 2.14.1">
<!-- FIXES -->
[logging-log4j2] 03/03: Update some dependencies.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit cfc1606a03e6e0dfbc153d1ebee9cc2e9f34745e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 27 18:22:31 2021 -0400
Update some dependencies.
- org.eclipse.persistence:javax.persistence ............. 2.1.1 -> 2.2.1
- org.eclipse.persistence:org.eclipse.persistence.jpa ... 2.6.5 -> 2.6.9
---
.../core/appender/db/jpa/JpaDatabaseManager.java | 48 ++++++++++------------
pom.xml | 4 +-
src/changes/changes.xml | 4 +-
3 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
index 88a4ad2..67891c9 100644
--- a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
+++ b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.appender.db.jpa;
import java.io.Serializable;
import java.lang.reflect.Constructor;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
@@ -38,18 +39,16 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
private final String entityClassName;
private final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor;
private final String persistenceUnitName;
-
private EntityManagerFactory entityManagerFactory;
-
private EntityManager entityManager;
private EntityTransaction transaction;
private JpaDatabaseManager(final String name, final int bufferSize,
- final Class<? extends AbstractLogEventWrapperEntity> entityClass,
- final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor,
- final String persistenceUnitName) {
+ final Class<? extends AbstractLogEventWrapperEntity> entityClass,
+ final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor,
+ final String persistenceUnitName) {
super(name, bufferSize);
- this.entityClassName = entityClass.getName();
+ this.entityClassName = Objects.requireNonNull(entityClass, "entityClass").getName();
this.entityConstructor = entityConstructor;
this.persistenceUnitName = persistenceUnitName;
}
@@ -79,17 +78,16 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
this.transaction.begin();
} catch (final Exception e) {
throw new AppenderLoggingException(
- "Cannot write logging event or flush buffer; manager cannot create EntityManager or transaction.", e
- );
+ "Cannot write logging event or flush buffer; manager cannot create EntityManager or transaction.", e);
}
}
@Override
protected void writeInternal(final LogEvent event, final Serializable serializable) {
if (!this.isRunning() || this.entityManagerFactory == null || this.entityManager == null
- || this.transaction == null) {
+ || this.transaction == null) {
throw new AppenderLoggingException(
- "Cannot write logging event; JPA manager not connected to the database.");
+ "Cannot write logging event; JPA manager not connected to the database.");
}
AbstractLogEventWrapperEntity entity;
@@ -106,8 +104,8 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
this.transaction.rollback();
this.transaction = null;
}
- throw new AppenderLoggingException("Failed to insert record for log event in JPA manager: " +
- e.getMessage(), e);
+ throw new AppenderLoggingException(
+ "Failed to insert record for log event in JPA manager: " + e.getMessage(), e);
}
}
@@ -144,21 +142,18 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
* @param name The name of the manager, which should include connection details, entity class name, etc.
* @param bufferSize The size of the log event buffer.
* @param entityClass The fully-qualified class name of the {@link AbstractLogEventWrapperEntity} concrete
- * implementation.
+ * implementation.
* @param entityConstructor The one-arg {@link LogEvent} constructor for the concrete entity class.
* @param persistenceUnitName The name of the JPA persistence unit that should be used for persisting log events.
* @return a new or existing JPA manager as applicable.
*/
public static JpaDatabaseManager getJPADatabaseManager(final String name, final int bufferSize,
- final Class<? extends AbstractLogEventWrapperEntity>
- entityClass,
- final Constructor<? extends AbstractLogEventWrapperEntity>
- entityConstructor,
- final String persistenceUnitName) {
-
- return AbstractDatabaseManager.getManager(
- name, new FactoryData(bufferSize, entityClass, entityConstructor, persistenceUnitName), FACTORY
- );
+ final Class<? extends AbstractLogEventWrapperEntity> entityClass,
+ final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor,
+ final String persistenceUnitName) {
+
+ return AbstractDatabaseManager.getManager(name,
+ new FactoryData(bufferSize, entityClass, entityConstructor, persistenceUnitName), FACTORY);
}
/**
@@ -170,8 +165,8 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
private final String persistenceUnitName;
protected FactoryData(final int bufferSize, final Class<? extends AbstractLogEventWrapperEntity> entityClass,
- final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor,
- final String persistenceUnitName) {
+ final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor,
+ final String persistenceUnitName) {
super(bufferSize, null);
this.entityClass = entityClass;
@@ -186,9 +181,8 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
private static final class JPADatabaseManagerFactory implements ManagerFactory<JpaDatabaseManager, FactoryData> {
@Override
public JpaDatabaseManager createManager(final String name, final FactoryData data) {
- return new JpaDatabaseManager(
- name, data.getBufferSize(), data.entityClass, data.entityConstructor, data.persistenceUnitName
- );
+ return new JpaDatabaseManager(name, data.getBufferSize(), data.entityClass, data.entityConstructor,
+ data.persistenceUnitName);
}
}
}
diff --git a/pom.xml b/pom.xml
index ce0a437..5443a4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,7 +236,7 @@
<docLabel>Site Documentation</docLabel>
<projectDir />
<commonsLoggingVersion>1.2</commonsLoggingVersion>
- <javax.persistence>2.1.1</javax.persistence>
+ <javax.persistence>2.2.1</javax.persistence>
<!-- The OSGi API version MUST always be the MINIMUM version Log4j supports -->
<osgi.api.version>4.3.1</osgi.api.version>
<activemq.version>5.16.1</activemq.version>
@@ -822,7 +822,7 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.6.5</version>
+ <version>2.7.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fbd1eed..f7315cc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -62,8 +62,10 @@
Slf4j implementations walk the stack at most once rather than twice to determine the caller's class loader.
</action>
<action dev="ggregory" type="update">
- - net.javacrumbs.json-unit:json-unit .................. 2.24.0 -> 2.25.0
+ - org.eclipse.persistence:javax.persistence ............. 2.1.1 -> 2.2.1
+ - org.eclipse.persistence:org.eclipse.persistence.jpa ... 2.6.5 -> 2.6.9
- org.fusesource.jansi:jansi ............................ 2.3.1 -> 2.3.2
+ - net.javacrumbs.json-unit:json-unit .................. 2.24.0 -> 2.25.0
- org.springframework:spring-aop ........................ 5.3.3 -> 5.3.5
- org.springframework:spring-beans ...................... 5.3.3 -> 5.3.5
- org.springframework:spring-context .................... 5.3.3 -> 5.3.5
[logging-log4j2] 01/03: Add convenience comment.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit e60ec4b261882e6f459d1c2aaa913ad2bbc88116
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 27 08:54:33 2021 -0400
Add convenience comment.
---
.../org/apache/logging/log4j/core/pattern/MessageJansiConverterTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessageJansiConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessageJansiConverterTest.java
index 56bdd48..33b508b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessageJansiConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessageJansiConverterTest.java
@@ -54,5 +54,6 @@ public class MessageJansiConverterTest {
assertEquals(1, msgs.size(), "Incorrect number of messages. Should be 1 is " + msgs.size());
assertTrue(
msgs.get(0).endsWith(EXPECTED), "Replacement failed - expected ending " + EXPECTED + ", actual " + msgs.get(0));
+ // System.out.println(msgs.get(0));
}
}