You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/01/05 08:17:46 UTC
[logging-log4j-tools] branch master updated (3184d5c -> c79f69f)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
from 3184d5c Big bang?
add 18531f9 Get ready for release 0.1.0
new c79f69f Rename `groupId` and packages from `o.a.l.log4j.tools` to `o.a.l.log4j`
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.adoc | 4 ++--
log4j-changelog/README.adoc | 6 +++---
log4j-changelog/pom.xml | 2 +-
.../log4j/{tools => }/changelog/ChangelogEntry.java | 11 +++++------
.../log4j/{tools => }/changelog/ChangelogFiles.java | 4 ++--
.../log4j/{tools => }/changelog/ChangelogRelease.java | 13 ++++++-------
.../{tools => }/changelog/exporter/ChangelogExporter.java | 10 +++++-----
.../changelog/exporter/ChangelogExporterArgs.java | 4 ++--
.../{tools => }/changelog/exporter/FreeMarkerUtils.java | 4 ++--
.../log4j/{tools => }/changelog/importer/MavenChanges.java | 12 ++++++------
.../changelog/importer/MavenChangesImporter.java | 10 +++++-----
.../changelog/importer/MavenChangesImporterArgs.java | 6 +++---
.../{tools => }/changelog/releaser/ChangelogReleaser.java | 14 ++++++--------
.../changelog/releaser/ChangelogReleaserArgs.java | 8 ++++----
.../log4j/{tools => changelog/util}/AsciiDocUtils.java | 2 +-
.../log4j/{tools => changelog/util}/CharsetUtils.java | 2 +-
.../logging/log4j/{tools => changelog/util}/FileUtils.java | 2 +-
.../util}/PositionalSaxEventHandler.java | 2 +-
.../log4j/{tools => changelog/util}/PropertyUtils.java | 4 ++--
.../log4j/{tools => changelog/util}/StringUtils.java | 2 +-
.../log4j/{tools => changelog/util}/VersionUtils.java | 2 +-
.../logging/log4j/{tools => changelog/util}/XmlReader.java | 2 +-
.../logging/log4j/{tools => changelog/util}/XmlUtils.java | 2 +-
.../logging/log4j/{tools => changelog/util}/XmlWriter.java | 2 +-
log4j-tools-parent/pom.xml | 4 ++--
pom.xml | 6 +++---
26 files changed, 68 insertions(+), 72 deletions(-)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => }/changelog/ChangelogEntry.java (95%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => }/changelog/ChangelogFiles.java (96%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => }/changelog/ChangelogRelease.java (83%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => }/changelog/exporter/ChangelogExporter.java (96%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => }/changelog/exporter/ChangelogExporterArgs.java (90%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => }/changelog/exporter/FreeMarkerUtils.java (96%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => }/changelog/importer/MavenChanges.java (93%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => }/changelog/importer/MavenChangesImporter.java (94%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => }/changelog/importer/MavenChangesImporterArgs.java (87%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => }/changelog/releaser/ChangelogReleaser.java (92%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => }/changelog/releaser/ChangelogReleaserArgs.java (82%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => changelog/util}/AsciiDocUtils.java (97%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => changelog/util}/CharsetUtils.java (95%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => changelog/util}/FileUtils.java (97%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => changelog/util}/PositionalSaxEventHandler.java (98%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => changelog/util}/PropertyUtils.java (94%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => changelog/util}/StringUtils.java (95%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => changelog/util}/VersionUtils.java (96%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => changelog/util}/XmlReader.java (99%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => changelog/util}/XmlUtils.java (98%)
rename log4j-changelog/src/main/java/org/apache/logging/log4j/{tools => changelog/util}/XmlWriter.java (99%)
[logging-log4j-tools] 01/01: Rename `groupId` and packages from `o.a.l.log4j.tools` to `o.a.l.log4j`
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
commit c79f69fedc720fa0307da5275ef806a4d41a9aaf
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Jan 5 09:18:37 2023 +0100
Rename `groupId` and packages from `o.a.l.log4j.tools` to `o.a.l.log4j`
---
log4j-changelog/README.adoc | 6 +++---
log4j-changelog/pom.xml | 2 +-
.../log4j/{tools => }/changelog/ChangelogEntry.java | 11 +++++------
.../log4j/{tools => }/changelog/ChangelogFiles.java | 4 ++--
.../log4j/{tools => }/changelog/ChangelogRelease.java | 13 ++++++-------
.../{tools => }/changelog/exporter/ChangelogExporter.java | 10 +++++-----
.../changelog/exporter/ChangelogExporterArgs.java | 4 ++--
.../{tools => }/changelog/exporter/FreeMarkerUtils.java | 4 ++--
.../log4j/{tools => }/changelog/importer/MavenChanges.java | 12 ++++++------
.../changelog/importer/MavenChangesImporter.java | 10 +++++-----
.../changelog/importer/MavenChangesImporterArgs.java | 6 +++---
.../{tools => }/changelog/releaser/ChangelogReleaser.java | 14 ++++++--------
.../changelog/releaser/ChangelogReleaserArgs.java | 8 ++++----
.../log4j/{tools => changelog/util}/AsciiDocUtils.java | 2 +-
.../log4j/{tools => changelog/util}/CharsetUtils.java | 2 +-
.../logging/log4j/{tools => changelog/util}/FileUtils.java | 2 +-
.../util}/PositionalSaxEventHandler.java | 2 +-
.../log4j/{tools => changelog/util}/PropertyUtils.java | 4 ++--
.../log4j/{tools => changelog/util}/StringUtils.java | 2 +-
.../log4j/{tools => changelog/util}/VersionUtils.java | 2 +-
.../logging/log4j/{tools => changelog/util}/XmlReader.java | 2 +-
.../logging/log4j/{tools => changelog/util}/XmlUtils.java | 2 +-
.../logging/log4j/{tools => changelog/util}/XmlWriter.java | 2 +-
log4j-tools-parent/pom.xml | 4 ++--
pom.xml | 4 ++--
25 files changed, 65 insertions(+), 69 deletions(-)
diff --git a/log4j-changelog/README.adoc b/log4j-changelog/README.adoc
index f965ad4..aa83d5f 100644
--- a/log4j-changelog/README.adoc
+++ b/log4j-changelog/README.adoc
@@ -194,7 +194,7 @@ Each `.changelog.adoc.ftl` FreeMarker templated AsciiDoc files are compiled by `
* `release` -> `ChangelogRelease`
* `entriesByType` -> `Map<ChangelogEntry.Type, List<ChangelogEntry>>`
-See xref:src/main/java/org/apache/logging/log4j/tools/changelog/ChangelogRelease.java[ChangelogRelease.java] and xref:src/main/java/org/apache/logging/log4j/tools/changelog/ChangelogEntry.java[ChangelogEntry.java] for details.
+See xref:src/main/java/org/apache/logging/log4j/changelog/ChangelogRelease.java[ChangelogRelease.java] and xref:src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java[ChangelogEntry.java] for details.
A sample changelog template file is shared below.
@@ -261,7 +261,7 @@ java \
-cp /path/to/log4j-changelog.jar \
-Dlog4j.changelog.directory=/path/to/changelog/directory \
-Dlog4j.changelog.exporter.outputDirectory=/path/to/asciiDocOutputDirectory \
- org.apache.logging.log4j.tools.changelog.exporter.ChangelogExporter
+ org.apache.logging.log4j.changelog.exporter.ChangelogExporter
----
[#qa-deploy-release]
@@ -294,7 +294,7 @@ java \
-cp /path/to/log4j-changelog.jar \
-Dlog4j.changelog.directory=/path/to/changelog/directory \
-Dlog4j.changelog.releaseVersion=X.Y.Z \
- org.apache.logging.log4j.tools.changelog.releaser.ChangelogReleaser
+ org.apache.logging.log4j.changelog.releaser.ChangelogReleaser
----
. Verify that all changelog entry files are moved from `<changelogDirectory>/.<releaseVersionMajor>.x.x` directory (e.g., `/src/changelog/.2.x.x`)
. Verify that `<changelogDirectory>/<releaseVersion>` directory (e.g., `/src/changelog/2.19.0`) is created, and it contains `.changelog.adoc.ftl`, `.release.xml`, and changelog entry files
diff --git a/log4j-changelog/pom.xml b/log4j-changelog/pom.xml
index 30f29aa..6e336be 100644
--- a/log4j-changelog/pom.xml
+++ b/log4j-changelog/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>log4j-tools-parent</artifactId>
- <groupId>org.apache.logging.log4j.tools</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<version>${revision}</version>
<relativePath>../log4j-tools-parent/pom.xml</relativePath>
</parent>
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/ChangelogEntry.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java
similarity index 95%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/ChangelogEntry.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java
index fb5b130..df2d7a8 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/ChangelogEntry.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java
@@ -14,20 +14,19 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools.changelog;
+package org.apache.logging.log4j.changelog;
import java.nio.file.Path;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
-import org.apache.logging.log4j.tools.XmlReader;
-import org.apache.logging.log4j.tools.XmlWriter;
+import org.apache.logging.log4j.changelog.util.StringUtils;
+import org.apache.logging.log4j.changelog.util.XmlReader;
+import org.apache.logging.log4j.changelog.util.XmlWriter;
import org.w3c.dom.Element;
-import static org.apache.logging.log4j.tools.StringUtils.trimNullable;
-
public final class ChangelogEntry {
public final Type type;
@@ -197,7 +196,7 @@ public final class ChangelogEntry {
// Read the `description` element.
final Element descriptionElement = XmlReader.requireChildElementMatchingName(entryElement, "description");
final String descriptionFormat = XmlReader.requireAttribute(descriptionElement, "format");
- final String descriptionText = trimNullable(descriptionElement.getTextContent());
+ final String descriptionText = StringUtils.trimNullable(descriptionElement.getTextContent());
final Description description = new Description(descriptionFormat, descriptionText);
// Create the instance.
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/ChangelogFiles.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogFiles.java
similarity index 96%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/ChangelogFiles.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogFiles.java
index f4a90aa..80bb697 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/ChangelogFiles.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogFiles.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools.changelog;
+package org.apache.logging.log4j.changelog;
import java.nio.file.Path;
import java.util.Set;
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.logging.log4j.tools.FileUtils;
+import org.apache.logging.log4j.changelog.util.FileUtils;
public final class ChangelogFiles {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/ChangelogRelease.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogRelease.java
similarity index 83%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/ChangelogRelease.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogRelease.java
index cb74175..73df71a 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/ChangelogRelease.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogRelease.java
@@ -14,17 +14,16 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools.changelog;
+package org.apache.logging.log4j.changelog;
import java.nio.file.Path;
-import org.apache.logging.log4j.tools.XmlReader;
-import org.apache.logging.log4j.tools.XmlWriter;
+import org.apache.logging.log4j.changelog.util.StringUtils;
+import org.apache.logging.log4j.changelog.util.XmlReader;
+import org.apache.logging.log4j.changelog.util.XmlWriter;
import org.w3c.dom.Element;
-import static org.apache.logging.log4j.tools.StringUtils.trimNullable;
-
public final class ChangelogRelease {
public final String version;
@@ -51,13 +50,13 @@ public final class ChangelogRelease {
final Element releaseElement = XmlReader.readXmlFileRootElement(path, "release");
// Read the `version` attribute.
- final String version = trimNullable(releaseElement.getAttribute("version"));
+ final String version = StringUtils.trimNullable(releaseElement.getAttribute("version"));
if (version == null) {
throw new IllegalArgumentException("blank or missing attribute: `version`");
}
// Read the `date` attribute.
- final String date = trimNullable(releaseElement.getAttribute("date"));
+ final String date = StringUtils.trimNullable(releaseElement.getAttribute("date"));
if (date == null) {
throw new IllegalArgumentException("blank or missing attribute: `date`");
}
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/exporter/ChangelogExporter.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporter.java
similarity index 96%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/exporter/ChangelogExporter.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporter.java
index b274c0c..2b04029 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/exporter/ChangelogExporter.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporter.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools.changelog.exporter;
+package org.apache.logging.log4j.changelog.exporter;
import java.io.IOException;
import java.io.UncheckedIOException;
@@ -23,10 +23,10 @@ import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import org.apache.logging.log4j.tools.FileUtils;
-import org.apache.logging.log4j.tools.changelog.ChangelogEntry;
-import org.apache.logging.log4j.tools.changelog.ChangelogFiles;
-import org.apache.logging.log4j.tools.changelog.ChangelogRelease;
+import org.apache.logging.log4j.changelog.ChangelogEntry;
+import org.apache.logging.log4j.changelog.ChangelogFiles;
+import org.apache.logging.log4j.changelog.ChangelogRelease;
+import org.apache.logging.log4j.changelog.util.FileUtils;
public final class ChangelogExporter {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/exporter/ChangelogExporterArgs.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporterArgs.java
similarity index 90%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/exporter/ChangelogExporterArgs.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporterArgs.java
index 371985f..8d79d9a 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/exporter/ChangelogExporterArgs.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/ChangelogExporterArgs.java
@@ -14,11 +14,11 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools.changelog.exporter;
+package org.apache.logging.log4j.changelog.exporter;
import java.nio.file.Path;
-import static org.apache.logging.log4j.tools.PropertyUtils.requireNonBlankPathProperty;
+import static org.apache.logging.log4j.changelog.util.PropertyUtils.requireNonBlankPathProperty;
final class ChangelogExporterArgs {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/exporter/FreeMarkerUtils.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/FreeMarkerUtils.java
similarity index 96%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/exporter/FreeMarkerUtils.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/FreeMarkerUtils.java
index 1275809..8feed61 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/exporter/FreeMarkerUtils.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/exporter/FreeMarkerUtils.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools.changelog.exporter;
+package org.apache.logging.log4j.changelog.exporter;
import java.io.BufferedWriter;
import java.io.File;
@@ -24,7 +24,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
-import org.apache.logging.log4j.tools.CharsetUtils;
+import org.apache.logging.log4j.changelog.util.CharsetUtils;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import freemarker.cache.FileTemplateLoader;
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/importer/MavenChanges.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChanges.java
similarity index 93%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/importer/MavenChanges.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChanges.java
index 1c76510..4a2d579 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/importer/MavenChanges.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChanges.java
@@ -14,23 +14,23 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools.changelog.importer;
+package org.apache.logging.log4j.changelog.importer;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import org.apache.logging.log4j.tools.XmlReader;
+import org.apache.logging.log4j.changelog.util.XmlReader;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import static org.apache.logging.log4j.tools.StringUtils.isBlank;
-import static org.apache.logging.log4j.tools.StringUtils.trimNullable;
-import static org.apache.logging.log4j.tools.XmlReader.failureAtXmlNode;
-import static org.apache.logging.log4j.tools.XmlReader.readXmlFileRootElement;
+import static org.apache.logging.log4j.changelog.util.StringUtils.isBlank;
+import static org.apache.logging.log4j.changelog.util.StringUtils.trimNullable;
+import static org.apache.logging.log4j.changelog.util.XmlReader.failureAtXmlNode;
+import static org.apache.logging.log4j.changelog.util.XmlReader.readXmlFileRootElement;
final class MavenChanges {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/importer/MavenChangesImporter.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChangesImporter.java
similarity index 94%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/importer/MavenChangesImporter.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChangesImporter.java
index f376f08..a66d973 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/importer/MavenChangesImporter.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChangesImporter.java
@@ -14,17 +14,17 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools.changelog.importer;
+package org.apache.logging.log4j.changelog.importer;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
-import org.apache.logging.log4j.tools.changelog.ChangelogEntry;
-import org.apache.logging.log4j.tools.changelog.ChangelogFiles;
-import org.apache.logging.log4j.tools.changelog.ChangelogRelease;
+import org.apache.logging.log4j.changelog.ChangelogEntry;
+import org.apache.logging.log4j.changelog.ChangelogFiles;
+import org.apache.logging.log4j.changelog.ChangelogRelease;
-import static org.apache.logging.log4j.tools.StringUtils.isBlank;
+import static org.apache.logging.log4j.changelog.util.StringUtils.isBlank;
public final class MavenChangesImporter {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/importer/MavenChangesImporterArgs.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChangesImporterArgs.java
similarity index 87%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/importer/MavenChangesImporterArgs.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChangesImporterArgs.java
index 4d7c76f..21ef3b2 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/importer/MavenChangesImporterArgs.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChangesImporterArgs.java
@@ -14,12 +14,12 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools.changelog.importer;
+package org.apache.logging.log4j.changelog.importer;
import java.nio.file.Path;
-import static org.apache.logging.log4j.tools.PropertyUtils.requireNonBlankIntProperty;
-import static org.apache.logging.log4j.tools.PropertyUtils.requireNonBlankPathProperty;
+import static org.apache.logging.log4j.changelog.util.PropertyUtils.requireNonBlankIntProperty;
+import static org.apache.logging.log4j.changelog.util.PropertyUtils.requireNonBlankPathProperty;
final class MavenChangesImporterArgs {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/releaser/ChangelogReleaser.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
similarity index 92%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/releaser/ChangelogReleaser.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
index c8bb858..199ba79 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/releaser/ChangelogReleaser.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools.changelog.releaser;
+package org.apache.logging.log4j.changelog.releaser;
import java.io.IOException;
import java.io.UncheckedIOException;
@@ -22,15 +22,13 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.time.LocalDate;
-import org.apache.logging.log4j.tools.FileUtils;
-import org.apache.logging.log4j.tools.VersionUtils;
-import org.apache.logging.log4j.tools.changelog.ChangelogFiles;
-import org.apache.logging.log4j.tools.changelog.ChangelogRelease;
+import org.apache.logging.log4j.changelog.ChangelogFiles;
+import org.apache.logging.log4j.changelog.ChangelogRelease;
+import org.apache.logging.log4j.changelog.util.FileUtils;
+import org.apache.logging.log4j.changelog.util.VersionUtils;
import static java.time.format.DateTimeFormatter.ISO_DATE;
-import static org.apache.logging.log4j.tools.changelog.ChangelogFiles.releaseDirectory;
-
public final class ChangelogReleaser {
private ChangelogReleaser() {}
@@ -47,7 +45,7 @@ public final class ChangelogReleaser {
// Populate the changelog entry files in the release directory.
final Path unreleasedDirectory = ChangelogFiles.unreleasedDirectory(args.changelogDirectory, releaseVersionMajor);
- final Path releaseDirectory = releaseDirectory(args.changelogDirectory, args.releaseVersion);
+ final Path releaseDirectory = ChangelogFiles.releaseDirectory(args.changelogDirectory, args.releaseVersion);
populateChangelogEntryFiles(unreleasedDirectory, releaseDirectory);
// Write the release information.
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/releaser/ChangelogReleaserArgs.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaserArgs.java
similarity index 82%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/releaser/ChangelogReleaserArgs.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaserArgs.java
index cd4ca0a..f6bf6cb 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/changelog/releaser/ChangelogReleaserArgs.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaserArgs.java
@@ -14,13 +14,13 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools.changelog.releaser;
+package org.apache.logging.log4j.changelog.releaser;
import java.nio.file.Path;
-import static org.apache.logging.log4j.tools.PropertyUtils.requireNonBlankPathProperty;
-import static org.apache.logging.log4j.tools.PropertyUtils.requireNonBlankStringProperty;
-import static org.apache.logging.log4j.tools.VersionUtils.requireSemanticVersioning;
+import static org.apache.logging.log4j.changelog.util.PropertyUtils.requireNonBlankPathProperty;
+import static org.apache.logging.log4j.changelog.util.PropertyUtils.requireNonBlankStringProperty;
+import static org.apache.logging.log4j.changelog.util.VersionUtils.requireSemanticVersioning;
final class ChangelogReleaserArgs {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/AsciiDocUtils.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/AsciiDocUtils.java
similarity index 97%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/AsciiDocUtils.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/AsciiDocUtils.java
index ba1de09..a6a85f0 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/AsciiDocUtils.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/AsciiDocUtils.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools;
+package org.apache.logging.log4j.changelog.util;
public final class AsciiDocUtils {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/CharsetUtils.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/CharsetUtils.java
similarity index 95%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/CharsetUtils.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/CharsetUtils.java
index f23df9e..d6efb93 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/CharsetUtils.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/CharsetUtils.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools;
+package org.apache.logging.log4j.changelog.util;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/FileUtils.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/FileUtils.java
similarity index 97%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/FileUtils.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/FileUtils.java
index 555c250..c5200b4 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/FileUtils.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/FileUtils.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools;
+package org.apache.logging.log4j.changelog.util;
import java.io.IOException;
import java.io.UncheckedIOException;
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/PositionalSaxEventHandler.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/PositionalSaxEventHandler.java
similarity index 98%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/PositionalSaxEventHandler.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/PositionalSaxEventHandler.java
index 1ce8db6..a609925 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/PositionalSaxEventHandler.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/PositionalSaxEventHandler.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools;
+package org.apache.logging.log4j.changelog.util;
import java.util.Stack;
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/PropertyUtils.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/PropertyUtils.java
similarity index 94%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/PropertyUtils.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/PropertyUtils.java
index 181b939..c732736 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/PropertyUtils.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/PropertyUtils.java
@@ -14,13 +14,13 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools;
+package org.apache.logging.log4j.changelog.util;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
-import static org.apache.logging.log4j.tools.StringUtils.isBlank;
+import static org.apache.logging.log4j.changelog.util.StringUtils.isBlank;
public final class PropertyUtils {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/StringUtils.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/StringUtils.java
similarity index 95%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/StringUtils.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/StringUtils.java
index 20f1c54..886389d 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/StringUtils.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/StringUtils.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools;
+package org.apache.logging.log4j.changelog.util;
public final class StringUtils {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/VersionUtils.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/VersionUtils.java
similarity index 96%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/VersionUtils.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/VersionUtils.java
index 5be1a0e..3279b58 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/VersionUtils.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/VersionUtils.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools;
+package org.apache.logging.log4j.changelog.util;
public final class VersionUtils {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/XmlReader.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlReader.java
similarity index 99%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/XmlReader.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlReader.java
index 6e203a2..a5eb9a8 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/XmlReader.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlReader.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools;
+package org.apache.logging.log4j.changelog.util;
import java.io.FileInputStream;
import java.io.InputStream;
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/XmlUtils.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlUtils.java
similarity index 98%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/XmlUtils.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlUtils.java
index a80eb87..0a9ad6a 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/XmlUtils.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlUtils.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools;
+package org.apache.logging.log4j.changelog.util;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/XmlWriter.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlWriter.java
similarity index 99%
rename from log4j-changelog/src/main/java/org/apache/logging/log4j/tools/XmlWriter.java
rename to log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlWriter.java
index 8a72c3d..0bedf94 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/tools/XmlWriter.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlWriter.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.tools;
+package org.apache.logging.log4j.changelog.util;
import java.io.StringWriter;
import java.nio.file.Files;
diff --git a/log4j-tools-parent/pom.xml b/log4j-tools-parent/pom.xml
index 8e721df..aa00f3a 100644
--- a/log4j-tools-parent/pom.xml
+++ b/log4j-tools-parent/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.logging.log4j.tools</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-tools-bom</artifactId>
<version>${revision}</version>
</parent>
@@ -38,7 +38,7 @@
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <!-- `minimalJavaBuildVersion` is employed by `org.apache:apache`, which parents `org.apache.logging:logging-parent`, which parents `org.apache.logging.log4j.tools:log4j-tools-bom`, which parents us.
+ <!-- `minimalJavaBuildVersion` is employed by `org.apache:apache`, which parents `org.apache.logging:logging-parent`, which parents `org.apache.logging.log4j:log4j-tools-bom`, which parents us.
`minimalJavaBuildVersion` is used for enforcing the compiler version.
We will use `java.version` to enforce the target JVM byte code, which is 8. -->
<minimalJavaBuildVersion>[11,12)</minimalJavaBuildVersion>
diff --git a/pom.xml b/pom.xml
index 8efe216..400c3af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<version>7</version>
</parent>
- <groupId>org.apache.logging.log4j.tools</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-tools-bom</artifactId>
<packaging>pom</packaging>
<version>${revision}</version>
@@ -77,7 +77,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.logging.log4j.tools</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-changelog</artifactId>
<version>${project.version}</version>
</dependency>