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/09/20 11:12:12 UTC

[logging-parent] 01/04: More bootstrap BSH fixes

This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git

commit 1fa07ffb1574db1920aac95326316aa47e94f2e6
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Sep 19 12:14:33 2023 +0200

    More bootstrap BSH fixes
---
 .github/workflows/build.yaml | 2 +-
 pom.xml                      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 47badab..a6571aa 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -22,7 +22,7 @@ on:
     # Avoid workflow run for _merged_ `dependabot` PRs.
     # They were (hopefully!) already tested in PR-triggered workflow.
     branches-ignore:
-    - "dependabot/**"
+      - "dependabot/**"
     paths-ignore:
       - "**.adoc"
       - "**.md"
diff --git a/pom.xml b/pom.xml
index d018209..5629ae4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1095,7 +1095,7 @@
                               String from = substitutions[i];
                               String to = substitutions[i + 1];
                               System.out.format("  Replacing `%s` with `%s`%n", new Object[]{from, to});
-                              content = content.replaceAll(from, to);
+                              content = content.replace(from, to);
                           }
                           System.out.println("  Writing replaced content");
                           Files.writeString(path, content, StandardCharsets.UTF_8, new OpenOption[]{StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING});
@@ -1107,7 +1107,7 @@
                   }
 
                   download(".github/workflows/build.yaml", new String[] {
-                      "'apache/logging-parent'", "apache/${repositoryName}",
+                      "'apache/logging-parent'", "'apache/${repositoryName}'",
                       "project-name: logging-parent", "project-name: ${projectName}"
                   });
                   download(".github/dependabot.yaml");
@@ -1128,6 +1128,7 @@
                   download("antora-playbook.yaml");
                   download("LICENSE.txt");
                   download("mvnw");
+                  new File("mvnw").setExecutable(true);
                   download("mvnw.cmd");
                   download("NOTICE.txt");
                   download("RELEASE-NOTES.adoc");