Update logging-parent to version 10.2.0 and implement SBOM (apach…

…e/logging-log4j2#1707)
apache · Oct 20, 2023 · b38e008 · b38e008
1 parent 773a9fd
commit b38e008
Show file tree

Hide file tree

Showing 25 changed files with 89 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ target/
 .classpath
 .cache-main
 .cache-tests
+.flattened-pom.xml
 velocity.log
 felix-cache/
 bin/

diff --git a/pom.xml b/pom.xml
@@ -15,14 +15,14 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" child.project.url.inherit.append.path="false" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.logging</groupId>
     <artifactId>logging-parent</artifactId>
-    <version>10.1.1</version>
+    <version>10.2.0</version>
     <relativePath />
   </parent>
 
@@ -89,7 +89,7 @@
     <module>log4j-api-scala_3</module>
   </modules>
 
-  <scm>
+  <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:git@github.com:apache/logging-log4j-scala.git</connection>
     <developerConnection>scm:git:git@github.com:apache/logging-log4j-scala.git</developerConnection>
     <tag>HEAD</tag>
@@ -106,6 +106,10 @@
     <url>https://github.com/apache/logging-log4j-scala/actions</url>
   </ciManagement>
 
+  <distributionManagement>
+    <downloadUrl>https://logging.apache.org/log4j/scala/latest/#distribution</downloadUrl>
+  </distributionManagement>
+
   <properties>
 
     <!-- project version -->

diff --git a/src/changelog/.13.x.x/add-sbom.xml b/src/changelog/.13.x.x/add-sbom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
+       type="added">
+  <author id="github:vy"/>
+  <description format="asciidoc">Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.2.0`</description>
+</entry>
diff --git a/src/changelog/.13.x.x/update-parent.xml b/src/changelog/.13.x.x/update-parent.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
+       type="changed">
+  <author id="github:vy"/>
+  <description format="asciidoc">Update `org.apache.logging:logging-parent` to version `10.2.0`</description>
+</entry>
diff --git a/src/changelog/12.0/.release.xml b/src/changelog/12.0/.release.xml
@@ -17,5 +17,5 @@
   -->
 <release xmlns="http://logging.apache.org/log4j/changelog"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+         xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
          date="2020-05-03" version="12.0"/>
diff --git a/src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml b/src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="changed">
   <issue id="LOG4J2-1882" link="https://issues.apache.org/jira/browse/LOG4J2-1882"/>
   <author id="github:vy"/>

diff --git a/src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml b/src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="added">
   <issue id="LOG4J2-2291" link="https://issues.apache.org/jira/browse/LOG4J2-2291"/>
   <author id="github:jvz"/>

diff --git a/src/changelog/12.0/LOG4J2-2293_add-license-files.xml b/src/changelog/12.0/LOG4J2-2293_add-license-files.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="added">
   <issue id="LOG4J2-2293" link="https://issues.apache.org/jira/browse/LOG4J2-2293"/>
   <author id="github:jvz"/>

diff --git a/src/changelog/12.0/LOG4J2-2294_rat-plugin.xml b/src/changelog/12.0/LOG4J2-2294_rat-plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="added">
   <issue id="LOG4J2-2294" link="https://issues.apache.org/jira/browse/LOG4J2-2294"/>
   <author id="github:jvz"/>

diff --git a/src/changelog/12.0/LOG4J2-2295_add-osgi-descriptor.xml b/src/changelog/12.0/LOG4J2-2295_add-osgi-descriptor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="added">
   <issue id="LOG4J2-2295" link="https://issues.apache.org/jira/browse/LOG4J2-2295"/>
   <author id="github:jvz"/>

diff --git a/src/changelog/12.0/LOG4J2-2296_add-site.xml b/src/changelog/12.0/LOG4J2-2296_add-site.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="added">
   <issue id="LOG4J2-2296" link="https://issues.apache.org/jira/browse/LOG4J2-2296"/>
   <author id="github:jvz"/>

diff --git a/src/changelog/12.0/LOG4J2-2298_add-changelog.xml b/src/changelog/12.0/LOG4J2-2298_add-changelog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="added">
   <issue id="LOG4J2-2298" link="https://issues.apache.org/jira/browse/LOG4J2-2298"/>
   <author id="github:jvz"/>

diff --git a/src/changelog/12.0/LOG4J2-2303_release-distribution-script.xml b/src/changelog/12.0/LOG4J2-2303_release-distribution-script.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="changed">
   <issue id="LOG4J2-2303" link="https://issues.apache.org/jira/browse/LOG4J2-2303"/>
   <author id="github:jvz"/>

diff --git a/src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml b/src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="added">
   <issue id="LOG4J2-2668" link="https://issues.apache.org/jira/browse/LOG4J2-2668"/>
   <author id="github:jvz"/>

diff --git a/src/changelog/13.0.0/LOG4J2-3184_add-scala-3.xml b/src/changelog/13.0.0/LOG4J2-3184_add-scala-3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="added">
   <issue id="LOG4J2-3184" link="https://issues.apache.org/jira/browse/LOG4J2-3184"/>
   <issue id="26" link="https://github.com/apache/logging-log4j-scala/pull/26"/>

diff --git a/src/changelog/13.0.0/java-17.xml b/src/changelog/13.0.0/java-17.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="changed">
   <author id="github:ppkarwasz"/>
   <author id="github:vy"/>

diff --git a/src/changelog/13.0.0/switch-to-github-actions.xml b/src/changelog/13.0.0/switch-to-github-actions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="changed">
   <author id="github:vy"/>
   <description format="asciidoc">Switch the CI to GitHub Actions</description>

diff --git a/src/changelog/13.0.0/switch-to-maven.xml b/src/changelog/13.0.0/switch-to-maven.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="changed">
   <author id="github:vy"/>
   <description format="asciidoc">Switched from `sbt` to Maven to take advantage of `logging-parent` conveniences</description>

diff --git a/src/changelog/13.0.0/switch-to-semver.xml b/src/changelog/13.0.0/switch-to-semver.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="changed">
   <author id="github:vy"/>
   <description format="asciidoc">Switched to semantic versioning</description>

diff --git a/src/changelog/13.0.0/update_org_apache_logging_log4j_log4j_api.xml b/src/changelog/13.0.0/update_org_apache_logging_log4j_log4j_api.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="changed">
   <author id="github:vy"/>
   <description format="asciidoc">Updated `org.apache.logging.log4j:log4j-api` version to `2.20.0`</description>

diff --git a/src/changelog/13.0.0/use-changelog.xml b/src/changelog/13.0.0/use-changelog.xml
@@ -17,7 +17,7 @@
   -->
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="http://logging.apache.org/log4j/changelog"
-       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="changed">
   <author id="github:vy"/>
   <description format="asciidoc">Started using `log4j-changelog`</description>

diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
@@ -34,7 +34,7 @@
 ////
 
 :project-github-url: https://github.com/apache/logging-log4j-scala
-:project-version: 13.0.0
+:project-version: 13.1.0-SNAPSHOT
 :project-name: Log4j Scala API
 :project-id: log4j-scala
 :java-compiler-version: [17,18)

diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
@@ -36,5 +36,6 @@
 [#release-notes]
 == Release Notes
 
+include::_release-notes/_13.x.x.adoc[]
 include::_release-notes/_13.0.0.adoc[]
 include::_release-notes/_12.0.adoc[]
diff --git a/src/site/_release-notes/_13.x.x.adoc b/src/site/_release-notes/_13.x.x.adoc
@@ -40,3 +40,11 @@
 
 This minor release contains various bug fixes and improvements.
 
+
+==== Added
+
+* Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.2.0`
+
+==== Changed
+
+* Update `org.apache.logging:logging-parent` to version `10.2.0`
diff --git a/src/site/index.adoc b/src/site/index.adoc
@@ -125,6 +125,12 @@ In accordance with the Apache Software Foundation's release https://infra.apache
 
 See xref:#release-instructions[the release instructions] for details.
 
+[#cyclonedx-sbom]
+=== CycloneDX Software Bill of Materials (SBOM)
+
+Starting with version `13.1.0`, {project-name} distributes https://cyclonedx.org/capabilities/sbom/[CyclenoDX Software Bill of Materials (SBOM)] along with each deployed artifact.
+This is streamlined by `logging-parent`, see https://logging.apache.org/logging-parent/latest/#cyclonedx-sbom[its website] for details.
+
 [#support]
 == Support