You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by fr...@apache.org on 2024/11/08 19:42:31 UTC
(logging-log4net) branch Feature/Antora updated (9826f8f0 -> b0fbd7d4)
This is an automated email from the ASF dual-hosted git repository.
freeandnil pushed a change to branch Feature/Antora
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
from 9826f8f0 updated development.adoc
add 407945cf made RollOverRenameFiles virtual to allow compression etc. in derived classes fixes #205
add 78bb3567 updated release notes for 3.0.3
add a7f90b89 updated release procedure documentation
add 0f8b41c0 Update version for 3.0.4
new b0fbd7d4 Merge master
The 1 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:
.editorconfig | 8 +-
doc/MailTemplate.Announce.txt | 8 +-
doc/MailTemplate.Result.txt | 4 +-
doc/MailTemplate.txt | 6 +-
doc/RELEASING.md | 44 ++---
examples/Directory.Build.props | 2 +-
package.json | 2 +-
pom.xml | 23 ++-
site.legacy/xdoc/release/release-notes.xml | 6 +-
src/log4net/Appender/RollingFileAppender.cs | 257 ++++++++++++++--------------
src/log4net/log4net.csproj | 6 +-
11 files changed, 186 insertions(+), 180 deletions(-)
(logging-log4net) 01/01: Merge master
Posted by fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
freeandnil pushed a commit to branch Feature/Antora
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit b0fbd7d4bbc57eb36e55a971c77c660abf0790df
Merge: 9826f8f0 0f8b41c0
Author: Jan Friedrich <fr...@apache.org>
AuthorDate: Fri Nov 8 20:41:53 2024 +0100
Merge master
.editorconfig | 8 +-
doc/MailTemplate.Announce.txt | 8 +-
doc/MailTemplate.Result.txt | 4 +-
doc/MailTemplate.txt | 6 +-
doc/RELEASING.md | 44 ++---
examples/Directory.Build.props | 2 +-
package.json | 2 +-
pom.xml | 23 ++-
site.legacy/xdoc/release/release-notes.xml | 6 +-
src/log4net/Appender/RollingFileAppender.cs | 257 ++++++++++++++--------------
src/log4net/log4net.csproj | 6 +-
11 files changed, 186 insertions(+), 180 deletions(-)
diff --cc .editorconfig
index f9451f42,f9451f42..e50b5f2f
--- a/.editorconfig
+++ b/.editorconfig
@@@ -205,4 -205,4 +205,10 @@@ dotnet_diagnostic.KR1037.severity = non
# NUnit2045: Use Assert.Multiple
dotnet_diagnostic.NUnit2045.severity = none
# IDE0079: Remove unnecessary suppressions
--dotnet_diagnostic.IDE0079.severity = none
++dotnet_diagnostic.IDE0079.severity = none
++
++[*.xml]
++tab_width = 2
++indent_size = 2
++indent_style = space
++end_of_line = crlf
diff --cc pom.xml
index 1eda606c,eeb68544..166ca362
--- a/pom.xml
+++ b/pom.xml
@@@ -1,166 -1,88 +1,181 @@@
+<?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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ ~ 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.
+ -->
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" child.project.url.inherit.append.path="false" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
++<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
++ child.project.url.inherit.append.path="false"
++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
++
<modelVersion>4.0.0</modelVersion>
- <groupId>log4net</groupId>
+
+ <parent>
+ <groupId>org.apache.logging</groupId>
+ <artifactId>logging-parent</artifactId>
+ <version>11.0.0</version>
+ </parent>
+
++ <packaging>pom</packaging>
+ <groupId>org.apache.logging.log4net</groupId>
<artifactId>apache-log4net</artifactId>
+ <version>${revision}</version>
<packaging>pom</packaging>
- <version>3.0.4</version>
+
<name>Apache log4net</name>
<description>Logging framework for Microsoft .NET Framework.</description>
- <url>https://logging.apache.org/log4net/</url>
+ <url>https://logging.apache.org/log4net</url>
<inceptionYear>2004</inceptionYear>
+
- <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
++ <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false"
++ child.scm.url.inherit.append.path="false">
+ <connection>scm:git:https://github.com/apache/logging-log4net</connection>
+ <developerConnection>scm:git:https://github.com/apache/logging-log4net</developerConnection>
+ <url>https://github.com/apache/logging-log4net</url>
+ </scm>
+
<issueManagement>
- <system>Github</system>
+ <system>GitHub Issues</system>
<url>https://github.com/apache/logging-log4net/issues</url>
</issueManagement>
+
+ <mailingLists>
+ <mailingList>
+ <name>logging commits: all git commits of the logging projects including log4net</name>
+ <subscribe>commits-subscribe@logging.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@logging.apache.org</unsubscribe>
+ <post>Read-Only List</post>
+ <archive>https://mail-archives.apache.org/mod_mbox/logging-commits/</archive>
+ </mailingList>
+ </mailingLists>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <connection>scm:git:https://github.com/apache/logging-log4net</connection>
- <developerConnection>scm:git:https://github.com/apache/logging-log4net</developerConnection>
- <url>https://github.com/apache/logging-log4net</url>
- </scm>
- <organization>
- <name>Apache Software Foundation</name>
- <url>https://www.apache.org</url>
- </organization>
++
+ <ciManagement>
+ <system>GitHub Actions</system>
+ <url>https://github.com/apache/logging-log4net/actions</url>
+ </ciManagement>
+
+ <properties>
+
+ <!-- project version -->
+ <revision>0.10.0-SNAPSHOT</revision>
+
+ <!-- `project.build.outputTimestamp` is required to be present for reproducible builds.
+ We actually inherit one from the `org.apache:apache` through our parent `org.apache.logging:logging-parent`.
+ Though inheriting this property has two undesired consequences:
+ 1. `artifact:compare` dumps an `ERROR` log stating that this `property should not be inherited but defined` (apache/logging-parent#50)
+ 2. This value is employed in various places while creating the distribution
+ To mitigate these, we define a *dummy* value here and let the CI replace it during a release.
+ Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
+ <project.build.outputTimestamp>2024-05-09T11:40:45Z</project.build.outputTimestamp>
+
+ <!-- disable `maven-site-plugin`-->
+ <maven.site.skip>true</maven.site.skip>
+ <maven.site.deploy.skip>true</maven.site.deploy.skip>
+ <spotbugs.skip>true</spotbugs.skip>
+ </properties>
+
+ <!-- `dependencyManagement` must only contain `log4j-tools` modules and nothing else!
+ Modules here must have a corresponding entry in `modules` block above! -->
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-changelog</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-docgen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-docgen-asciidoctor-extension</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
+
+ <!-- Enable BOM flattening -->
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>${flatten-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>flatten-bom</id>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <inherited>false</inherited>
+ </execution>
+ </executions>
</plugin>
+
+ <!-- *Temporarily* override the changelog entry file validation inherited from `logging-parent`.
+
+ Inherited `validate-changelog` execution explicitly fixes the `log4j-changelog` namespace and schema location.
+ This makes it impossible to upgrade changelog entry file schemas to a newer version than the one expected by `logging-parent`.
+
+ TODO: This will probably be fixed in `logging-parent` version `11.0.0` release.
+ Hence, from then on, this `xml-maven-plugin` override can be removed. -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
- <configuration>
- <templateFile>${basedir}/src/site/site.vm</templateFile>
- </configuration>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate-changelog</id>
+ <configuration combine.self="override">
+ <validationSets>
+ <validationSet>
+ <dir>src/changelog</dir>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ <validating>true</validating>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
<configuration>
- <templateFile>${basedir}/src/site/site.vm</templateFile>
+ <formats>
+ <format>
+ <excludes>
+ <exclude>**/.idea/*</exclude>
+ <exclude>src/changelog/**/*.xml</exclude>
+ <exclude>**/bin/**/*.xml</exclude>
+ <exclude>**/*.y*ml</exclude>
+ </excludes>
+ </format>
+ </formats>
</configuration>
</plugin>
- <!-- RAT report -->
+
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@@ -169,8 -91,105 +184,6 @@@
<excludesFile>${basedir}/rat.excludesFile</excludesFile>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.8.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>cim</report>
- <report>scm</report>
- <report>license</report>
- <report>project-team</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
</plugins>
- </reporting>
- <developers>
- <developer>
- <name>Davyd McColl</name>
- <id>fluffynuts</id>
- </developer>
- <developer>
- <name>Jan Friedrich</name>
- <id>freeandnil</id>
- </developer>
- <developer>
- <name>Curt Arnold</name>
- <id>carnold</id>
- </developer>
- <developer>
- <name>Stefan Bodewig</name>
- <id>bodewig</id>
- </developer>
- <developer>
- <name>Nicko Cadell</name>
- <id>nicko</id>
- </developer>
- <developer>
- <name>Niall Daley</name>
- <id>niall</id>
- </developer>
- <developer>
- <name>Gert Driesen</name>
- <id>drieseng</id>
- </developer>
- <developer>
- <name>Ron Grabowski</name>
- <id>rgrabowski</id>
- </developer>
- <developer>
- <name>Dominik Psenner</name>
- <id>dpsenner</id>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>Erik Mavrinac</name>
- </contributor>
- <contributor>
- <name>Julian Biddle</name>
- </contributor>
- <contributor>
- <name>Daniel Cazzulino</name>
- </contributor>
- <contributor>
- <name>Aspi Havewala</name>
- </contributor>
- <contributor>
- <name>Rick Hobbs</name>
- </contributor>
- <contributor>
- <name>Lance Nehring</name>
- </contributor>
- <contributor>
- <name>Angelika Schnagl</name>
- </contributor>
- <contributor>
- <name>Edward Smit</name>
- </contributor>
- <contributor>
- <name>Douglas de la Torre</name>
- </contributor>
- <contributor>
- <name>Pavlos Touboulidis</name>
- </contributor>
- <contributor>
- <name>Thomas Voss</name>
- </contributor>
- <contributor>
- <name>Jarrod Alexander</name>
- </contributor>
- </contributors>
- <dependencies>
- </dependencies>
- <distributionManagement>
- <site>
- <id>logging.site</id>
- <url>file:///${user.dir}/target/site-deploy</url>
- </site>
- </distributionManagement>
+ </build>
-
- </project>
+ </project>