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 995a1b93cbf9720c68bcfc5dfda4ee5fb432780a
Merge: b90d29e 13ee5ca
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Thu Oct 19 16:06:54 2023 +0200

    Merge tag 'rel/10.2.0'

 .github/workflows/build.yaml                       |  6 ++++++
 .github/workflows/deploy-release-reusable.yaml     |  4 ++--
 pom.xml                                            |  2 +-
 .../10.2.0/.release-notes.adoc.ftl}                | 23 +++++++++++-----------
 src/changelog/10.2.0/.release.xml                  | 21 ++++++++++++++++++++
 .../{.10.x.x => 10.2.0}/add-sbom-support.xml       |  0
 .../add_bnd_baseline_plugin.xml                    |  0
 .../apply_bnd_config_all_goals.xml                 |  0
 .../{.10.x.x => 10.2.0}/change_flattened_pom.xml   |  0
 .../{.10.x.x => 10.2.0}/fix_bnd_extra_options.xml  |  0
 .../keep-parent-in-flatten-bom.xml                 |  0
 .../remove-build-in-flatten-bom.xml                |  0
 .../{.10.x.x => 10.2.0}/skip-symlink-dirs.xml      |  0
 .../update-changelog-version.xml                   |  0
 .../update-changelog-xsd-version.xml               |  0
 ...te_com_github_spotbugs_spotbugs_annotations.xml |  0
 .../use-specific-defaultGoal.xml                   |  0
 src/site/_constants.adoc                           |  2 +-
 src/site/_release-notes.adoc                       |  1 +
 .../_release-notes/{_10.x.x.adoc => _10.2.0.adoc}  |  7 +++----
 src/site/_release-notes/_10.x.x.adoc               | 18 -----------------
 21 files changed, 47 insertions(+), 37 deletions(-)

diff --cc src/site/_release-notes.adoc
index a12df66,6f01324..ac72a8e
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@@ -36,7 -36,7 +36,8 @@@
  [#release-notes]
  == Release Notes
  
 +include::_release-notes/_10.x.x.adoc[]
+ include::_release-notes/_10.2.0.adoc[]
  include::_release-notes/_10.1.1.adoc[]
  include::_release-notes/_10.1.0.adoc[]
  include::_release-notes/_10.0.0.adoc[]
diff --cc src/site/_release-notes/_10.x.x.adoc
index cfea63f,8f67449..21c9f35
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.x.x.adoc
@@@ -40,25 -40,3 +40,7 @@@
  
  This minor release contains several small improvements.
  
 +
- ==== Added
- 
- * Added support for auto-generating CycloneDX Software Bill of Materials 
(SBOM)
- 
 +==== Changed
 +
- * Add a compulsory `bnd-baseline-maven-plugin` execution to check for 
breaking API changes
- * Apply the default `bnd-maven-plugin` configuration to all the plugin's goals
- * Moves `.flattened-pom.xml` to the same directory as `pom.xml` to preserve 
the relative parent path. This requires adding `.flattened-pom.xml` to the 
`.gitignore` file of the repository.
- * Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version 
`0.5.0`
- * Update `log4j-changelog` XSD (used for validating changelog entries) to 
version `0.1.2`
- * Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.0` 
(https://github.com/apache/logging-parent/pull/44[44])
 +* Update `com.google.errorprone:error_prone_core` to version `2.23.0` 
(https://github.com/apache/logging-parent/pull/49[49])
- 
- ==== Fixed
- 
- * Prioritize definitions in `bnd-extra-*` variables over those inherited 
(https://github.com/apache/logging-parent/issues/39[39])
- * Keep parent in `flatten-bom` configuration 
(https://github.com/apache/logging-parent/issues/37[37])
- * Remove `build` in `flatten-bom` configuration
- * Fixed the archiving of symbolically linked directories in the 
`distribution` Maven profile 
(https://github.com/apache/logging-parent/issues/43[43])
- * Used specific execution IDs in ``defaultGoal``s to avoid running unwanted 
plugins

Reply via email to