This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-logging.git
The following commit(s) were added to refs/heads/master by this push: new 18ed8eb Prepare for release candidate 18ed8eb is described below commit 18ed8eb8ada3713776bc68100cc05649d7a44882 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sun Nov 26 16:24:49 2023 -0500 Prepare for release candidate --- CONTRIBUTING.md | 44 +++++++++++++------ NOTICE.txt | 3 +- README.md | 45 ++++++++++++++------ RELEASE-NOTES.txt | 71 ++++++++++++++++++++++++++++++- src/changes/changes.xml | 2 +- src/changes/release-notes.vm | 10 +++-- src/site/xdoc/download_logging.xml | 66 ++++++++++++++++++----------- src/site/xdoc/issue-tracking.xml | 36 ++++++++-------- src/site/xdoc/mail-lists.xml | 87 +++++++++++++++++++++----------------- 9 files changed, 248 insertions(+), 116 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 22d84a5..a261465 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,7 +25,7 @@ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates | +======================================================================+ | | - | 1) Re-generate using: mvn commons:contributing-md | + | 1) Re-generate using: mvn commons-build:contributing-md | | | | 2) Set the following properties in the component's pom: | | - commons.jira.id (required, alphabetic, upper case) | @@ -51,47 +51,65 @@ Getting Started + Make sure you have a [JIRA account](https://issues.apache.org/jira/). + Make sure you have a [GitHub account](https://github.com/signup/free). + If you're planning to implement a new feature it makes sense to discuss your changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons Logging's scope. -+ Submit a ticket for your issue, assuming one does not already exist. ++ Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist. + Clearly describe the issue including steps to reproduce when it is a bug. + Make sure you fill in the earliest version that you know has the issue. -+ Fork the repository on GitHub. ++ Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-), +[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository. Making Changes -------------- -+ Create a topic branch from where you want to base your work (this is usually the master/trunk branch). ++ Create a _topic branch_ for your isolated work. + * Usually you should base your branch on the `master` branch. + * A good topic branch name can be the JIRA bug id plus a keyword, e.g. `LOGGING-123-InputStream`. + * If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests. + Make commits of logical units. + * Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue. + * e.g. `LOGGING-123: Close input stream earlier` + Respect the original code style: + Only use spaces for indentation. - + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change. - + Check for unnecessary whitespace with git diff --check before committing. -+ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue. -+ Make sure you have added the necessary tests for your changes. + + Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first. + + Check for unnecessary whitespace with `git diff` -- check before committing. ++ Make sure you have added the necessary tests for your changes, typically in `src/test/java`. + Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken. Making Trivial Changes ---------------------- +The JIRA tickets are used to generate the changelog for the next release. + For changes of a trivial nature to comments and documentation, it is not always necessary to create a new ticket in JIRA. In this case, it is appropriate to start the first line of a commit with '(doc)' instead of a ticket number. + Submitting Changes ------------------ -+ Sign the [Contributor License Agreement][cla] if you haven't already. ++ Sign and submit the Apache [Contributor License Agreement][cla] if you haven't already. + * Note that small patches & typical bug fixes do not require a CLA as + clause 5 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html#contributions) + covers them. + Push your changes to a topic branch in your fork of the repository. -+ Submit a pull request to the repository in the apache organization. ++ Submit a _Pull Request_ to the corresponding repository in the `apache` organization. + * Verify _Files Changed_ shows only your intended changes and does not + include additional files like `target/*.class` + Update your JIRA ticket and include a link to the pull request in the ticket. +If you prefer to not use GitHub, then you can instead use +`git format-patch` (or `svn diff`) and attach the patch file to the JIRA issue. + + Additional Resources -------------------- + [Contributing patches](https://commons.apache.org/patches.html) -+ [Apache Commons Logging JIRA project page](https://issues.apache.org/jira/browse/LOGGING) ++ [Apache Commons Logging JIRA project page][jira] + [Contributor License Agreement][cla] + [General GitHub documentation](https://help.github.com/) -+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/) ++ [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/) + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons) -+ #apachecommons IRC channel on freenode.org ++ `#apache-commons` IRC channel on `irc.freenode.net` [cla]:https://www.apache.org/licenses/#clas +[jira]:https://issues.apache.org/jira/browse/LOGGING diff --git a/NOTICE.txt b/NOTICE.txt index 53257af..67d7715 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,6 +1,5 @@ Apache Commons Logging -Copyright 2003-2023 The Apache Software Foundation +Copyright 2001-2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). - diff --git a/README.md b/README.md index caad61a..de5a25f 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates | +======================================================================+ | | - | 1) Re-generate using: mvn commons:readme-md | + | 1) Re-generate using: mvn commons-build:readme-md | | | | 2) Set the following properties in the component's pom: | | - commons.componentid (required, alphabetic, lower case) | @@ -42,40 +42,53 @@ ---> Apache Commons Logging =================== + [](https://github.com/apache/commons-logging/actions/workflows/maven.yml) +[](https://app.codecov.io/gh/apache/commons-logging) [](https://maven-badges.herokuapp.com/maven-central/commons-logging/commons-logging/?gav=true) +[](https://javadoc.io/doc/commons-logging/commons-logging/1.3.0) [](https://github.com/apache/commons-logging/actions/workflows/codeql-analysis.yml) +[](https://api.securityscorecards.dev/projects/github.com/apache/commons-logging) -Apache Commons Logging is a thin adapter allowing configurable bridging to other, well known logging systems. +Apache Commons Logging is a thin adapter allowing configurable bridging to other, + well known logging systems. Documentation ------------- More information can be found on the [Apache Commons Logging homepage](https://commons.apache.org/proper/commons-logging). -The [Javadoc](https://commons.apache.org/proper/commons-logging/javadocs/api-release) can be browsed. +The [Javadoc](https://commons.apache.org/proper/commons-logging/apidocs) can be browsed. Questions related to the usage of Apache Commons Logging should be posted to the [user mailing list][ml]. -Where can I get the latest release? ------------------------------------ +Getting the latest release +-------------------------- You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-logging/download_logging.cgi). -Alternatively, you can pull it from the central Maven repositories: +Alternatively, you can pull it from the central Maven repositories: ```xml <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.2</version> + <version>1.3.0</version> </dependency> ``` +Building +-------- + +Building requires a Java JDK and [Apache Maven](https://maven.apache.org/). +The required Java version is found in the `pom.xml` as the `maven.compiler.source` property. + +From a command shell, run `mvn` without arguments to invoke the default Maven goal to run all tests and checks. + Contributing ------------ -We accept Pull Requests via GitHub. The [developer mailing list][ml] is the main channel of communication for contributors. +We accept Pull Requests via GitHub. The [developer mailing list](https://commons.apache.org/mail-lists.html) is the main channel of communication for contributors. There are some guidelines which will make applying PRs easier for us: + No tabs! Please use spaces for indentation. -+ Respect the code style. ++ Respect the existing code style for each file. + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change. + Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running ```mvn```. @@ -84,20 +97,24 @@ You can learn more about contributing via GitHub in our [contribution guidelines License ------- -This code is under the [Apache License v2](https://www.apache.org/licenses/LICENSE-2.0). +This code is licensed under the [Apache License v2](https://www.apache.org/licenses/LICENSE-2.0). See the `NOTICE.txt` file for required notices and attributions. -Donations ---------- -You like Apache Commons Logging? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support the development. +Donating +-------- +You like Apache Commons Logging? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support development. Additional Resources -------------------- + [Apache Commons Homepage](https://commons.apache.org/) + [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/LOGGING) ++ [Apache Commons Slack Channel](https://the-asf.slack.com/archives/C60NVB8AD) + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons) + `#apache-commons` IRC channel on `irc.freenode.org` -[ml]:https://commons.apache.org/mail-lists.html +Apache Commons Components +------------------------- + +Please see the [list of components](https://commons.apache.org/components.html) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 2197ca5..7f91c19 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,7 +1,74 @@ Apache Commons Logging - Version 1.2 + Version 1.3.0 RELEASE NOTES +The Apache Commons Logging team is pleased to announce the release of Apache Commons Logging 1.3.0. + +Apache Commons Logging is a thin adapter allowing configurable bridging to other, +well known logging systems. + +This is a feature and maintenance release. Java 8 or later is required. + +Changes in this version include: + +New features: +o Add support for Log4j API and SLF4J #177. Thanks to Piotr P. Karwasz. +o Deprecate org.apache.commons.logging.impl.WeakHashtable without replacement. Thanks to Piotr P. Karwasz. +o LOGGING-188: Deprecate and disable `Jdk13LumberjackLogger` and `Log4JLogger`. Thanks to Piotr P. Karwasz. +o LOGGING-173: Deprecate and disable `AvalonLogger` and `LogKitLogger`. Thanks to SingingBush. +o LOGGING-165: Add Automatic-Module-Name Manifest Header for Java 9 compatibility. + +Fixed Bugs: +o LOGGING-163: BufferedReader is not closed properly. Thanks to Kaloyan Spiridonov. +o LOGGING-177: Remove redundant initializer #46 Thanks to Arturo Bernal. +o Use a weak reference for the cached class loader #71. Thanks to Jakob van Kruijssen, Bruno P. Kinoshita, Gary Gregory. +o Add more entries to .gitignore file #25. Thanks to xiaozhiliaoo. +o Minor Improvements #34. Thanks to Arturo Bernal. +o [StepSecurity] ci: Harden GitHub Actions #145. Thanks to step-security-bot, Gary Gregory. +o LOGGING-185: Replace custom code with `ServiceLoader` call. Thanks to Piotr P. Karwasz. +o Fix possible NPEs in LogFactoryImpl. Thanks to Gary Gregory. +o LOGGING-185: Fix failing tests #180. Thanks to Piotr P. Karwasz. +o Deprecate LogConfigurationException.cause in favor of getCause(). Thanks to Gary Gregory. +o Fix SpotBugs [ERROR] High: Found reliance on default encoding in org.apache.commons.logging.LogFactory.initDiagnostics(): new java.io.PrintStream(OutputStream) [org.apache.commons.logging.LogFactory] At LogFactory.java:[line 1205] DM_DEFAULT_ENCODING. Thanks to Gary Gregory. +o Fix SpotBugs [ERROR] Medium: Class org.apache.commons.logging.impl.WeakHashtable defines non-transient non-serializable instance field queue [org.apache.commons.logging.impl.WeakHashtable] In WeakHashtable.java SE_BAD_FIELD. Thanks to Gary Gregory. +o Set java.logging as optional module #183. Thanks to Piotr P. Karwasz. +o Fix SpotBugs [ERROR] Medium: Switch statement found in org.apache.commons.logging.impl.SimpleLog.log(int, Object, Throwable) where default case is missing [org.apache.commons.logging.impl.SimpleLog] At SimpleLog.java:[lines 505-522] SF_SWITCH_NO_DEFAULT. Thanks to Gary Gregory. +o Deprecate org.apache.commons.logging.impl.Jdk13LumberjackLogger.dummyLevel without replacement. Thanks to Gary Gregory. + +Changes: +o Bump Java from 6 to 8. Thanks to Gary Gregory. +o Bump actions/cache from 2 to 3.0.10 #50, #77, #95, #98, #107, #110. Thanks to Dependabot, Gary Gregory. +o Bump actions/checkout from 2.3.1 to 3.1.0, #24, #63, #75, #109. Thanks to Dependabot, Gary Gregory. +o Bump actions/setup-java from 1.4.0 to 3.5.1 #21. Thanks to Dependabot, Gary Gregory. +o Bump junit from 3.8.1 to 5.9.1 Vintage #23, #38. Thanks to Dependabot, Gary Gregory. +o Bump clirr-maven-plugin from 2.2.2 to 2.8 #14. Thanks to Dependabot. +o Bump findbugs-maven-plugin from 2.5.2 to 3.0.5 #8. Thanks to Dependabot. +o Bump maven-failsafe-plugin from 2.12 to 3.0.0-M7 #31, #91. Thanks to Dependabot, Gary Gregory. +o Bump spotbugs-surefire-plugin from 2.22.2 to 3.0.0-M5. Thanks to Gary Gregory. +o Bump maven-dependency-plugin from 2.4 to 3.5.0 #29, #79, #117, #131. Thanks to Dependabot. +o Bump maven-pmd-plugin from 3.3 to 3.19.0 #28, #90, #100, #103. Thanks to Dependabot. +o Bump maven-assembly-plugin from 2.5 to 3.4.2 #30, #94, #96. Thanks to Dependabot. +o Bump servlet-api from 2.3 to 2.5 #27. Thanks to Dependabot. +o Bump maven-checkstyle-plugin from 2.7 to 3.2.1 #35, #101, #130. Thanks to Gary Gregory, Dependabot. +o Bump spotbugs-maven-plugin from 4.1.4 to 4.7.2.1 #33, #70, #78, #93, #97, #102, #112. Thanks to Dependabot. +o Bump spotbugs from 4.5.3 to 4.7.3 #81, #87, #92, #104, #115. Thanks to Dependabot. +o Bump commons-parent from 52 to 65 #82, #106, #122, #126, #143. Thanks to Dependabot, Gary Gregory. +o Bump github/codeql-action from 1 to 2 #86. Thanks to Dependabot. + + +Historical list of changes: https://commons.apache.org/proper/commons-logging/changes-report.html + +For complete information on Apache Commons Logging, including instructions on how to submit bug reports, +patches, or suggestions for improvement, see the Apache Commons Logging website: + +https://commons.apache.org/proper/commons-logging/ + +============================================================================= + +Apache Commons Logging +Version 1.2 +RELEASE NOTES + The Apache Commons Logging team is pleased to announce the release of Apache Commons Logging 1.2 @@ -28,4 +95,4 @@ Historical list of changes: http://commons.apache.org/proper/commons-logging/cha For complete information on Apache Commons Logging, including instructions on how to submit bug reports, patches, or suggestions for improvement, see the Apache Commons Logging website: -http://commons.apache.org/proper/commons-logging/ \ No newline at end of file +http://commons.apache.org/proper/commons-logging/ diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 19cdb4a..9e47eb9 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -43,7 +43,7 @@ The <action> type attribute can be add,update,fix,remove. <title>Release Notes</title> </properties> <body> - <release version="1.3.0" date="TBD" description="This is a maintenance release containing bug fixes. Java 8 or later is required."> + <release version="1.3.0" date="2023-11-26" description="This is a feature and maintenance release. Java 8 or later is required."> <!-- ADD --> <action dev="ggregory" type="add" due-to="Piotr P. Karwasz"> Add support for Log4j API and SLF4J #177. diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm index 65e162e..2c58859 100644 --- a/src/changes/release-notes.vm +++ b/src/changes/release-notes.vm @@ -14,9 +14,9 @@ ## KIND, either express or implied. See the License for the ## specific language governing permissions and limitations ## under the License. - ${project.name} - Version ${version} - RELEASE NOTES +${project.name} +Version ${version} +RELEASE NOTES The ${developmentTeam} is pleased to announce the release of ${project.name} ${version} @@ -106,4 +106,6 @@ Historical list of changes: ${project.url}changes-report.html For complete information on ${project.name}, including instructions on how to submit bug reports, patches, or suggestions for improvement, see the ${project.name} website: -${project.url} \ No newline at end of file +${project.url} + +============================================================================= diff --git a/src/site/xdoc/download_logging.xml b/src/site/xdoc/download_logging.xml index 2a07ede..110e880 100644 --- a/src/site/xdoc/download_logging.xml +++ b/src/site/xdoc/download_logging.xml @@ -26,15 +26,28 @@ limitations under the License. | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates | +======================================================================+ | | - | 1) Re-generate using: mvn commons:download-page | + | 1) Re-generate using: mvn commons-build:download-page | | | | 2) Set the following properties in the component's pom: | - | - commons.componentid (required, alphabetic, lower case) | + | - commons.componentid (required, alphabetic, lower case) | | - commons.release.version (required) | - | - commons.binary.suffix (optional) | + | - commons.release.name (required) | + | - commons.binary.suffix (optional) | | (defaults to "-bin", set to "" for pre-maven2 releases) | + | - commons.release.desc (optional) | + | - commons.release.subdir (optional) | + | - commons.release.hash (optional, lowercase, default sha512) | + | | + | - commons.release.[234].version (conditional) | + | - commons.release.[234].name (conditional) | + | - commons.release.[234].binary.suffix (optional) | + | - commons.release.[234].desc (optional) | + | - commons.release.[234].subdir (optional) | + | - commons.release.[234].hash (optional, lowercase, [sha512])| | | | 3) Example Properties | + | (commons.release.name inherited by parent: | + | ${project.artifactId}-${commons.release.version} | | | | <properties> | | <commons.componentid>math</commons.componentid> | @@ -46,17 +59,17 @@ limitations under the License. <document> <properties> <title>Download Apache Commons Logging</title> - <author email="d...@commons.apache.org">Commons Documentation Team</author> + <author email="d...@commons.apache.org">Apache Commons Documentation Team</author> </properties> <body> <section name="Download Apache Commons Logging"> <subsection name="Using a Mirror"> <p> We recommend you use a mirror to download our release - builds, but you <strong>must</strong> verify the integrity of + builds, but you <strong>must</strong> <a href="https://www.apache.org/info/verification.html">verify the integrity</a> of the downloaded files using signatures downloaded from our main distribution directories. Recent releases (48 hours) may not yet - be available from the mirrors. + be available from all the mirrors. </p> <p> @@ -88,39 +101,44 @@ limitations under the License. </form> <p> - The <a href="https//www.apache.org/dist/commons/KEYS">KEYS</a> - link links to the code signing keys used to sign the product. - The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site. - The <code>MD5</code> link downloads the checksum from the main site. + It is essential that you + <a href="https://www.apache.org/info/verification.html">verify the integrity</a> + of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files); + failing that using the <code>SHA512</code> hash (<code>*.sha512</code> checksum files). + </p> + <p> + The <a href="https://downloads.apache.org/commons/KEYS">KEYS</a> + file contains the public PGP keys used by Apache Commons developers + to sign releases. </p> </subsection> </section> - <section name="Apache Commons Logging 1.2 "> + <section name="Apache Commons Logging 1.3.0 "> <subsection name="Binaries"> <table> <tr> - <td><a href="[preferred]/commons/logging/binaries/commons-logging-1.2-bin.tar.gz">commons-logging-1.2-bin.tar.gz</a></td> - <td><a href="https//www.apache.org/dist/commons/logging/binaries/commons-logging-1.2-bin.tar.gz.md5">md5</a></td> - <td><a href="https//www.apache.org/dist/commons/logging/binaries/commons-logging-1.2-bin.tar.gz.asc">pgp</a></td> + <td><a href="[preferred]/commons/logging/binaries/commons-logging-1.3.0-bin.tar.gz">commons-logging-1.3.0-bin.tar.gz</a></td> + <td><a href="https://downloads.apache.org/commons/logging/binaries/commons-logging-1.3.0-bin.tar.gz.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/logging/binaries/commons-logging-1.3.0-bin.tar.gz.asc">pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/logging/binaries/commons-logging-1.2-bin.zip">commons-logging-1.2-bin.zip</a></td> - <td><a href="https//www.apache.org/dist/commons/logging/binaries/commons-logging-1.2-bin.zip.md5">md5</a></td> - <td><a href="https//www.apache.org/dist/commons/logging/binaries/commons-logging-1.2-bin.zip.asc">pgp</a></td> + <td><a href="[preferred]/commons/logging/binaries/commons-logging-1.3.0-bin.zip">commons-logging-1.3.0-bin.zip</a></td> + <td><a href="https://downloads.apache.org/commons/logging/binaries/commons-logging-1.3.0-bin.zip.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/logging/binaries/commons-logging-1.3.0-bin.zip.asc">pgp</a></td> </tr> </table> </subsection> <subsection name="Source"> <table> <tr> - <td><a href="[preferred]/commons/logging/source/commons-logging-1.2-src.tar.gz">commons-logging-1.2-src.tar.gz</a></td> - <td><a href="https//www.apache.org/dist/commons/logging/source/commons-logging-1.2-src.tar.gz.md5">md5</a></td> - <td><a href="https//www.apache.org/dist/commons/logging/source/commons-logging-1.2-src.tar.gz.asc">pgp</a></td> + <td><a href="[preferred]/commons/logging/source/commons-logging-1.3.0-src.tar.gz">commons-logging-1.3.0-src.tar.gz</a></td> + <td><a href="https://downloads.apache.org/commons/logging/source/commons-logging-1.3.0-src.tar.gz.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/logging/source/commons-logging-1.3.0-src.tar.gz.asc">pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/logging/source/commons-logging-1.2-src.zip">commons-logging-1.2-src.zip</a></td> - <td><a href="https//www.apache.org/dist/commons/logging/source/commons-logging-1.2-src.zip.md5">md5</a></td> - <td><a href="https//www.apache.org/dist/commons/logging/source/commons-logging-1.2-src.zip.asc">pgp</a></td> + <td><a href="[preferred]/commons/logging/source/commons-logging-1.3.0-src.zip">commons-logging-1.3.0-src.zip</a></td> + <td><a href="https://downloads.apache.org/commons/logging/source/commons-logging-1.3.0-src.zip.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/logging/source/commons-logging-1.3.0-src.zip.asc">pgp</a></td> </tr> </table> </subsection> @@ -131,7 +149,7 @@ limitations under the License. </p> <ul> <li class="download"><a href="[preferred]/commons/logging/">browse download area</a></li> - <li><a href="https//archive.apache.org/dist/commons/logging/">archives...</a></li> + <li><a href="https://archive.apache.org/dist/commons/logging/">archives...</a></li> </ul> </section> </body> diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml index ab10f27..4eea72f 100644 --- a/src/site/xdoc/issue-tracking.xml +++ b/src/site/xdoc/issue-tracking.xml @@ -26,7 +26,7 @@ limitations under the License. | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates | +======================================================================+ | | - | 1) Re-generate using: mvn commons:jira-page | + | 1) Re-generate using: mvn commons-build:jira-page | | | | 2) Set the following properties in the component's pom: | | - commons.jira.id (required, alphabetic, upper case) | @@ -43,35 +43,35 @@ limitations under the License. --> <document> <properties> - <title>Commons Logging Issue tracking</title> - <author email="d...@commons.apache.org">Commons Documentation Team</author> + <title>Apache Commons Logging Issue tracking</title> + <author email="d...@commons.apache.org">Apache Commons Documentation Team</author> </properties> <body> - <section name="Commons Logging Issue tracking"> + <section name="Apache Commons Logging Issue tracking"> <p> - Commons Logging uses <a href="https//issues.apache.org/jira/">ASF JIRA</a> for tracking issues. - See the <a href="https//issues.apache.org/jira/browse/LOGGING">Commons Logging JIRA project page</a>. + Apache Commons Logging uses <a href="https://issues.apache.org/jira/">ASF JIRA</a> for tracking issues. + See the <a href="https://issues.apache.org/jira/browse/LOGGING">Apache Commons Logging JIRA project page</a>. </p> <p> - To use JIRA you may need to <a href="https//issues.apache.org/jira/secure/Signup!default.jspa">create an account</a> + To use JIRA you may need to <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a> (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically - created and you can use the <a href="https//issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a> + created and you can use the <a href="https://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a> page to get a new password). </p> <p> If you would like to report a bug, or raise an enhancement request with - Commons Logging please do the following: + Apache Commons Logging please do the following: <ol> - <li><a href="https//issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310484&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">Search existing open bugs</a>. + <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310484&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">Search existing open bugs</a>. If you find your issue listed then please add a comment with your details.</li> <li><a href="mail-lists.html">Search the mailing list archive(s)</a>. You may find your issue or idea has already been discussed.</li> <li>Decide if your issue is a bug or an enhancement.</li> - <li>Submit either a <a href="https//issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310484&issuetype=1&priority=4&assignee=-1">bug report</a> - or <a href="https//issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310484&issuetype=4&priority=4&assignee=-1">enhancement request</a>.</li> + <li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310484&issuetype=1&priority=4&assignee=-1">bug report</a> + or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310484&issuetype=4&priority=4&assignee=-1">enhancement request</a>.</li> </ol> </p> @@ -80,21 +80,21 @@ limitations under the License. <ul> <li>the more information you provide, the better we can help you</li> <li>test cases are vital, particularly for any proposed enhancements</li> - <li>the developers of Commons Logging are all unpaid volunteers</li> + <li>the developers of Apache Commons Logging are all unpaid volunteers</li> </ul> </p> <p> - For more information on subversion and creating patches see the - <a href="https//www.apache.org/dev/contributors.html">Apache Contributors Guide</a>. + For more information on creating patches see the + <a href="https://www.apache.org/dev/contributors.html">Apache Contributors Guide</a>. </p> <p> You may also find these links useful: <ul> - <li><a href="https//issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310484&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">All Open Commons Logging bugs</a></li> - <li><a href="https//issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310484&sorter/field=issuekey&sorter/order=DESC&status=5&status=6">All Resolved Commons Logging bugs</a></li> - <li><a href="https//issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310484&sorter/field=issuekey&sorter/order=DESC">All Commons Logging bugs</a></li> + <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310484&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">All Open Apache Commons Logging bugs</a></li> + <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310484&sorter/field=issuekey&sorter/order=DESC&status=5&status=6">All Resolved Apache Commons Logging bugs</a></li> + <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310484&sorter/field=issuekey&sorter/order=DESC">All Apache Commons Logging bugs</a></li> </ul> </p> </section> diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml index 33f3ba3..01fdacc 100644 --- a/src/site/xdoc/mail-lists.xml +++ b/src/site/xdoc/mail-lists.xml @@ -26,7 +26,7 @@ limitations under the License. | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates | +======================================================================+ | | - | 1) Re-generate using: mvn commons:mail-page | + | 1) Re-generate using: mvn commons-build:mail-page | | | | 2) Set the following properties in the component's pom: | | - commons.componentid (required, alphabetic, lower case) | @@ -41,15 +41,15 @@ limitations under the License. --> <document> <properties> - <title>Commons Logging Mailing Lists</title> - <author email="d...@commons.apache.org">Commons Documentation Team</author> + <title>Apache Commons Logging Mailing Lists</title> + <author email="d...@commons.apache.org">Apache Commons Documentation Team</author> </properties> <body> <section name="Overview"> <p> - <a href="index.html">Commons Logging</a> shares mailing lists with all the other - <a href="https//commons.apache.org/components.html">Commons Components</a>. + <a href="index.html">Apache Commons Logging</a> shares mailing lists with all the other + <a href="https://commons.apache.org/components.html">Commons Components</a>. To make it easier for people to only read messages related to components they are interested in, the convention in Commons is to prefix the subject line of messages with the component's name, for example: @@ -58,24 +58,29 @@ limitations under the License. </ul> </p> <p> - Questions related to the usage of Commons Logging should be posted to the - <a href="https//mail-archives.apache.org/mod_mbox/commons-user/">User List</a>. + Questions related to the usage of Apache Commons Logging should be posted to the + <a href="https://lists.apache.org/list.html?u...@commons.apache.org">User List</a>. <br /> - The <a href="https//mail-archives.apache.org/mod_mbox/commons-dev/">Developer List</a> - is for questions and discussion related to the development of Commons Logging. + The <a href="https://lists.apache.org/list.html?d...@commons.apache.org">Developer List</a> + is for questions and discussion related to the development of Apache Commons Logging. <br /> Please do not cross-post; developers are also subscribed to the user list. + <br /> + You must be subscribed to post to the mailing lists. Follow the Subscribe links below + to subscribe. </p> <p> - <strong>Note:</strong> please don't send patches or attachments to any of the mailing lists. - Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system. - Otherwise, please upload the file to a public server and include the URL in the mail. + <strong>Note:</strong> please don't send patches or attachments to any of the mailing lists; + most of the lists are set up to drop attachments. + Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system. + If you have a GitHub account, most components also accept PRs (pull requests). + Otherwise, please upload the file to a public server and include the URL in the mail. </p> </section> - <section name="Commons Logging Mailing Lists"> + <section name="Apache Commons Logging Mailing Lists"> <p> - <strong>Please prefix the subject line of any messages for <a href="index.html">Commons Logging</a> + <strong>Please prefix the subject line of any messages for <a href="index.html">Apache Commons Logging</a> with <i>[logging]</i></strong> - <i>thanks!</i> <br /> <br /> @@ -96,16 +101,17 @@ limitations under the License. <td> <strong>Commons User List</strong> <br /><br /> - Questions on using Commons Logging. + Questions on using Apache Commons Logging. <br /><br /> </td> <td><a href="mailto:user-subscr...@commons.apache.org">Subscribe</a></td> <td><a href="mailto:user-unsubscr...@commons.apache.org">Unsubscribe</a></td> <td><a href="mailto:u...@commons.apache.org?subject=[logging]">Post</a></td> - <td><a href="https//mail-archives.apache.org/mod_mbox/commons-user/">mail-archives.apache.org</a></td> - <td><a href="https//markmail.org/list/org.apache.commons.users/">markmail.org</a><br /> - <a href="https//www.mail-archive.com/user@commons.apache.org/">www.mail-archive.com</a><br /> - <a href="https//news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a> + <td> + <a href="https://lists.apache.org/list.html?u...@commons.apache.org">lists.apache.org</a> + </td> + <td> + <a href="https://www.mail-archive.com/user@commons.apache.org/">www.mail-archive.com</a> </td> </tr> @@ -114,16 +120,17 @@ limitations under the License. <td> <strong>Commons Developer List</strong> <br /><br /> - Discussion of development of Commons Logging. + Discussion of development of Apache Commons Logging. <br /><br /> </td> <td><a href="mailto:dev-subscr...@commons.apache.org">Subscribe</a></td> <td><a href="mailto:dev-unsubscr...@commons.apache.org">Unsubscribe</a></td> <td><a href="mailto:d...@commons.apache.org?subject=[logging]">Post</a></td> - <td><a href="https//mail-archives.apache.org/mod_mbox/commons-dev/">mail-archives.apache.org</a></td> - <td><a href="https//markmail.org/list/org.apache.commons.dev/">markmail.org</a><br /> - <a href="https//www.mail-archive.com/dev@commons.apache.org/">www.mail-archive.com</a><br /> - <a href="https//news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a> + <td> + <a href="https://lists.apache.org/list.html?d...@commons.apache.org">lists.apache.org</a> + </td> + <td> + <a href="https://www.mail-archive.com/dev@commons.apache.org/">www.mail-archive.com</a> </td> </tr> @@ -138,9 +145,11 @@ limitations under the License. <td><a href="mailto:issues-subscr...@commons.apache.org">Subscribe</a></td> <td><a href="mailto:issues-unsubscr...@commons.apache.org">Unsubscribe</a></td> <td><i>read only</i></td> - <td><a href="https//mail-archives.apache.org/mod_mbox/commons-issues/">mail-archives.apache.org</a></td> - <td><a href="https//markmail.org/list/org.apache.commons.issues/">markmail.org</a><br /> - <a href="https//www.mail-archive.com/issues@commons.apache.org/">www.mail-archive.com</a> + <td> + <a href="https://lists.apache.org/list.html?iss...@commons.apache.org">lists.apache.org</a> + </td> + <td> + <a href="https://www.mail-archive.com/issues@commons.apache.org/">www.mail-archive.com</a> </td> </tr> @@ -149,15 +158,17 @@ limitations under the License. <td> <strong>Commons Commits List</strong> <br /><br /> - Only for e-mails automatically generated by the <a href="source-repository.html">source control</a> sytem. + Only for e-mails automatically generated by the <a href="scm.html">source control</a> system. <br /><br /> </td> <td><a href="mailto:commits-subscr...@commons.apache.org">Subscribe</a></td> <td><a href="mailto:commits-unsubscr...@commons.apache.org">Unsubscribe</a></td> <td><i>read only</i></td> - <td><a href="https//mail-archives.apache.org/mod_mbox/commons-commits/">mail-archives.apache.org</a></td> - <td><a href="https//markmail.org/list/org.apache.commons.commits/">markmail.org</a><br /> - <a href="https//www.mail-archive.com/commits@commons.apache.org/">www.mail-archive.com</a> + <td> + <a href="https://lists.apache.org/list.html?commits@commons.apache.org">lists.apache.org</a> + </td> + <td> + <a href="https://www.mail-archive.com/commits@commons.apache.org/">www.mail-archive.com</a> </td> </tr> @@ -185,14 +196,14 @@ limitations under the License. General announcements of Apache project releases. <br /><br /> </td> - <td><a class="externalLink" href="mailto:announce-subscr...@apache.org">Subscribe</a></td> - <td><a class="externalLink" href="mailto:announce-unsubscr...@apache.org">Unsubscribe</a></td> + <td><a class="externalLink" href="mailto:announce-subscr...@apache.org">Subscribe</a></td> + <td><a class="externalLink" href="mailto:announce-unsubscr...@apache.org">Unsubscribe</a></td> <td><i>read only</i></td> - <td><a class="externalLink" href="https//mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td> - <td><a class="externalLink" href="https//markmail.org/list/org.apache.announce/">markmail.org</a><br /> - <a class="externalLink" href="https//old.nabble.com/Apache-News-and-Announce-f109.html">old.nabble.com</a><br /> - <a class="externalLink" href="https//www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a><br /> - <a class="externalLink" href="https//news.gmane.org/gmane.comp.apache.announce">news.gmane.org</a> + <td> + <a class="externalLink" href="https://lists.apache.org/list.html?annou...@apache.org">lists.apache.org</a> + </td> + <td> + <a class="externalLink" href="https://www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a> </td> </tr> </table>