Update all dependencies

.github/dependabot.yaml

@@ -28,8 +28,10 @@ updates:
   - package-ecosystem: maven
     directory: "/"
     schedule:
-      interval: daily
-    open-pull-requests-limit: 10
+      interval: monthly
+    groups:
+      dependencies:
+        patterns: [ "*" ]
     registries:
       - maven-central
     ignore:
@@ -48,9 +50,15 @@ updates:
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
-      interval: weekly
+      interval: monthly
+    groups:
+      dependencies:
+        patterns: [ "*" ]
 
   - package-ecosystem: npm
     directory: "/"
     schedule:
-      interval: daily
+      interval: monthly
+    groups:
+      dependencies:
+        patterns: [ "*" ]

.github/generate-email.sh

@@ -28,12 +28,12 @@ stderr() {
 
 fail_for_invalid_args() {
     stderr "Invalid arguments!"
-    stderr "Expected arguments: <vote|announce> <version> <commitId>"
+    stderr "Expected arguments: <vote|announce> <version> <commitId> <nexusUrl>"
     exit 1
 }
 
 # Check arguments
-[ $# -ne 3 ] && fail_for_invalid_args
+[ $# -ne 4 ] && fail_for_invalid_args
 
 # Constants
 PROJECT_NAME="Apache Log4j Scala"
@@ -43,6 +43,7 @@ PROJECT_STAGING_SITE="${PROJECT_SITE/apache.org/staged.apache.org}"
 PROJECT_REPO="https://github.com/apache/logging-log4j-scala"
 PROJECT_VERSION="$2"
 COMMIT_ID="$3"
+NEXUS_URL="$4"
 PROJECT_DIST_URL="https://dist.apache.org/repos/dist/dev/logging/$PROJECT_ID/$PROJECT_VERSION"
 
 # Check release notes file
@@ -54,8 +55,8 @@ RELEASE_NOTES_FILE="$SCRIPT_DIR/../target/generated-site/antora/modules/ROOT/pag
 
 dump_release_notes() {
     awk "f{print} /^Release date::/{f=1}" "$RELEASE_NOTES_FILE" \
-        | sed -r -e 's|'$PROJECT_REPO'/(issues|pull)/[0-9]+\[([0-9]+)\]|#\2|g
-                     s|https://github.com/([^/]+)/([^/]+)/(pull|issues)/([0-9]+)\[(\1/\2#\4)\]|\5|g'
+        | sed -r -e 's!'$PROJECT_REPO'/(issues|pull)/[0-9]+\[([0-9]+)\]!#\2!g
+                     s!https://github.com/([^/]+)/([^/]+)/(pull|issues)/([0-9]+)\[(\1/\2#\4)\]!\5!g'
 }
 
 case $1 in
@@ -71,7 +72,7 @@ Website: $PROJECT_STAGING_SITE-$PROJECT_VERSION
 GitHub: $PROJECT_REPO
 Commit: $COMMIT_ID
 Distribution: $PROJECT_DIST_URL
-Nexus: https://repository.apache.org/content/repositories/orgapachelogging-<FIXME>
+Nexus: $NEXUS_URL
 Signing key: 0x077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0
 Review kit: https://s.apache.org/logging-parent-release-review-kit
 

.github/workflows/build.yaml

@@ -22,23 +22,14 @@ on:
     branches:
       - "main"
       - "release/*"
-    paths-ignore:
-      - "**.adoc"
-      - "**.md"
-      - "**.txt"
   pull_request:
-    paths-ignore:
-      - "**.adoc"
-      - "**.md"
-      - "**.txt"
 
 permissions: read-all
 
 jobs:
 
   build:
-    if: github.actor != 'dependabot[bot]'
-    uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.3.0
+    uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1
     with:
       java-version: |
         8
@@ -48,7 +39,7 @@ jobs:
   deploy-snapshot:
     needs: build
     if: github.repository == 'apache/logging-log4j-scala' && github.ref_name == 'main'
-    uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.1.1
     # Secrets for deployments
     secrets:
       NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
@@ -61,7 +52,7 @@ jobs:
   deploy-release:
     needs: build
     if: github.repository == 'apache/logging-log4j-scala' && startsWith(github.ref_name, 'release/')
-    uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.1.1
     # Secrets for deployments
     secrets:
       GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}

.github/workflows/codeql-analysis.yaml

@@ -31,7 +31,7 @@ permissions: read-all
 jobs:
 
   analyze:
-    uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/11.3.0
+    uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.1.1
     with:
       java-version: |
         8

.github/workflows/deploy-site.yaml

@@ -33,7 +33,7 @@ jobs:
 
   deploy-site-stg:
     if: github.repository == 'apache/logging-log4j-scala' && github.ref_name == 'main'
-    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.0
+    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1
     # Secrets for committing the generated site
     secrets:
       GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -50,7 +50,7 @@ jobs:
 
   deploy-site-pro:
     if: github.repository == 'apache/logging-log4j-scala' && github.ref_name == 'main-site-pro'
-    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.0
+    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1
     # Secrets for committing the generated site
     secrets:
       GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -79,7 +79,7 @@ jobs:
 
   deploy-site-rel:
     needs: export-version
-    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.0
+    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1
     # Secrets for committing the generated site
     secrets:
       GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}

.mvn/jvm.config

@@ -11,3 +11,4 @@
 --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
 --add-opens java.base/sun.nio.ch=ALL-UNNAMED
 --add-opens java.base/java.io=ALL-UNNAMED
+-Dfile.encoding=UTF-8

.mvn/wrapper/maven-wrapper.properties

@@ -14,9 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionSha512Sum=8beac8d11ef208f1e2a8df0682b9448a9a363d2ad13ca74af43705549e72e74c9378823bf689287801cbbfc2f6ea9596201d19ccacfdfb682ee8a2ff4c4418ba
-distributionType=script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
-wrapperSha256Sum=3d8f20ce6103913be8b52aef6d994e0c54705fb527324ceb9b835b338739c7a8
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
-wrapperVersion=3.3.2
+distributionSha256Sum=305773a68d6ddfd413df58c82b3f8050e89778e777f3a745c8e5b8cbea4018ef
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
+wrapperVersion=3.3.4

antora-playbook.yaml

@@ -34,6 +34,10 @@ runtime:
     failure_level: warn
 
 asciidoc:
+  attributes:
+    tabs-sync-option: true
+    # Force Kroki to download images at build time
+    kroki-fetch-diagram: true
   extensions:
     - "@asciidoctor/tabs"
 

log4j-api-scala_2.12/pom.xml

@@ -30,7 +30,7 @@
 
   <properties>
     <scala.version.group>2.12</scala.version.group>
-    <scala.version>${scala.version.group}.19</scala.version>
+    <scala.version>${scala.version.group}.21</scala.version>
   </properties>
 
   <dependencies>

log4j-api-scala_2.13/pom.xml

@@ -30,7 +30,7 @@
 
   <properties>
     <scala.version.group>2.13</scala.version.group>
-    <scala.version>${scala.version.group}.13</scala.version>
+    <scala.version>${scala.version.group}.18</scala.version>
   </properties>
 
   <dependencies>

log4j-api-scala_3/pom.xml

@@ -30,7 +30,7 @@
 
   <properties>
     <scala.version.group>3</scala.version.group>
-    <scala.version>${scala.version.group}.3.3</scala.version>
+    <scala.version>${scala.version.group}.7.4</scala.version>
   </properties>
 
   <dependencies>

pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.logging</groupId>
     <artifactId>logging-parent</artifactId>
-    <version>11.3.0</version>
+    <version>12.1.1</version>
     <relativePath />
   </parent>
 
@@ -159,17 +159,22 @@
     <spotbugs.skip>true</spotbugs.skip>
 
     <!-- dependency version -->
+    <bnd.annotation.version>7.2.0</bnd.annotation.version>
     <junit.version>4.13.2</junit.version>
-    <log4j.version>2.25.2</log4j.version>
+    <log4j.version>2.25.3</log4j.version>
     <mockito.version>4.11.0</mockito.version>
-    <scalatest.version>3.2.10</scalatest.version>
-    <scalatestplus.version>3.2.10.0</scalatestplus.version>
+    <!-- The OSGi API version MUST always be the MINIMUM version Log4j supports: -->
+    <osgi.annotation.bundle.version>2.0.0</osgi.annotation.bundle.version>
+    <osgi.annotation.versioning.version>1.1.2</osgi.annotation.versioning.version>
+    <scalatest.version>3.2.19</scalatest.version>
+    <scalatestplus-junit4.version>3.2.17.0</scalatestplus-junit4.version>
+    <scalatestplus-mockito.version>3.2.10.0</scalatestplus-mockito.version>
 
     <!-- plugin versions -->
     <maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
     <!-- Last one that runs on JDK 8 -->
     <spotless-maven-plugin.version>2.30.0</spotless-maven-plugin.version>
-    <scala-maven-plugin.version>4.9.2</scala-maven-plugin.version>
+    <scala-maven-plugin.version>4.9.8</scala-maven-plugin.version>
 
   </properties>
 
@@ -217,23 +222,38 @@
       <dependency>
         <groupId>org.scalatestplus</groupId>
         <artifactId>junit-4-13_${scala.version.group}</artifactId>
-        <version>${scalatestplus.version}</version>
+        <version>${scalatestplus-junit4.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.scalatestplus</groupId>
         <artifactId>mockito-3-12_${scala.version.group}</artifactId>
-        <version>${scalatestplus.version}</version>
+        <version>${scalatestplus-mockito.version}</version>
       </dependency>
 
     </dependencies>
   </dependencyManagement>
 
   <dependencies>
 
+    <dependency>
+      <groupId>biz.aQute.bnd</groupId>
+      <artifactId>biz.aQute.bnd.annotation</artifactId>
+      <version>${bnd.annotation.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation.bundle</artifactId>
+      <version>${osgi.annotation.bundle.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>osgi.annotation</artifactId>
+      <artifactId>org.osgi.annotation.versioning</artifactId>
+      <version>${osgi.annotation.versioning.version}</version>
       <scope>provided</scope>
     </dependency>
 

src/changelog/.13.x.x/update_org_apache_logging_logging_parent.xml

@@ -3,6 +3,6 @@
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
        type="updated">
-  <issue id="65" link="https://github.com/apache/logging-log4j-scala/pull/65"/>
-  <description format="asciidoc">Update `org.apache.logging:logging-parent` to version `11.3.0`</description>
+  <issue id="99" link="https://github.com/apache/logging-log4j-scala/pull/99"/>
+  <description format="asciidoc">Update `org.apache.logging:logging-parent` to version `12.1.1`</description>
 </entry>

src/changelog/.13.x.x/update_apache_logging_parent.xml → src/changelog/.13.x.x/update_scala_2_12.xml

@@ -3,6 +3,6 @@
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
        type="updated">
-  <issue id="64" link="https://github.com/apache/logging-log4j-scala/pull/64"/>
-  <description format="asciidoc">Update `apache/logging-parent` to version ``</description>
+  <issue id="99" link="https://github.com/apache/logging-log4j-scala/pull/99"/>
+  <description format="asciidoc">Update Scala `2.12` baseline to `2.12.21`</description>
 </entry>

src/changelog/.13.x.x/update_org_scala_lang_scala3_library_3.xml → src/changelog/.13.x.x/update_scala_2_13.xml

@@ -3,6 +3,6 @@
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
        type="updated">
-  <issue id="50" link="https://github.com/apache/logging-log4j-scala/pull/50"/>
-  <description format="asciidoc">Update `org.scala-lang:scala3-library_3` to version `3.3.3`</description>
+  <issue id="99" link="https://github.com/apache/logging-log4j-scala/pull/99"/>
+  <description format="asciidoc">Update Scala `2.13` baseline to `2.13.18`</description>
 </entry>