Skip to content

Commit d155f49

Browse files
committed
Add missing license headers. Prepare for release
1 parent 696bb99 commit d155f49

File tree

6 files changed

+272
-162
lines changed

6 files changed

+272
-162
lines changed

RELEASE-NOTES.md

Lines changed: 211 additions & 156 deletions
Large diffs are not rendered by default.

log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderInterruptedThreadTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache license, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the license for the specific language governing permissions and
15+
* limitations under the license.
16+
*/
117
package org.apache.logging.log4j.core.appender.rolling;
218

319
import org.apache.logging.log4j.Level;

log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/NamePatternConverterBenchmark.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache license, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the license for the specific language governing permissions and
15+
* limitations under the license.
16+
*/
117
package org.apache.logging.log4j.perf.jmh;
218

319
import org.apache.logging.log4j.core.AbstractLogEvent;

pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,6 +1352,7 @@
13521352
<exclude>**/README.md</exclude>
13531353
<exclude>RELEASE-NOTES.md</exclude>
13541354
<exclude>SECURITY.md</exclude>
1355+
<exclude>.java-version</exclude>
13551356
<exclude>**/*.yml</exclude>
13561357
<exclude>**/*.yaml</exclude>
13571358
<exclude>**/*.json</exclude>
@@ -1494,6 +1495,7 @@
14941495
<exclude>**/fluent-bit.conf</exclude>
14951496
<exclude>**/rabbitmq.config</exclude>
14961497
<exclude>**/MANIFEST.MF</exclude>
1498+
<exclude>.java-version</exclude>
14971499
</excludes>
14981500
</configuration>
14991501
</plugin>
@@ -1668,6 +1670,7 @@
16681670
<exclude>**/fluent-bit.conf</exclude>
16691671
<exclude>**/rabbitmq.config</exclude>
16701672
<exclude>**/MANIFEST.MF</exclude>
1673+
<exclude>.java-version</exclude>
16711674
</excludes>
16721675
</configuration>
16731676
<executions>

src/changes/announcement.vm

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,25 @@ This release contains a number of bug fixes and minor enhancements which are lis
6969

7070
Due to a break in compatibility in the SLF4J binding, Log4j now ships with two versions of the SLF4J to Log4j adapters.
7171
log4j-slf4j-impl should be used with SLF4J 1.7.x and earlier and log4j-slf4j18-impl should be used with SLF4J 1.8.x and
72-
later. SLF4J-2.0.0 alpha releases are not fully supported. See https://issues.apache.org/jira/browse/LOG4J2-2975.
72+
later. SLF4J-2.0.0 alpha releases are not fully supported. See https://issues.apache.org/jira/browse/LOG4J2-2975 and
73+
https://jira.qos.ch/browse/SLF4J-511.
74+
75+
Some of the new features in Log4j 2.15.0 include:
76+
77+
* Support for Arbiters, which are conditionals that can enable sections of the logging configuration
78+
for inclusion or exclusion. In particular, SpringProfile, SystemProperty, Script, and Class Arbiters have been
79+
provided that use the Spring profile, System property, the result of a script, or the presence of a class respectively
80+
to determine whether a section of configuration should be included.
81+
* Support for Jakarta EE 9. This is functionally equivalent to Log4j's log4j-web module but uses the Jakarta project.
82+
* Various performance improvements.
83+
84+
Key changes to note:
85+
86+
* Prior to this release Log4j would automatically resolve Lookups contained in the message or its parameters in the
87+
Pattern Layout. Thisbehavior is no longer the default and must be enabled by specifying %msg{lookup}.
88+
* The JNDI Lookup has been restricted to only support the java, ldap, and ldaps protocols by default. LDAP also no
89+
longer supports classes that implement the Referenceable interface and restricts the Serializable classes to the
90+
Java primative classes by default and requires an allow list to be specified to access remote LDAP servers.
7391

7492
The Log4j ${relVersion} API, as well as many core components, maintains binary compatibility with previous releases.
7593

@@ -114,7 +132,7 @@ $h3 Removed
114132
---
115133

116134
Apache Log4j ${relVersion} requires a minimum of Java 8 to build and run. Log4j 2.12.1 is the last release to support
117-
Java 7.
135+
Java 7. Java 7 is not longer supported by the Log4j team.
118136

119137
For complete information on ${project.name}, including instructions on how to submit bug
120138
reports, patches, or suggestions for improvement, see the Apache ${project.name} website:

src/changes/changes.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
- "update" - Change
3030
- "remove" - Removed
3131
-->
32-
<release version="2.15.0" date="2021-MM-DD" description="GA Release 2.15.0">
32+
<release version="2.15.0" date="2021-12-06" description="GA Release 2.15.0">
3333
<!-- ADDS -->
3434
<action issue="LOG4J2-3198" dev="ckozak" type="add">
3535
Pattern layout no longer enables lookups within message text by default for cleaner API boundaries and reduced
@@ -240,14 +240,16 @@
240240
Wrong subject on mail when it depends on the LogEvent
241241
</action>
242242
<!-- UPDATES -->
243-
<action dev="rgoers" type="update">
243+
<action dev="rgoers" issue="" type="update">
244244
Update Spring framework to 5.3.13, Spring Boot to 2.5.7, and Spring Cloud to 2020.0.4.
245245
</action>
246246
<action issue="LOG4J2-2025" dev="rgoers" type="update">
247247
Provide support for overriding the Tomcat Log class in Tomcat 8.5+.
248248
</action>
249-
<action dev="ggregory" type="update">
250-
- com.fasterxml.jackson.core:jackson-annotations ................. 2.12.2 -> 2.12.4
249+
<action dev="ggregory" issue="" type="update">
250+
Updated dependencies.
251+
252+
- com.fasterxml.jackson.core:jackson-annotations ................. 2.12.2 -> 2.12.4
251253
- com.fasterxml.jackson.core:jackson-core ........................ 2.12.2 -> 2.12.4
252254
- com.fasterxml.jackson.core:jackson-databind .................... 2.12.2 -> 2.12.4
253255
- com.fasterxml.jackson.dataformat:jackson-dataformat-xml ........ 2.12.2 -> 2.12.4

0 commit comments

Comments
 (0)