You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/01/16 18:37:55 UTC

[logging-log4j2] branch release-2.x updated (c5cff93d8f -> ed57e36e09)

This is an automated email from the ASF dual-hosted git repository.

vy pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


    from c5cff93d8f Enables `LevelMixInXmlTest` test and merges with `master`
     add ed57e36e09 Simplify site generation (#1166)

No new revisions were added by this update.

Summary of changes:
 .github/workflows/build.yml                        |   2 -
 BUILDING.md                                        |   6 +-
 CHANGELOG.adoc                                     |   2 +-
 doap_log4j2.rdf                                    | 447 -----------
 log4j-1.2-api/pom.xml                              |   1 -
 log4j-1.2-api/src/site/site.xml                    |  50 --
 log4j-api-java9/pom.xml                            |   8 -
 log4j-api-test/pom.xml                             |   1 -
 log4j-api/pom.xml                                  |   1 -
 log4j-api/src/site/site.xml                        |  50 --
 log4j-appserver/pom.xml                            |   1 -
 log4j-appserver/src/site/site.xml                  |  50 --
 log4j-cassandra/pom.xml                            |   1 -
 log4j-cassandra/src/site/site.xml                  |  50 --
 log4j-core-java9/pom.xml                           |   8 -
 log4j-core-test/pom.xml                            |   1 -
 log4j-core/pom.xml                                 |   1 -
 log4j-core/src/site/manual/index.md                |  33 -
 log4j-core/src/site/site.xml                       |  50 --
 log4j-couchdb/pom.xml                              |   1 -
 log4j-couchdb/src/site/site.xml                    |  50 --
 log4j-distribution/pom.xml                         |   8 -
 log4j-distribution/src/assembly/src.xml            |   1 -
 log4j-docker/pom.xml                               |   1 -
 log4j-docker/src/site/site.xml                     |  50 --
 log4j-flume-ng/pom.xml                             |   1 -
 log4j-flume-ng/src/site/site.xml                   |  50 --
 log4j-iostreams/pom.xml                            |   1 -
 log4j-iostreams/src/site/site.xml                  |  50 --
 log4j-jakarta-smtp/pom.xml                         |   1 -
 log4j-jakarta-web/pom.xml                          |   1 -
 log4j-jakarta-web/src/site/site.xml                |  50 --
 log4j-jcl/pom.xml                                  |   1 -
 log4j-jcl/src/site/site.xml                        |  50 --
 log4j-jdbc-dbcp2/pom.xml                           |   1 -
 log4j-jdbc-dbcp2/src/site/manual/index.md          |  35 -
 log4j-jdbc-dbcp2/src/site/site.xml                 |  50 --
 log4j-jmx-gui/pom.xml                              |   1 -
 log4j-jmx-gui/src/site/site.xml                    |  50 --
 log4j-jpa/pom.xml                                  |   1 -
 log4j-jpa/src/site/manual/index.md                 |  33 -
 log4j-jpa/src/site/site.xml                        |  50 --
 log4j-jpl/pom.xml                                  |   1 -
 log4j-jpl/src/site/site.xml                        |  50 --
 log4j-jul/pom.xml                                  |   1 -
 log4j-jul/src/site/site.xml                        |  50 --
 log4j-kubernetes/pom.xml                           |   1 -
 log4j-kubernetes/src/site/site.xml                 |  50 --
 log4j-layout-template-json/pom.xml                 |   1 -
 .../src/site/manual/index.md                       |  32 -
 log4j-layout-template-json/src/site/site.xml       |  53 --
 log4j-liquibase/pom.xml                            |   1 -
 log4j-liquibase/src/site/site.xml                  |  50 --
 log4j-mongodb3/pom.xml                             |   1 -
 log4j-mongodb3/src/site/site.xml                   |  50 --
 log4j-mongodb4/pom.xml                             |   1 -
 log4j-mongodb4/src/site/site.xml                   |  50 --
 log4j-osgi/pom.xml                                 |   1 -
 log4j-perf/pom.xml                                 |   1 -
 log4j-samples/log4j-samples-flume-embedded/pom.xml |   4 -
 log4j-samples/pom.xml                              |  39 +-
 log4j-slf4j-impl/pom.xml                           |   1 -
 log4j-slf4j-impl/src/site/site.xml                 |  50 --
 log4j-slf4j2-impl/pom.xml                          |   1 -
 log4j-slf4j2-impl/src/site/site.xml                |  50 --
 log4j-spring-boot/pom.xml                          |   1 -
 log4j-spring-boot/src/site/site.xml                |  50 --
 .../src/site/site.xml                              |  50 --
 .../pom.xml                                        |  35 +-
 .../pom.xml                                        | 100 +--
 .../readme.txt                                     |   0
 .../log4j-spring-cloud-config-samples/pom.xml      |   8 -
 log4j-spring-cloud-config/pom.xml                  |  15 +-
 log4j-spring-cloud-config/src/site/site.xml        |  50 --
 log4j-taglib/pom.xml                               |   1 -
 log4j-taglib/src/site/site.xml                     |  51 --
 log4j-to-jul/pom.xml                               |   1 -
 log4j-to-jul/src/site/site.xml                     |  50 --
 log4j-to-slf4j/pom.xml                             |   1 -
 log4j-to-slf4j/src/site/site.xml                   |  50 --
 log4j-web/pom.xml                                  |   1 -
 log4j-web/src/site/site.xml                        |  50 --
 pom.xml                                            | 854 +++++++++------------
 .../1166_simplify_site_generation.xml}             |   5 +-
 ...Lazily_evaluate_SLF4J_LogEventBuilder_level.xml |  21 +-
 src/changelog/.changelog-entries.adoc.ftl          |  17 +
 src/site/custom/project-info-report.properties     | 333 --------
 .../index.md => src/site/markdown/log4j-1.2-api.md |   0
 .../index.md => src/site/markdown/log4j-api.md     |   0
 .../site/markdown/log4j-appserver.md.vm            |   0
 .../site/markdown/log4j-cassandra.md.vm            |   0
 .../site/markdown/log4j-couchdb.md.vm              |   0
 .../site/markdown/log4j-docker.md.vm               |   0
 .../site/markdown/log4j-flume-ng.md.vm             |   0
 .../site/markdown/log4j-iostreams.md               |   0
 .../site/markdown/log4j-jakarta-web.md             |   0
 .../index.md => src/site/markdown/log4j-jcl.md     |   0
 .../index.md => src/site/markdown/log4j-jmx-gui.md |   0
 .../index.md => src/site/markdown/log4j-jpl.md     |   0
 .../index.md => src/site/markdown/log4j-jul.md     |   0
 .../site/markdown/log4j-kubernetes.md.vm           |   0
 .../site/markdown/log4j-liquibase.md               |   0
 .../site/markdown/log4j-mongodb3.md.vm             |   0
 .../site/markdown/log4j-mongodb4.md.vm             |   0
 .../site/markdown/log4j-slf4j-impl.md              |   0
 .../site/markdown/log4j-slf4j2-impl.md             |   0
 .../site/markdown/log4j-spring-boot.md             |   0
 .../markdown/log4j-spring-cloud-config-client.md   |   0
 .../site/markdown/log4j-spring-cloud-config.md     |   0
 .../index.md => src/site/markdown/log4j-taglib.md  |   0
 .../index.md => src/site/markdown/log4j-to-jul.md  |   0
 .../site/markdown/log4j-to-slf4j.md                |   0
 .../index.md => src/site/markdown/log4j-web.md     |   0
 src/site/pdf.xml                                   |  59 --
 src/site/resources/pdf-config.xml                  |  47 --
 src/site/site.xml                                  |  59 +-
 116 files changed, 533 insertions(+), 3215 deletions(-)
 delete mode 100644 doap_log4j2.rdf
 delete mode 100644 log4j-1.2-api/src/site/site.xml
 delete mode 100644 log4j-api/src/site/site.xml
 delete mode 100644 log4j-appserver/src/site/site.xml
 delete mode 100644 log4j-cassandra/src/site/site.xml
 delete mode 100644 log4j-core/src/site/manual/index.md
 delete mode 100644 log4j-core/src/site/site.xml
 delete mode 100644 log4j-couchdb/src/site/site.xml
 delete mode 100644 log4j-docker/src/site/site.xml
 delete mode 100644 log4j-flume-ng/src/site/site.xml
 delete mode 100644 log4j-iostreams/src/site/site.xml
 delete mode 100644 log4j-jakarta-web/src/site/site.xml
 delete mode 100644 log4j-jcl/src/site/site.xml
 delete mode 100644 log4j-jdbc-dbcp2/src/site/manual/index.md
 delete mode 100644 log4j-jdbc-dbcp2/src/site/site.xml
 delete mode 100644 log4j-jmx-gui/src/site/site.xml
 delete mode 100644 log4j-jpa/src/site/manual/index.md
 delete mode 100644 log4j-jpa/src/site/site.xml
 delete mode 100644 log4j-jpl/src/site/site.xml
 delete mode 100644 log4j-jul/src/site/site.xml
 delete mode 100644 log4j-kubernetes/src/site/site.xml
 delete mode 100644 log4j-layout-template-json/src/site/manual/index.md
 delete mode 100644 log4j-layout-template-json/src/site/site.xml
 delete mode 100644 log4j-liquibase/src/site/site.xml
 delete mode 100644 log4j-mongodb3/src/site/site.xml
 delete mode 100644 log4j-mongodb4/src/site/site.xml
 delete mode 100644 log4j-slf4j-impl/src/site/site.xml
 delete mode 100644 log4j-slf4j2-impl/src/site/site.xml
 delete mode 100644 log4j-spring-boot/src/site/site.xml
 delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/site/site.xml
 delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/readme.txt
 delete mode 100644 log4j-spring-cloud-config/src/site/site.xml
 delete mode 100644 log4j-taglib/src/site/site.xml
 delete mode 100644 log4j-to-jul/src/site/site.xml
 delete mode 100644 log4j-to-slf4j/src/site/site.xml
 delete mode 100644 log4j-web/src/site/site.xml
 copy src/changelog/{2.0-beta6/Moved_Clock_interface_to_package_org_apache_logging_log4j_co.xml => .2.x.x/1166_simplify_site_generation.xml} (83%)
 delete mode 100644 src/site/custom/project-info-report.properties
 rename log4j-1.2-api/src/site/markdown/index.md => src/site/markdown/log4j-1.2-api.md (100%)
 rename log4j-api/src/site/markdown/index.md => src/site/markdown/log4j-api.md (100%)
 rename log4j-appserver/src/site/markdown/index.md.vm => src/site/markdown/log4j-appserver.md.vm (100%)
 rename log4j-cassandra/src/site/markdown/index.md.vm => src/site/markdown/log4j-cassandra.md.vm (100%)
 rename log4j-couchdb/src/site/markdown/index.md.vm => src/site/markdown/log4j-couchdb.md.vm (100%)
 rename log4j-docker/src/site/markdown/index.md.vm => src/site/markdown/log4j-docker.md.vm (100%)
 rename log4j-flume-ng/src/site/markdown/index.md.vm => src/site/markdown/log4j-flume-ng.md.vm (100%)
 rename log4j-iostreams/src/site/markdown/index.md => src/site/markdown/log4j-iostreams.md (100%)
 rename log4j-jakarta-web/src/site/markdown/index.md => src/site/markdown/log4j-jakarta-web.md (100%)
 rename log4j-jcl/src/site/markdown/index.md => src/site/markdown/log4j-jcl.md (100%)
 rename log4j-jmx-gui/src/site/markdown/index.md => src/site/markdown/log4j-jmx-gui.md (100%)
 rename log4j-jpl/src/site/markdown/index.md => src/site/markdown/log4j-jpl.md (100%)
 rename log4j-jul/src/site/markdown/index.md => src/site/markdown/log4j-jul.md (100%)
 rename log4j-kubernetes/src/site/markdown/index.md.vm => src/site/markdown/log4j-kubernetes.md.vm (100%)
 rename log4j-liquibase/src/site/markdown/index.md => src/site/markdown/log4j-liquibase.md (100%)
 rename log4j-mongodb3/src/site/markdown/index.md.vm => src/site/markdown/log4j-mongodb3.md.vm (100%)
 rename log4j-mongodb4/src/site/markdown/index.md.vm => src/site/markdown/log4j-mongodb4.md.vm (100%)
 rename log4j-slf4j-impl/src/site/markdown/index.md => src/site/markdown/log4j-slf4j-impl.md (100%)
 rename log4j-slf4j2-impl/src/site/markdown/index.md => src/site/markdown/log4j-slf4j2-impl.md (100%)
 rename log4j-spring-boot/src/site/markdown/index.md => src/site/markdown/log4j-spring-boot.md (100%)
 rename log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/site/markdown/index.md => src/site/markdown/log4j-spring-cloud-config-client.md (100%)
 rename log4j-spring-cloud-config/src/site/markdown/index.md => src/site/markdown/log4j-spring-cloud-config.md (100%)
 rename log4j-taglib/src/site/markdown/index.md => src/site/markdown/log4j-taglib.md (100%)
 rename log4j-to-jul/src/site/markdown/index.md => src/site/markdown/log4j-to-jul.md (100%)
 rename log4j-to-slf4j/src/site/markdown/index.md => src/site/markdown/log4j-to-slf4j.md (100%)
 rename log4j-web/src/site/markdown/index.md => src/site/markdown/log4j-web.md (100%)
 delete mode 100644 src/site/pdf.xml
 delete mode 100644 src/site/resources/pdf-config.xml