You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@logging.apache.org by "FreeAndNil (via GitHub)" <gi...@apache.org> on 2024/11/18 18:32:31 UTC
[PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
FreeAndNil opened a new pull request, #210:
URL: https://github.com/apache/logging-log4net/pull/210
(no comment)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "FreeAndNil (via GitHub)" <gi...@apache.org>.
FreeAndNil commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045351878
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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>
Review Comment:
check
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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>
Review Comment:
check
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "FreeAndNil (via GitHub)" <gi...@apache.org>.
FreeAndNil commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045298557
##########
antora-playbook.yaml:
##########
@@ -0,0 +1,141 @@
+#
+# 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.
+#
+
+site:
+ title: Apache log4net
+ url: "https://logging.apache.org/log4net"
+ start_page: "ROOT::index.adoc"
+
+content:
+ sources:
+ - url: .
+ branches: HEAD
+ start_paths:
+ - target/generated-site/antora
+ edit_url:
+
+runtime:
+ log:
+ # Fail on warnings
+ failure_level: warn
+
+asciidoc:
+ extensions:
+ - "@asciidoctor/tabs"
+
+ui:
+
+ bundle:
+ url: "https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/HEAD/raw/build/ui-bundle.zip?job=bundle-stable"
+ snapshot: true
+
+ # Template files: https://github.com/asciidoctor/asciidoctor-docs-ui/blob/main/src
+ # Template variables: https://docs.antora.org/antora-ui-default/templates
+ supplemental_files:
+
+ # Add `@asciidoctor/tabs` extension styles
+ - path: css/vendor/tabs.css
+ contents: ./node_modules/@asciidoctor/tabs/dist/css/tabs.css
+
+ # Add `@asciidoctor/tabs` extension scripts
+ - path: js/vendor/tabs.js
+ contents: ./node_modules/@asciidoctor/tabs/dist/js/tabs.js
+
+ - path: partials/footer-scripts.hbs
+ contents: |
+ <script id="site-script" src="{{{uiRootPath}}}/js/site.js" data-ui-root-path="{{{uiRootPath}}}"></script>
+ <script async src="{{{uiRootPath}}}/js/vendor/highlight.js"></script>
+ <!-- `@asciidoctor/tabs` extension scripts -->
+ <script async src="{{{uiRootPath}}}/js/vendor/tabs.js"></script>
+ {{#if env.SITE_SEARCH_PROVIDER}}
+ {{> search-scripts}}
+ {{/if}}
+
+ - path: partials/head-styles.hbs
+ contents: |
+ <link rel="stylesheet" href="{{{uiRootPath}}}/css/site.css">
+ <link rel="icon" href="{{{uiRootPath}}}/../_images/favicon.ico" type="image/x-icon">
+ <!-- `@asciidoctor/tabs` extension styles -->
+ <link rel="stylesheet" href="{{{uiRootPath}}}/css/vendor/tabs.css">
+ <style>
+ /* Swap colors of `IMPORTANT` and `WARNING` blocks */
+ .doc .admonitionblock.important .icon { background-color: #f70; }
+ .doc .admonitionblock.warning .icon { background-color: #e40046; }
+ /* Default `h4`, `h5`, and `h6` are smaller than the normal text, fix header font sizing: */
+ .doc h1 { font-size: 1.9rem; }
+ .doc h2 { font-size: 1.7rem; }
+ .doc h3 { font-size: 1.5rem; font-weight: 400; }
+ .doc h4 { font-size: 1.3rem; font-weight: 500; }
+ .doc h5 { font-size: 1.1rem; font-weight: 500; text-decoration: underline; }
+ .doc h6 { font-size: 0.9rem; font-weight: 500; text-decoration: underline; }
+ /* Default `code`, `pre`, and `.colist` (source code annotations) fonts are too big, adjust them: */
+ .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
+ .doc pre { font-size: 0.7rem; }
+ .doc .colist { font-size: 0.75rem; }
+ /* Make links more visible: */
+ .doc a { text-decoration: underline; }
+ .doc a code { text-decoration: underline; color: #1565c0; }
+ /* Tab header fonts aren't rendered good, adjusting the font weight: */
+ .tablist > ul li { font-weight: 500; }
+ /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
+ .toc .toc-menu li[data-level="4"] a {
+ padding-left: 2.75rem;
+ }
+ /* Replace the default highlight.js color for strings from red (unnecessarily signaling something negative) to green: */
+ .hljs-string {
+ color: #0f8532;
+ }
+ </style>
+
+ - path: partials/header-content.hbs
+ contents: |
+ <header class="header">
+ <nav class="navbar">
+ <div class="navbar-brand">
+ <span class="navbar-item title">{{site.title}}</span>
+ </div>
+ <div id="topbar-nav" class="navbar-menu">
+ <div class="navbar-end">
+ <a class="navbar-item" href="https://logging.apache.org">a subproject of <strong>Apache Logging Services</strong></a>
+ </div>
+ </div>
+ </nav>
+ </header>
+
+ - path: partials/footer-content.hbs
+ contents: |
+ <footer class="footer">
+ <p>
+ Copyright © 1999-{{{year}}} <a href="https://www.apache.org/">The Apache Software Foundation</a>.
+ Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache Software License, Version 2.0</a>.
+ Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
+ </p>
+ <p>
+ Apache, Log4j, and the Apache feather logo are trademarks or registered trademarks of The Apache Software Foundation.
+ Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ Other names may be trademarks of their respective owners.
+ </p>
+ </footer>
+
+ # Disable component version selector
+ - path: partials/nav-explore.hbs
+ contents: ""
+
+ # Fix the `Edit this page` link
+ - path: partials/edit-this-page.hbs
+ contents: |
+ <div class="edit-this-page"><a href="https://github.com/apache/logging-log4net/edit/Feature/Antora/src/site/antora/modules/{{page.module}}/pages/{{page.relativeSrcPath}}">Edit this Page</a></div>
Review Comment:
Yes, I already have fixed this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "FreeAndNil (via GitHub)" <gi...@apache.org>.
FreeAndNil commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045319737
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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>
Review Comment:
I think spotless checks for the license headers, but I'm not sure.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "FreeAndNil (via GitHub)" <gi...@apache.org>.
FreeAndNil commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045307641
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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`.
Review Comment:
@vy What is the "most recent logging-parent version"?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045294226
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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 -->
Review Comment:
You can remove this block.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "fluffynuts (via GitHub)" <gi...@apache.org>.
fluffynuts commented on PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#issuecomment-2788974411
staged site looks good 👍
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045288723
##########
antora-playbook.yaml:
##########
@@ -0,0 +1,141 @@
+#
+# 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.
+#
+
+site:
+ title: Apache log4net
+ url: "https://logging.apache.org/log4net"
+ start_page: "ROOT::index.adoc"
+
+content:
+ sources:
+ - url: .
+ branches: HEAD
+ start_paths:
+ - target/generated-site/antora
+ edit_url:
+
+runtime:
+ log:
+ # Fail on warnings
+ failure_level: warn
+
+asciidoc:
+ extensions:
+ - "@asciidoctor/tabs"
+
+ui:
+
+ bundle:
+ url: "https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/HEAD/raw/build/ui-bundle.zip?job=bundle-stable"
+ snapshot: true
+
+ # Template files: https://github.com/asciidoctor/asciidoctor-docs-ui/blob/main/src
+ # Template variables: https://docs.antora.org/antora-ui-default/templates
+ supplemental_files:
+
+ # Add `@asciidoctor/tabs` extension styles
+ - path: css/vendor/tabs.css
+ contents: ./node_modules/@asciidoctor/tabs/dist/css/tabs.css
+
+ # Add `@asciidoctor/tabs` extension scripts
+ - path: js/vendor/tabs.js
+ contents: ./node_modules/@asciidoctor/tabs/dist/js/tabs.js
+
+ - path: partials/footer-scripts.hbs
+ contents: |
+ <script id="site-script" src="{{{uiRootPath}}}/js/site.js" data-ui-root-path="{{{uiRootPath}}}"></script>
+ <script async src="{{{uiRootPath}}}/js/vendor/highlight.js"></script>
+ <!-- `@asciidoctor/tabs` extension scripts -->
+ <script async src="{{{uiRootPath}}}/js/vendor/tabs.js"></script>
+ {{#if env.SITE_SEARCH_PROVIDER}}
+ {{> search-scripts}}
+ {{/if}}
+
+ - path: partials/head-styles.hbs
+ contents: |
+ <link rel="stylesheet" href="{{{uiRootPath}}}/css/site.css">
+ <link rel="icon" href="{{{uiRootPath}}}/../_images/favicon.ico" type="image/x-icon">
+ <!-- `@asciidoctor/tabs` extension styles -->
+ <link rel="stylesheet" href="{{{uiRootPath}}}/css/vendor/tabs.css">
+ <style>
+ /* Swap colors of `IMPORTANT` and `WARNING` blocks */
+ .doc .admonitionblock.important .icon { background-color: #f70; }
+ .doc .admonitionblock.warning .icon { background-color: #e40046; }
+ /* Default `h4`, `h5`, and `h6` are smaller than the normal text, fix header font sizing: */
+ .doc h1 { font-size: 1.9rem; }
+ .doc h2 { font-size: 1.7rem; }
+ .doc h3 { font-size: 1.5rem; font-weight: 400; }
+ .doc h4 { font-size: 1.3rem; font-weight: 500; }
+ .doc h5 { font-size: 1.1rem; font-weight: 500; text-decoration: underline; }
+ .doc h6 { font-size: 0.9rem; font-weight: 500; text-decoration: underline; }
+ /* Default `code`, `pre`, and `.colist` (source code annotations) fonts are too big, adjust them: */
+ .doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
+ .doc pre { font-size: 0.7rem; }
+ .doc .colist { font-size: 0.75rem; }
+ /* Make links more visible: */
+ .doc a { text-decoration: underline; }
+ .doc a code { text-decoration: underline; color: #1565c0; }
+ /* Tab header fonts aren't rendered good, adjusting the font weight: */
+ .tablist > ul li { font-weight: 500; }
+ /* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
+ .toc .toc-menu li[data-level="4"] a {
+ padding-left: 2.75rem;
+ }
+ /* Replace the default highlight.js color for strings from red (unnecessarily signaling something negative) to green: */
+ .hljs-string {
+ color: #0f8532;
+ }
+ </style>
+
+ - path: partials/header-content.hbs
+ contents: |
+ <header class="header">
+ <nav class="navbar">
+ <div class="navbar-brand">
+ <span class="navbar-item title">{{site.title}}</span>
+ </div>
+ <div id="topbar-nav" class="navbar-menu">
+ <div class="navbar-end">
+ <a class="navbar-item" href="https://logging.apache.org">a subproject of <strong>Apache Logging Services</strong></a>
+ </div>
+ </div>
+ </nav>
+ </header>
+
+ - path: partials/footer-content.hbs
+ contents: |
+ <footer class="footer">
+ <p>
+ Copyright © 1999-{{{year}}} <a href="https://www.apache.org/">The Apache Software Foundation</a>.
+ Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache Software License, Version 2.0</a>.
+ Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
+ </p>
+ <p>
+ Apache, Log4j, and the Apache feather logo are trademarks or registered trademarks of The Apache Software Foundation.
+ Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ Other names may be trademarks of their respective owners.
+ </p>
+ </footer>
+
+ # Disable component version selector
+ - path: partials/nav-explore.hbs
+ contents: ""
+
+ # Fix the `Edit this page` link
+ - path: partials/edit-this-page.hbs
+ contents: |
+ <div class="edit-this-page"><a href="https://github.com/apache/logging-log4net/edit/Feature/Antora/src/site/antora/modules/{{page.module}}/pages/{{page.relativeSrcPath}}">Edit this Page</a></div>
Review Comment:
@FreeAndNil, I presume you fixed this after the merge?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045290332
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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>
Review Comment:
I think you can remove this completely.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045299948
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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>
Review Comment:
@ppkarwasz, do we have any Spotless configuration this project can take advantage of? Otherwise, shall @FreeAndNil remove this plugin execution?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045293724
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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!
Review Comment:
I think you can remove the entire `dependencyManagement` element.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045298863
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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`.
Review Comment:
Isn't this `logging-parent` bug already fixed in the most recent version? I'd switch to the most recent `logging-parent` version, remove this block, and see if everything still works.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "FreeAndNil (via GitHub)" <gi...@apache.org>.
FreeAndNil merged PR #210:
URL: https://github.com/apache/logging-log4net/pull/210
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "FreeAndNil (via GitHub)" <gi...@apache.org>.
FreeAndNil commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045307641
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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`.
Review Comment:
@vy What is the "most recent logging-parent version"?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045290659
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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>
Review Comment:
I think you can remove this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "FreeAndNil (via GitHub)" <gi...@apache.org>.
FreeAndNil commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045350948
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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>
Review Comment:
I've removed Spotless.
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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`.
Review Comment:
check
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "FreeAndNil (via GitHub)" <gi...@apache.org>.
FreeAndNil commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045351528
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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 -->
Review Comment:
check
##########
pom.xml:
##########
@@ -39,157 +58,131 @@
<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!
Review Comment:
check
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "FreeAndNil (via GitHub)" <gi...@apache.org>.
FreeAndNil commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045350487
##########
src/site/antora/antora.yml:
##########
@@ -0,0 +1,50 @@
+#
+# 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.
+#
+
+#
+# ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
+# ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
+# ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
+# ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
+# ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
+#
+# THIS FILE IS A STUB!
+#
+# The actual `antora.yml` that is used in `target/generated-site/antora` is auto-generated from `antora.tmpl.yml`.
+# Auto-generation happens during `pre-site` phase of Maven.
+# Hence, you must always
+#
+# 1. Edit `antora.tmpl.yml`
+# 2. Edit `antora.yml` to match the fields in `antora.tmpl.yml` and fill Maven property placeholders with dummy values
+#
+
+name: ROOT
+title: Home
+version: ~
+start_page: index.adoc
+asciidoc:
+ attributes:
+ project-github-url: "https://github.com/apache/logging-log4j-tools"
+ project-version: "1.2.3"
+ project-name: "Log4j Tools"
+ project-id: "log4j-tools"
+ java-target-version: "8"
+ java-compiler-version: "[17,18)"
Review Comment:
check
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Migrate log4net site to Antora and use logging-parent pom (logging-log4net)
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #210:
URL: https://github.com/apache/logging-log4net/pull/210#discussion_r2045302745
##########
src/site/antora/antora.yml:
##########
@@ -0,0 +1,50 @@
+#
+# 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.
+#
+
+#
+# ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
+# ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
+# ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
+# ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
+# ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
+#
+# THIS FILE IS A STUB!
+#
+# The actual `antora.yml` that is used in `target/generated-site/antora` is auto-generated from `antora.tmpl.yml`.
+# Auto-generation happens during `pre-site` phase of Maven.
+# Hence, you must always
+#
+# 1. Edit `antora.tmpl.yml`
+# 2. Edit `antora.yml` to match the fields in `antora.tmpl.yml` and fill Maven property placeholders with dummy values
+#
+
+name: ROOT
+title: Home
+version: ~
+start_page: index.adoc
+asciidoc:
+ attributes:
+ project-github-url: "https://github.com/apache/logging-log4j-tools"
+ project-version: "1.2.3"
+ project-name: "Log4j Tools"
+ project-id: "log4j-tools"
+ java-target-version: "8"
+ java-compiler-version: "[17,18)"
Review Comment:
You might want to fix the mentions of Log4j Tools here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org