You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gr...@apache.org on 2024/03/05 11:15:10 UTC
(logging-log4j2) branch ms12_conversion_of_md_files updated (100ec64556 -> 75124eecff)
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a change to branch ms12_conversion_of_md_files
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 100ec64556 fixed line break
new b8b4996028 added execution id to asciidoc config
new 059e810c4c removed unused glyphicons from build
new c072e2afa5 removed unused site code
new 75124eecff added scroll behavior for table of content, in case its getting bigger than expected
The 4 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:
pom.xml | 86 +++++++-----------------
src/site/resources/css/logging-custom.css | 3 +
src/site/resources/glyphicons-halflings-2-1.zip | Bin 4101069 -> 0 bytes
3 files changed, 26 insertions(+), 63 deletions(-)
delete mode 100644 src/site/resources/glyphicons-halflings-2-1.zip
(logging-log4j2) 02/04: removed unused glyphicons from build
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch ms12_conversion_of_md_files
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 059e810c4c7feeb4d83ecdea8b878250f4aa5665
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Tue Mar 5 12:14:40 2024 +0100
removed unused glyphicons from build
---
pom.xml | 1 -
src/site/resources/glyphicons-halflings-2-1.zip | Bin 4101069 -> 0 bytes
2 files changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2b750d0c4d..8f74bceeab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -743,7 +743,6 @@
<excludes>
<exclude>/_release-notes/*</exclude>
<exclude>/_release-notes.adoc</exclude>
- <exclude>/resources/glyphicons-halflings-2-1.zip</exclude>
<exclude>/resources/logo/**/*</exclude>
</excludes>
</resource>
diff --git a/src/site/resources/glyphicons-halflings-2-1.zip b/src/site/resources/glyphicons-halflings-2-1.zip
deleted file mode 100644
index 974885b408..0000000000
Binary files a/src/site/resources/glyphicons-halflings-2-1.zip and /dev/null differ
(logging-log4j2) 04/04: added scroll behavior for table of content, in case its getting bigger than expected
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch ms12_conversion_of_md_files
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 75124eecff7fda3585c2c1709423428e06dcda31
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Tue Mar 5 12:15:02 2024 +0100
added scroll behavior for table of content, in case its getting bigger than expected
---
src/site/resources/css/logging-custom.css | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/site/resources/css/logging-custom.css b/src/site/resources/css/logging-custom.css
index bacccad2bd..ee1aa7a53e 100644
--- a/src/site/resources/css/logging-custom.css
+++ b/src/site/resources/css/logging-custom.css
@@ -151,6 +151,9 @@
.table-of-content {
width: 20vw;
padding: 2em;
+ height: 100vh;
+ max-height: 100vh;
+ overflow: scroll;
background-color: #fff;
}
(logging-log4j2) 03/04: removed unused site code
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch ms12_conversion_of_md_files
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c072e2afa566aa4e58f844b12064022ed5f1fcc6
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Tue Mar 5 12:14:47 2024 +0100
removed unused site code
---
pom.xml | 43 -------------------------------------------
1 file changed, 43 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8f74bceeab..824ac06c38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -836,49 +836,6 @@
</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>-->
-<!-- <dependencies>-->
-<!-- <dependency>-->
-<!-- <groupId>org.asciidoctor</groupId>-->
-<!-- <artifactId>asciidoctor-maven-plugin</artifactId>-->
-<!-- <version>${asciidoctor-maven-plugin.version}</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>-->
-<!-- <configuration>-->
-<!-- <skip>true</skip>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
-
<!-- ███████ ███ ██ ██████ ███████ ██ ████████ ███████
██ ████ ██ ██ ██ ██ ██ ██ ██ ██
█████ ██ ██ ██ ██ ██ ███████ ██ ██ █████
(logging-log4j2) 01/04: added execution id to asciidoc config
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch ms12_conversion_of_md_files
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b8b499602833b152102edf7148c856d3d00e7ecc
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Tue Mar 5 12:14:24 2024 +0100
added execution id to asciidoc config
---
pom.xml | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 81948c25cc..2b750d0c4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -809,28 +809,32 @@
</executions>
</plugin>
-
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
- <configuration>
- <resources>
- <resource>
- <directory>src/site/resources</directory>
- </resource>
- </resources>
- <enableVerbose>true</enableVerbose>
- <sourceDirectory>src/site/asciidoc</sourceDirectory>
- <outputDirectory>target/site</outputDirectory>
- <preserveDirectories>true</preserveDirectories>
- <templateDirs>
- <dir>src/asciidoc/templates</dir>
- </templateDirs>
- <attributes>
- <source-highlighter>rouge</source-highlighter>
- <toc>left</toc>
- </attributes>
- </configuration>
+ <executions>
+ <execution>
+ <id>export-asciidoc-to-html</id>
+ <configuration combine.self="override">
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/generated-sources/site/resources</directory>
+ </resource>
+ </resources>
+ <enableVerbose>true</enableVerbose>
+ <sourceDirectory>${project.build.directory}/generated-sources/site/asciidoc</sourceDirectory>
+ <outputDirectory>target/site</outputDirectory>
+ <preserveDirectories>true</preserveDirectories>
+ <templateDirs>
+ <dir>src/asciidoc/templates</dir>
+ </templateDirs>
+ <attributes>
+ <source-highlighter>rouge</source-highlighter>
+ <toc>left</toc>
+ </attributes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>