Re: [logging-log4j-tools] 01/01: #20 - Add Maven changelog plugins
Are these copyrights really supposed to be so ancient? The copyright year goes
in the NOTICE.txt file these days anyways, so those could be simplified.
—
Matt Sicker
> On Jan 21, 2023, at 00:12, rgo...@apache.org wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> rgoers pushed a commit to branch PR20
> in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
>
> commit 1642bc8ee6210fc75dff3e9f319f853e76d65ee5
> Author: Ralph Goers
> AuthorDate: Fri Jan 20 23:08:37 2023 -0700
>
>#20 - Add Maven changelog plugins
> ---
> .../changelog/exporter/ChangelogExporter.java | 7 +-
> .../changelog/exporter/ChangelogExporterArgs.java | 6 +-
> .../changelog/releaser/ChangelogReleaser.java | 6 +-
> .../changelog/releaser/ChangelogReleaserArgs.java | 6 +-
> log4j-maven-changelog-plugin/pom.xml | 142 +
> .../java/org/apache/logging/log4j/ExportMojo.java | 68 ++
> .../java/org/apache/logging/log4j/ReleaseMojo.java | 71 +++
> pom.xml| 4 +-
> 8 files changed, 299 insertions(+), 11 deletions(-)
>
> diff --git
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporter.java
>
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporter.java
> index 236dcea..82c0c17 100644
> ---
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporter.java
> +++
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporter.java
> @@ -34,10 +34,10 @@ public final class ChangelogExporter {
> private ChangelogExporter() {}
>
> public static void main(final String[] mainArgs) {
> +performExport(ChangelogExporterArgs.fromSystemProperties());
> +}
>
> -// Read arguments
> -final ChangelogExporterArgs args =
> ChangelogExporterArgs.fromSystemProperties();
> -
> +public static void performExport(final ChangelogExporterArgs args) {
> // Find release directories
> final List releaseDirectories = findReleaseDirectories(args);
> final int releaseDirectoryCount = releaseDirectories.size();
> @@ -107,7 +107,6 @@ public final class ChangelogExporter {
> // Export the release index
> final Path changelogIndexTemplateFile =
> ChangelogFiles.indexTemplateFile(args.changelogDirectory);
> exportIndex(args.outputDirectory, changelogReleases,
> changelogIndexTemplateFile);
> -
> }
>
> private static List findReleaseDirectories(ChangelogExporterArgs
> args) {
> diff --git
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporterArgs.java
>
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporterArgs.java
> index 8d79d9a..32a4878 100644
> ---
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporterArgs.java
> +++
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporterArgs.java
> @@ -20,7 +20,7 @@ import java.nio.file.Path;
>
> import static
> org.apache.logging.log4j.changelog.util.PropertyUtils.requireNonBlankPathProperty;
>
> -final class ChangelogExporterArgs {
> +public final class ChangelogExporterArgs {
>
> final Path changelogDirectory;
>
> @@ -37,4 +37,8 @@ final class ChangelogExporterArgs {
> return new ChangelogExporterArgs(changelogDirectory, outputDirectory);
> }
>
> +public static ChangelogExporterArgs fromArgs(final Path
> changelogDirectory, final Path outputDirectory) {
> +return new ChangelogExporterArgs(changelogDirectory,
> outputDirectory);
> +}
> +
> }
> diff --git
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
>
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
> index 55b4fca..02268b3 100644
> ---
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
> +++
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
> @@ -35,9 +35,10 @@ public final class ChangelogReleaser {
>
> public static void main(final String[] mainArgs) throws Exception {
>
> -// Read arguments
> -final ChangelogReleaserArgs args =
> ChangelogReleaserArgs.fromSystemProperties();
> +performRelease(ChangelogReleaserArgs.fromSystemProperties());
> +}
>
> +public static void performRelease(final ChangelogReleaserArgs args)
> throws Exception {
> // Read the release date and version
> final String releaseDate = ISO_DATE.format(LocalDate.now());
> final int releaseVersionMajor =
> VersionUtils.versionMajor(args.releaseVersion);
> @@ -53,7 +54,6 @@ public final class ChangelogReleaser {
>
>
Re: [logging-log4j-tools] 01/01: #20 - Add Maven changelog plugins
It is a copy-paste mistake from Ralph.
Other files don't have this problem.
I am working on the PR20 branch, I will fix the copyrights too.
Nevertheless, thanks for pointing that out!
On Sun, Jan 22, 2023 at 11:29 PM Matt Sicker wrote:
> Are these copyrights really supposed to be so ancient? The copyright year
> goes in the NOTICE.txt file these days anyways, so those could be
> simplified.
> —
> Matt Sicker
>
> > On Jan 21, 2023, at 00:12, rgo...@apache.org wrote:
> >
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > rgoers pushed a commit to branch PR20
> > in repository
> https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
> >
> > commit 1642bc8ee6210fc75dff3e9f319f853e76d65ee5
> > Author: Ralph Goers
> > AuthorDate: Fri Jan 20 23:08:37 2023 -0700
> >
> >#20 - Add Maven changelog plugins
> > ---
> > .../changelog/exporter/ChangelogExporter.java | 7 +-
> > .../changelog/exporter/ChangelogExporterArgs.java | 6 +-
> > .../changelog/releaser/ChangelogReleaser.java | 6 +-
> > .../changelog/releaser/ChangelogReleaserArgs.java | 6 +-
> > log4j-maven-changelog-plugin/pom.xml | 142
> +
> > .../java/org/apache/logging/log4j/ExportMojo.java | 68 ++
> > .../java/org/apache/logging/log4j/ReleaseMojo.java | 71 +++
> > pom.xml| 4 +-
> > 8 files changed, 299 insertions(+), 11 deletions(-)
> >
> > diff --git
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporter.java
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporter.java
> > index 236dcea..82c0c17 100644
> > ---
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporter.java
> > +++
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporter.java
> > @@ -34,10 +34,10 @@ public final class ChangelogExporter {
> > private ChangelogExporter() {}
> >
> > public static void main(final String[] mainArgs) {
> > +performExport(ChangelogExporterArgs.fromSystemProperties());
> > +}
> >
> > -// Read arguments
> > -final ChangelogExporterArgs args =
> ChangelogExporterArgs.fromSystemProperties();
> > -
> > +public static void performExport(final ChangelogExporterArgs args) {
> > // Find release directories
> > final List releaseDirectories =
> findReleaseDirectories(args);
> > final int releaseDirectoryCount = releaseDirectories.size();
> > @@ -107,7 +107,6 @@ public final class ChangelogExporter {
> > // Export the release index
> > final Path changelogIndexTemplateFile =
> ChangelogFiles.indexTemplateFile(args.changelogDirectory);
> > exportIndex(args.outputDirectory, changelogReleases,
> changelogIndexTemplateFile);
> > -
> > }
> >
> > private static List
> findReleaseDirectories(ChangelogExporterArgs args) {
> > diff --git
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporterArgs.java
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporterArgs.java
> > index 8d79d9a..32a4878 100644
> > ---
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporterArgs.java
> > +++
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporterArgs.java
> > @@ -20,7 +20,7 @@ import java.nio.file.Path;
> >
> > import static
> org.apache.logging.log4j.changelog.util.PropertyUtils.requireNonBlankPathProperty;
> >
> > -final class ChangelogExporterArgs {
> > +public final class ChangelogExporterArgs {
> >
> > final Path changelogDirectory;
> >
> > @@ -37,4 +37,8 @@ final class ChangelogExporterArgs {
> > return new ChangelogExporterArgs(changelogDirectory,
> outputDirectory);
> > }
> >
> > +public static ChangelogExporterArgs fromArgs(final Path
> changelogDirectory, final Path outputDirectory) {
> > +return new ChangelogExporterArgs(changelogDirectory,
> outputDirectory);
> > +}
> > +
> > }
> > diff --git
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
> > index 55b4fca..02268b3 100644
> > ---
> a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
> > +++
> b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
> > @@ -35,9 +35,10 @@ public final class ChangelogReleaser {
> >
> > public static void main(final String[] mainArgs) throws Exception {
> >
> > -// Read arguments
> > -final ChangelogReleaserArgs args =
> ChangelogReleaserArgs.fromSystemProperties();
> > +performRelease(ChangelogReleaserArgs.fromSystemProperties());
> > +}
> >
