This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit d9b84fae5040a87c894b457d64b5a87e7b484c9d Merge: ef3f28b542 f8a829311d Author: Volkan Yazıcı <[email protected]> AuthorDate: Tue Mar 12 09:09:53 2024 +0100 Merge remote-tracking branch 'origin/ms12_restructure_website_2x' into 2.x-docgen .github/generate-email.sh | 17 +- .mvn/jvm.config | 1 + .../log4j/test/junit/UsingStatusLoggerMock.java | 2 + .../logging/log4j/test/junit/package-info.java | 2 +- .../log4j/message/ParameterFormatterTest.java | 25 +- .../log4j/message/ParameterizedMessageTest.java | 87 +- .../log4j/status/StatusConsoleListenerTest.java | 23 +- .../StatusLoggerPropertiesUtilDoubleTest.java | 10 + ...StatusLoggerPropertiesUtilDoubleTest.properties | 22 + .../logging/log4j/message/ParameterFormatter.java | 15 +- .../log4j/message/ParameterizedMessage.java | 18 +- .../log4j/status/StatusConsoleListener.java | 6 +- .../apache/logging/log4j/status/StatusLogger.java | 12 +- .../appender/rolling/PatternProcessorTest.java | 9 + .../core/config/AbstractConfigurationTest.java | 99 + .../config/ConfigurationPropertiesOrderTest.java | 67 - .../log4j/core/lookup/InterpolatorTest.java | 71 + .../core/appender/rolling/PatternProcessor.java | 4 + .../log4j/core/config/AbstractConfiguration.java | 1 + .../log4j/core/config/PropertiesPlugin.java | 5 +- .../logging/log4j/core/lookup/Interpolator.java | 29 +- .../log4j/core/pattern/DatePatternConverter.java | 2 +- log4j-parent/pom.xml | 10 +- pom.xml | 73 +- src/asciidoc/templates/document.html.erb | 229 + .../2309_fix_logger_context_aware_lookups.xml | 8 + .../.2.x.x/2346_unix_millis_data_pattern.xml | 8 + ...ix_ParameterFormatter_for_insufficient_args.xml | 8 + .../.2.x.x/fix_StatusLogger_properties_read.xml | 8 + .../update_jakarta_mail_jakarta_mail_api.xml | 8 + .../update_org_apache_commons_commons_dbcp2.xml | 8 + .../update_org_codehaus_groovy_groovy_bom.xml | 8 + .../update_org_eclipse_angus_angus_activation.xml | 8 + .../update_org_eclipse_angus_jakarta_mail.xml | 8 + src/site/_release-notes/_2.x.x.adoc | 6 + src/site/asciidoc/articles.adoc | 147 + src/site/asciidoc/components.adoc | 45 + src/site/asciidoc/docs.adoc | 228 + src/site/asciidoc/download.adoc | 229 + src/site/{markdown/faq.md.vm => asciidoc/faq.adoc} | 362 +- src/site/asciidoc/guidelines.adoc | 384 ++ .../log4j-jpl.md => asciidoc/javadoc.adoc} | 27 +- src/site/asciidoc/log4j-1.2-api.adoc | 78 + .../log4j-api.md => asciidoc/log4j-api.adoc} | 20 +- src/site/asciidoc/log4j-appserver.adoc | 52 + .../log4j-cassandra.adoc} | 16 +- .../log4j-couchdb.adoc} | 25 +- .../log4j-docker.adoc} | 42 +- .../log4j-flume-ng.adoc} | 40 +- src/site/asciidoc/log4j-iostreams.adoc | 46 + .../log4j-jakarta-web.adoc} | 20 +- .../log4j-jcl.md => asciidoc/log4j-jcl.adoc} | 26 +- .../log4j-jmx-gui.adoc} | 14 +- .../log4j-jpl.md => asciidoc/log4j-jpl.adoc} | 19 +- src/site/asciidoc/log4j-jul.adoc | 122 + src/site/asciidoc/log4j-kubernetes.adoc | 202 + .../log4j-mongodb3.adoc} | 25 +- .../log4j-mongodb4.adoc} | 25 +- .../log4j-slf4j-impl.adoc} | 37 +- .../log4j-slf4j2-impl.adoc} | 37 +- .../log4j-spring-boot.adoc} | 67 +- .../asciidoc/log4j-spring-cloud-config-client.adoc | 189 + .../log4j-spring-cloud-config.adoc} | 14 +- src/site/asciidoc/log4j-taglib.adoc | 55 + .../log4j-to-jul.md => asciidoc/log4j-to-jul.adoc} | 33 +- .../log4j-to-slf4j.adoc} | 34 +- .../log4j-web.md => asciidoc/log4j-web.adoc} | 20 +- .../manual/api-separation.adoc} | 149 +- src/site/asciidoc/manual/api.adoc | 200 + src/site/asciidoc/manual/appenders.adoc | 4597 ++++++++++++++++ src/site/asciidoc/manual/architecture.adoc | 481 ++ src/site/asciidoc/manual/async.adoc | 732 +++ src/site/asciidoc/manual/cloud.adoc | 638 +++ .../manual/compatibility.adoc} | 19 +- src/site/asciidoc/manual/configuration.adoc | 2528 +++++++++ src/site/asciidoc/manual/customconfig.adoc | 386 ++ src/site/asciidoc/manual/customloglevels.adoc | 323 ++ .../manual/eventlogging.adoc} | 110 +- src/site/asciidoc/manual/extending.adoc | 618 +++ src/site/asciidoc/manual/filters.adoc | 1017 ++++ .../manual/flowtracing.adoc} | 222 +- src/site/asciidoc/manual/garbagefree.adoc | 582 ++ src/site/asciidoc/manual/index.adoc | 138 + src/site/asciidoc/manual/jmx.adoc | 100 + src/site/asciidoc/manual/layouts.adoc | 2158 ++++++++ src/site/asciidoc/manual/logbuilder.adoc | 79 + src/site/asciidoc/manual/logsep.adoc | 116 + src/site/asciidoc/manual/lookups.adoc | 745 +++ src/site/asciidoc/manual/markers.adoc | 104 + src/site/asciidoc/manual/messages.adoc | 329 ++ .../manual/migration.adoc} | 280 +- src/site/asciidoc/manual/plugins.adoc | 108 + src/site/asciidoc/manual/thread-context.adoc | 240 + src/site/asciidoc/manual/usage.adoc | 226 + src/site/asciidoc/manual/webapp.adoc | 320 ++ src/site/asciidoc/performance.adoc | 571 ++ src/site/asciidoc/runtime-dependencies.adoc | 267 + src/site/asciidoc/thanks.adoc | 52 + src/site/markdown/articles.md | 251 - src/site/markdown/download.md.vm | 106 - src/site/markdown/javadoc.md | 26 - src/site/markdown/log4j-1.2-api.md | 58 - src/site/markdown/log4j-appserver.md.vm | 59 - src/site/markdown/log4j-iostreams.md | 55 - src/site/markdown/log4j-jul.md | 117 - src/site/markdown/log4j-kubernetes.md.vm | 104 - .../markdown/log4j-spring-cloud-config-client.md | 134 - src/site/markdown/log4j-taglib.md | 67 - src/site/markdown/manual/cloud.md | 568 -- src/site/markdown/maven-artifacts.md.vm | 329 -- src/site/resources/css/fonts.css | 257 + src/site/resources/css/logging-custom.css | 238 + src/site/resources/css/site.css | 37 - .../font-awesome-4.7.0/css/font-awesome.css | 2337 +++++++++ .../font-awesome-4.7.0/css/font-awesome.min.css | 4 + .../font-awesome-4.7.0/fonts/FontAwesome.otf | Bin 0 -> 134808 bytes .../fonts/fontawesome-webfont.eot | Bin 0 -> 165742 bytes .../fonts/fontawesome-webfont.svg | 2671 ++++++++++ .../fonts/fontawesome-webfont.ttf | Bin 0 -> 165548 bytes .../fonts/fontawesome-webfont.woff | Bin 0 -> 98024 bytes .../fonts/fontawesome-webfont.woff2 | Bin 0 -> 77160 bytes src/site/resources/fonts/noto-OFL.txt | 93 + .../resources/fonts/noto-serif-v23-latin-100.woff2 | Bin 0 -> 15232 bytes .../fonts/noto-serif-v23-latin-100italic.woff2 | Bin 0 -> 15904 bytes .../resources/fonts/noto-serif-v23-latin-200.woff2 | Bin 0 -> 15528 bytes .../fonts/noto-serif-v23-latin-200italic.woff2 | Bin 0 -> 16544 bytes .../resources/fonts/noto-serif-v23-latin-300.woff2 | Bin 0 -> 15364 bytes .../fonts/noto-serif-v23-latin-300italic.woff2 | Bin 0 -> 16496 bytes .../resources/fonts/noto-serif-v23-latin-500.woff2 | Bin 0 -> 15072 bytes .../fonts/noto-serif-v23-latin-500italic.woff2 | Bin 0 -> 16304 bytes .../resources/fonts/noto-serif-v23-latin-600.woff2 | Bin 0 -> 15212 bytes .../fonts/noto-serif-v23-latin-600italic.woff2 | Bin 0 -> 16260 bytes .../resources/fonts/noto-serif-v23-latin-700.woff2 | Bin 0 -> 14964 bytes .../fonts/noto-serif-v23-latin-700italic.woff2 | Bin 0 -> 15812 bytes .../resources/fonts/noto-serif-v23-latin-800.woff2 | Bin 0 -> 15568 bytes .../fonts/noto-serif-v23-latin-800italic.woff2 | Bin 0 -> 16768 bytes .../resources/fonts/noto-serif-v23-latin-900.woff2 | Bin 0 -> 15436 bytes .../fonts/noto-serif-v23-latin-900italic.woff2 | Bin 0 -> 16628 bytes .../fonts/noto-serif-v23-latin-italic.woff2 | Bin 0 -> 15640 bytes .../fonts/noto-serif-v23-latin-regular.woff2 | Bin 0 -> 14612 bytes src/site/resources/fonts/noto-serif-v23-latin.zip | Bin 0 -> 286034 bytes src/site/resources/fonts/open-sans-OFL.txt | 93 + .../resources/fonts/open-sans-v40-latin-300.woff2 | Bin 0 -> 18704 bytes .../fonts/open-sans-v40-latin-300italic.woff2 | Bin 0 -> 19332 bytes .../resources/fonts/open-sans-v40-latin-500.woff2 | Bin 0 -> 18720 bytes .../fonts/open-sans-v40-latin-500italic.woff2 | Bin 0 -> 19332 bytes .../resources/fonts/open-sans-v40-latin-600.woff2 | Bin 0 -> 18596 bytes .../fonts/open-sans-v40-latin-600italic.woff2 | Bin 0 -> 19328 bytes .../resources/fonts/open-sans-v40-latin-700.woff2 | Bin 0 -> 18260 bytes .../fonts/open-sans-v40-latin-700italic.woff2 | Bin 0 -> 18860 bytes .../resources/fonts/open-sans-v40-latin-800.woff2 | Bin 0 -> 18644 bytes .../fonts/open-sans-v40-latin-800italic.woff2 | Bin 0 -> 19056 bytes .../fonts/open-sans-v40-latin-italic.woff2 | Bin 0 -> 19280 bytes .../fonts/open-sans-v40-latin-regular.woff2 | Bin 0 -> 18668 bytes src/site/resources/glyphicons-halflings-2-1.zip | Bin 4101069 -> 0 bytes src/site/resources/images/log4j-logo.png | Bin 0 -> 71270 bytes .../resources/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes src/site/resources/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes src/site/resources/img/glyphicons/book.png | Bin 173 -> 0 bytes src/site/resources/img/glyphicons/cog.png | Bin 300 -> 0 bytes src/site/resources/img/glyphicons/home.png | Bin 235 -> 0 bytes src/site/resources/img/glyphicons/info.png | Bin 235 -> 0 bytes src/site/resources/img/glyphicons/layers.png | Bin 260 -> 0 bytes src/site/resources/img/glyphicons/link.png | Bin 233 -> 0 bytes src/site/resources/img/glyphicons/pencil.png | Bin 248 -> 0 bytes src/site/resources/img/glyphicons/tag.png | Bin 245 -> 0 bytes src/site/resources/logo/logo-2.9.1.png | Bin 31667 -> 0 bytes src/site/resources/logo/logo-2.9.1.xcf | Bin 63493 -> 0 bytes src/site/resources/logo/logo-3d-green-bg-2.png | Bin 33619 -> 0 bytes src/site/resources/logo/logo-3d-green-bg-2.xcf | Bin 58311 -> 0 bytes src/site/resources/logo/logo-3d-green-bg.png | Bin 32865 -> 0 bytes src/site/resources/logo/logo-3d-green-bg.xcf | Bin 58333 -> 0 bytes src/site/resources/logo/logo-big-blue-cup-2.10.png | Bin 33655 -> 0 bytes src/site/resources/logo/logo-big-blue-cup-2.10.xcf | Bin 59855 -> 0 bytes src/site/resources/logo/logo-big-blue-cup-2.9.png | Bin 33960 -> 0 bytes src/site/resources/logo/logo-big-blue-cup-2.9.xcf | Bin 59949 -> 0 bytes src/site/resources/logo/logo-big-blue-cup.xcf | Bin 60186 -> 0 bytes src/site/resources/logo/logo-big-blue.png | Bin 30347 -> 0 bytes src/site/resources/logo/logo-big-blue.xcf | Bin 55133 -> 0 bytes src/site/resources/logo/logo-blue-web-2.11.0.png | Bin 38475 -> 0 bytes src/site/resources/logo/logo-blue-web-2.11.0.xcf | Bin 65088 -> 0 bytes src/site/resources/logo/logo-blue-web-r2.6.png | Bin 38268 -> 0 bytes src/site/resources/logo/logo-blue-web-r2.6.xcf | Bin 64192 -> 0 bytes src/site/resources/logo/logo-blue-web.png | Bin 35254 -> 0 bytes src/site/resources/logo/logo-blue-web.xcf | Bin 63386 -> 0 bytes src/site/resources/logo/logo-chocolate-swirl-2.png | Bin 31842 -> 0 bytes src/site/resources/logo/logo-chocolate-swirl-2.xcf | Bin 58254 -> 0 bytes src/site/resources/logo/logo-chocolate-swirl.png | Bin 34753 -> 0 bytes src/site/resources/logo/logo-chocolate-swirl.xcf | Bin 64646 -> 0 bytes src/site/resources/logo/logo-craters-2.png | Bin 30522 -> 0 bytes src/site/resources/logo/logo-craters-2.xcf | Bin 58393 -> 0 bytes src/site/resources/logo/logo-craters.png | Bin 32590 -> 0 bytes src/site/resources/logo/logo-craters.xcf | Bin 58716 -> 0 bytes .../resources/logo/logo-electric-blue-2-2.8.2.png | Bin 40494 -> 0 bytes .../resources/logo/logo-electric-blue-2-2.8.2.xcf | Bin 67168 -> 0 bytes src/site/resources/logo/logo-electric-blue-2.xcf | Bin 66097 -> 0 bytes src/site/resources/logo/logo-electric-blue.png | Bin 31853 -> 0 bytes src/site/resources/logo/logo-electric-blue.xcf | Bin 58321 -> 0 bytes src/site/resources/logo/logo-granite-2.png | Bin 33714 -> 0 bytes src/site/resources/logo/logo-granite-2.xcf | Bin 58695 -> 0 bytes src/site/resources/logo/logo-granite.png | Bin 31959 -> 0 bytes src/site/resources/logo/logo-granite.xcf | Bin 58354 -> 0 bytes src/site/resources/logo/logo-ice.png | Bin 33947 -> 0 bytes src/site/resources/logo/logo-ice.xcf | Bin 64835 -> 0 bytes src/site/resources/logo/logo-java-1.png | Bin 33698 -> 0 bytes src/site/resources/logo/logo-java-1.xcf | Bin 58663 -> 0 bytes src/site/resources/logo/logo-java-2-2.6.2.png | Bin 40736 -> 0 bytes src/site/resources/logo/logo-java-2-2.6.2.xcf | Bin 66719 -> 0 bytes src/site/resources/logo/logo-java-2.png | Bin 36999 -> 0 bytes src/site/resources/logo/logo-java-2.xcf | Bin 64767 -> 0 bytes src/site/resources/logo/logo-java-3.png | Bin 33016 -> 0 bytes src/site/resources/logo/logo-java-3.xcf | Bin 58335 -> 0 bytes src/site/resources/logo/logo-leather-2.png | Bin 33766 -> 0 bytes src/site/resources/logo/logo-leather-2.xcf | Bin 58757 -> 0 bytes src/site/resources/logo/logo-leather.png | Bin 32668 -> 0 bytes src/site/resources/logo/logo-leather.xcf | Bin 58406 -> 0 bytes src/site/resources/logo/logo-lightning-2.6.1.png | Bin 41622 -> 0 bytes src/site/resources/logo/logo-lightning-2.6.1.xcf | Bin 65630 -> 0 bytes src/site/resources/logo/logo-lightning.png | Bin 38593 -> 0 bytes src/site/resources/logo/logo-lightning.xcf | Bin 64749 -> 0 bytes src/site/resources/logo/logo-marble-1.png | Bin 33208 -> 0 bytes src/site/resources/logo/logo-marble-1.xcf | Bin 64833 -> 0 bytes src/site/resources/logo/logo-paper-1.png | Bin 33016 -> 0 bytes src/site/resources/logo/logo-paper-1.xcf | Bin 58337 -> 0 bytes src/site/resources/logo/logo-paper-2.png | Bin 33082 -> 0 bytes src/site/resources/logo/logo-paper-2.xcf | Bin 58324 -> 0 bytes src/site/resources/logo/logo-parque-1.png | Bin 33676 -> 0 bytes src/site/resources/logo/logo-parque-1.xcf | Bin 58334 -> 0 bytes src/site/resources/logo/logo-parque-2.png | Bin 32530 -> 0 bytes src/site/resources/logo/logo-parque-2.xcf | Bin 58370 -> 0 bytes src/site/resources/logo/logo-parque-3.png | Bin 32927 -> 0 bytes src/site/resources/logo/logo-parque-3.xcf | Bin 58348 -> 0 bytes .../resources/logo/logo-pastel-stuff-2.8.1.png | Bin 40517 -> 0 bytes src/site/resources/logo/logo-pastel-stuff-2.png | Bin 33441 -> 0 bytes src/site/resources/logo/logo-pastel-stuff-2.xcf | Bin 58354 -> 0 bytes src/site/resources/logo/logo-pastel-stuff-3.png | Bin 33194 -> 0 bytes src/site/resources/logo/logo-pastel-stuff-3.xcf | Bin 58367 -> 0 bytes src/site/resources/logo/logo-pastel-stuff.png | Bin 37102 -> 0 bytes src/site/resources/logo/logo-pastel-stuff.xcf | Bin 66300 -> 0 bytes src/site/resources/logo/logo-pine.png | Bin 28260 -> 0 bytes src/site/resources/logo/logo-pine.xcf | Bin 61254 -> 0 bytes src/site/resources/logo/logo-pool-bottom-2.7.png | Bin 36964 -> 0 bytes src/site/resources/logo/logo-pool-bottom-bg.png | Bin 31480 -> 0 bytes src/site/resources/logo/logo-pool-bottom-bg.xcf | Bin 58386 -> 0 bytes src/site/resources/logo/logo-pool-bottom.png | Bin 33961 -> 0 bytes src/site/resources/logo/logo-pool-bottom.xcf | Bin 64819 -> 0 bytes src/site/resources/logo/logo-qbert.png | Bin 34606 -> 0 bytes src/site/resources/logo/logo-qbert.xcf | Bin 64777 -> 0 bytes src/site/resources/logo/logo-rain.png | Bin 34527 -> 0 bytes src/site/resources/logo/logo-rain.xcf | Bin 64686 -> 0 bytes src/site/resources/logo/logo-red-cubes.png | Bin 32485 -> 0 bytes src/site/resources/logo/logo-red-cubes.xcf | Bin 58334 -> 0 bytes src/site/resources/logo/logo-rocks.png | Bin 39238 -> 0 bytes src/site/resources/logo/logo-rocks.xcf | Bin 64798 -> 0 bytes src/site/resources/logo/logo-sky.png | Bin 33307 -> 0 bytes src/site/resources/logo/logo-sky.xcf | Bin 64206 -> 0 bytes src/site/resources/logo/logo-starfield.png | Bin 30603 -> 0 bytes src/site/resources/logo/logo-starfield.xcf | Bin 56479 -> 0 bytes src/site/resources/logo/logo-stone-2.8.png | Bin 42958 -> 0 bytes src/site/resources/logo/logo-stone-2.8.xcf | Bin 65661 -> 0 bytes src/site/resources/logo/logo-stone.png | Bin 39696 -> 0 bytes src/site/resources/logo/logo-stone.xcf | Bin 64755 -> 0 bytes src/site/resources/logo/logo-tree-bark.png | Bin 40313 -> 0 bytes src/site/resources/logo/logo-tree-bark.xcf | Bin 64751 -> 0 bytes src/site/resources/logo/logo-walnut.png | Bin 35644 -> 0 bytes src/site/resources/logo/logo-walnut.xcf | Bin 64852 -> 0 bytes src/site/resources/logo/logo-wood-1.png | Bin 34322 -> 0 bytes src/site/resources/logo/logo-wood-1.xcf | Bin 64867 -> 0 bytes src/site/resources/logo/logo-wood-2.png | Bin 33795 -> 0 bytes src/site/resources/logo/logo-wood-2.xcf | Bin 64846 -> 0 bytes src/site/resources/logo/logo-wood.png | Bin 37241 -> 0 bytes src/site/resources/logo/logo-wood.xcf | Bin 64930 -> 0 bytes src/site/resources/logo/logo.jpg | Bin 14818 -> 0 bytes src/site/xdoc/guidelines.xml | 358 -- src/site/xdoc/javastyle.xml | 806 --- src/site/xdoc/manual/api.xml | 173 - src/site/xdoc/manual/appenders.xml | 5543 -------------------- src/site/xdoc/manual/architecture.xml | 741 --- src/site/xdoc/manual/async.xml | 1002 ---- src/site/xdoc/manual/configuration.xml.vm | 2999 ----------- src/site/xdoc/manual/customconfig.xml | 378 -- src/site/xdoc/manual/customloglevels.xml.vm | 347 -- src/site/xdoc/manual/extending.xml | 580 -- src/site/xdoc/manual/filters.xml | 1059 ---- src/site/xdoc/manual/garbagefree.xml | 615 --- src/site/xdoc/manual/index.xml | 147 - src/site/xdoc/manual/jmx.xml.vm | 109 - src/site/xdoc/manual/layouts.xml.vm | 2757 ---------- src/site/xdoc/manual/logbuilder.xml | 112 - src/site/xdoc/manual/logsep.xml | 125 - src/site/xdoc/manual/lookups.xml | 752 --- src/site/xdoc/manual/markers.xml | 109 - src/site/xdoc/manual/messages.xml | 332 -- src/site/xdoc/manual/plugins.xml | 259 - src/site/xdoc/manual/thread-context.xml | 217 - src/site/xdoc/manual/usage.xml | 258 - src/site/xdoc/manual/webapp.xml | 464 -- src/site/xdoc/performance.xml | 468 -- src/site/xdoc/runtime-dependencies.xml | 445 -- src/site/xdoc/thanks.xml | 134 - 300 files changed, 26658 insertions(+), 24267 deletions(-) diff --cc pom.xml index feb520e4a4,dd40787ceb..632c58ffee --- a/pom.xml +++ b/pom.xml @@@ -742,238 -735,16 +742,201 @@@ </executions> </plugin> + <!-- Download plugin descriptors --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>download-plugin-descriptors</id> + <goals> + <goal>copy</goal> + </goals> + <phase>pre-site</phase> + <inherited>false</inherited> + <configuration> + <outputDirectory>${project.build.directory}/plugin-descriptors</outputDirectory> + <artifactItems> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-cassandra</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-couchdb</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-docker</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-flume-ng</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jakarta-web</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jdbc-dbcp2</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jpa</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-layout-template-json</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-mongodb3</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-mongodb4</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + <artifactItem> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-spring-boot</artifactId> + <version>${docgen.log4j.version}</version> + <type>xml</type> + <classifier>log4j-plugins</classifier> + </artifactItem> + + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-docgen-maven-plugin</artifactId> + <version>${log4j-docgen.version}</version> + <inherited>false</inherited> + + <!-- Common docgen configuration --> + <configuration> + <descriptorFileMatchers> + <descriptorFileMatcher> + <baseDirectory>${project.build.directory}/plugin-descriptors</baseDirectory> + <pathPatterns>glob:**/*.xml</pathPatterns> + </descriptorFileMatcher> + </descriptorFileMatchers> + <typeFilter> + <excludes> + <exclude>java\..+</exclude> + </excludes> + </typeFilter> + </configuration> + + <executions> + + <!-- Generate AsciiDoc from download plugin descriptors --> + <execution> + <id>generate-plugin-docs</id> + <goals> + <goal>generate-documentation</goal> + </goals> + <phase>pre-site</phase> + <configuration> + <templateDirectory>${project.basedir}/src/docgen-templates</templateDirectory> + <indexTemplate> + <source>index.adoc.ftl</source> + <target>${project.build.directory}/generated-sources/site/asciidoc/plugin-reference.adoc</target> + </indexTemplate> + <typeTemplate> + <source>type.adoc.ftl</source> + <target>${project.build.directory}/generated-sources/site/asciidoc/plugin-reference/%g/%a/%c.adoc</target> + </typeTemplate> + </configuration> + </execution> + + <!-- Generate XSD from download plugin descriptors --> + <execution> + <id>generate-plugin-schema</id> + <goals> + <goal>generate-schema</goal> + </goals> + <phase>pre-site</phase> + <configuration> + <schemaFile>${project.build.directory}/generated-sources/site/resources/config.xsd</schemaFile> + </configuration> + </execution> + + </executions> + + </plugin> + <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <executions> - <execution> - <id>team-list</id> - <goals> - <goal>team</goal> - </goals> - <phase>site</phase> - <inherited>false</inherited> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <inherited>false</inherited> - <configuration combine.self="override"> - <skip>false</skip> - <generateProjectInfo>false</generateProjectInfo> - <generateReports>false</generateReports> - <siteDirectory>${project.build.directory}/generated-sources/site</siteDirectory> - <locales>en</locales> - <!-- Exclude the navigation file for Maven 1 sites as it interferes with the site generation. --> - <moduleExcludes> - <xdoc>navigation.xml</xdoc> - </moduleExcludes> - <attributes> - <Log4jReleaseVersion>${revision}</Log4jReleaseVersion> - </attributes> - </configuration> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> <dependencies> <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctor-maven-plugin</artifactId> - <version>${asciidoctor-maven-plugin.version}</version> + <groupId>io.spring.asciidoctor</groupId> + <artifactId>spring-asciidoctor-extensions-block-switch</artifactId> + <version>0.6.3</version> </dependency> </dependencies> - </plugin> - - <!-- We (sadly) use `maven-site-plugin`, which handles AsciiDoc files. - Hence, skip the `asciidoctor-maven-plugin` redundant execution inherited from the parent. --> - <plugin> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctor-maven-plugin</artifactId> <executions> <execution> <id>export-asciidoc-to-html</id>
