You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/02/07 19:38:33 UTC
[logging-log4j2] branch release-2.x updated (cb9de4de21 -> 54bf02f85e)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from cb9de4de21 Disable `OsgiServiceLocator` if not running in OSGI container
new a7bf944871 Switch from `com.sun.mail` to Eclipse Angus
new 54bf02f85e Bump Angus Mail to 2.0.1
The 2 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:
log4j-jakarta-smtp/pom.xml | 10 +++---
pom.xml | 36 +++++++++++++++-------
...xml => LOG4J2-3554_switch_to_Eclipse_Angus.xml} | 7 +++--
3 files changed, 33 insertions(+), 20 deletions(-)
copy src/changelog/.2.x.x/{LOG4J2-3624_Catch_unchecked_exception_from_ServiceLoader.xml => LOG4J2-3554_switch_to_Eclipse_Angus.xml} (85%)
[logging-log4j2] 02/02: Bump Angus Mail to 2.0.1
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 54bf02f85e8d1db5eeabf8c98c33b9a98a05b68d
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Sat Jan 28 10:39:04 2023 +0100
Bump Angus Mail to 2.0.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bd712b3f15..7ae48200db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,7 +311,7 @@
===================================================== -->
<activemq.version>5.17.3</activemq.version>
<angus-activation.version>2.0.0</angus-activation.version>
- <angus-mail.version>1.1.0</angus-mail.version>
+ <angus-mail.version>2.0.1</angus-mail.version>
<assertj.version>3.23.1</assertj.version>
<awaitility.version>4.2.0</awaitility.version>
<bsh.version>2.0b6</bsh.version>
[logging-log4j2] 01/02: Switch from `com.sun.mail` to Eclipse Angus
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a7bf94487133e6cae2a97228769b9c0a25e2ae13
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Wed Jan 25 19:48:06 2023 +0100
Switch from `com.sun.mail` to Eclipse Angus
The first Angus Activation releases didn't work on Java 8, since their
class names collided with those embedded in the JRE. Since
eclipse-ee4j/angus-activation/#11 was solved in version 2.0.0, we can
replace the old unmaintained `com.sun.mail` artifacts with Eclipse
Angus.
Possible problems:
* Eclipse Angus has a Jakarta EE 10 baseline (version 2.1 of Jakarta
Activation and Mail API). I would prefer to keep a Jakarta EE 9
baseline.
* Spring Boot's
[`spring-boot-starter-mail`](https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-mail/3.0.2)
uses Angus, so we probably can ignore the previous point.
* We need to use the `jakarta.mail` artifact, since Spring Boot does it and
nobody likes exclusions.
* The `angus-activation` artifact must be version 2.0.0 or higher,
* The `jakarta.mail` artifact must be at most 1.1.0, since 2.0.0 was compiled
with Java 9 (cf. eclipse-ee4j/angus-mail/#76).
---
log4j-jakarta-smtp/pom.xml | 10 +++---
pom.xml | 36 +++++++++++++++-------
.../.2.x.x/LOG4J2-3554_switch_to_Eclipse_Angus.xml | 28 +++++++++++++++++
3 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/log4j-jakarta-smtp/pom.xml b/log4j-jakarta-smtp/pom.xml
index fad515117e..22bebe6866 100644
--- a/log4j-jakarta-smtp/pom.xml
+++ b/log4j-jakarta-smtp/pom.xml
@@ -41,13 +41,11 @@
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<scope>provided</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<scope>provided</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -58,13 +56,13 @@
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>smtp</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>jakarta.mail</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 8f02065c61..bd712b3f15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -310,6 +310,8 @@
Dependency version properties (in alphabetical order)
===================================================== -->
<activemq.version>5.17.3</activemq.version>
+ <angus-activation.version>2.0.0</angus-activation.version>
+ <angus-mail.version>1.1.0</angus-mail.version>
<assertj.version>3.23.1</assertj.version>
<awaitility.version>4.2.0</awaitility.version>
<bsh.version>2.0b6</bsh.version>
@@ -341,9 +343,9 @@
<icu4j.version>72.1</icu4j.version>
<jackson1.version>1.9.13</jackson1.version>
<jackson-bom.version>2.14.1</jackson-bom.version>
- <!-- Implementation of `jakarta.activation-api`: -->
- <jakarta-activation.version>2.0.1</jakarta-activation.version>
- <jakarta-mail.version>2.0.1</jakarta-mail.version>
+ <!-- Override the version in Jakarta EE 9 BOM: -->
+ <jakarta-activation.version>2.1.1</jakarta-activation.version>
+ <jakarta-mail.version>2.1.1</jakarta-mail.version>
<!-- BOM with Jakarta EE 9 APIs: -->
<jakartaee-bom.version>9.0.0</jakartaee-bom.version>
<!-- No BOM for Java EE 8 APIs, so we list them separately: -->
@@ -494,6 +496,12 @@
<version>${activemq.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
+ <version>${angus-activation.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
@@ -809,11 +817,23 @@
</dependency>
<dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
<version>${jakarta-activation.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <version>${angus-mail.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
+ <version>${jakarta-mail.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
@@ -1114,12 +1134,6 @@
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>smtp</artifactId>
- <version>${jakarta-mail.version}</version>
- </dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
diff --git a/src/changelog/.2.x.x/LOG4J2-3554_switch_to_Eclipse_Angus.xml b/src/changelog/.2.x.x/LOG4J2-3554_switch_to_Eclipse_Angus.xml
new file mode 100644
index 0000000000..d098466668
--- /dev/null
+++ b/src/changelog/.2.x.x/LOG4J2-3554_switch_to_Eclipse_Angus.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://logging.apache.org/log4j/changelog"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.0.xsd"
+ type="changed">
+ <issue id="LOG4J2-3554" link="https://issues.apache.org/jira/browse/LOG4J2-3554"/>
+ <author name="Oleh Astappiev"/>
+ <author id="pkarwasz"/>
+ <description format="asciidoc">
+ Switch from `com.sun.mail` to Eclipse Angus.
+ </description>
+</entry>