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/12/18 11:55:14 UTC
(logging-parent) branch release/10.5.0 updated (a5ec441 -> 8dc2241)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch release/10.5.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
discard a5ec441 Release changelog for version `10.5.0`
discard 317ad5d Update the `project.build.outputTimestamp` property
new f2503e9 Update `com.palantir.javaformat:palantir-java-format` to version `2.39.0`
new 8dc2241 Minor changes and bump the required Maven version to `3.8.1`
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a5ec441)
\
N -- N -- N refs/heads/release/10.5.0 (8dc2241)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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:
pom.xml | 18 +++++++++++++++---
src/changelog/10.5.0/.release-notes.adoc.ftl | 1 +
src/changelog/10.5.0/.release.xml | 2 +-
.../maven-min-version.xml} | 3 +--
.../10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml | 3 +--
src/site/_release-notes/_10.5.0.adoc | 4 +++-
6 files changed, 22 insertions(+), 9 deletions(-)
copy src/changelog/{10.1.0/update_org_osgi_osgi_annotation.xml => 10.5.0/maven-min-version.xml} (69%)
(logging-parent) 01/02: Update `com.palantir.javaformat:palantir-java-format` to version `2.39.0`
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.5.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit f2503e922485b2cadcc8a3a45700c1328908685f
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Dec 18 12:48:56 2023 +0100
Update `com.palantir.javaformat:palantir-java-format` to version `2.39.0`
---
pom.xml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fed644c..cf52a74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,7 +282,7 @@
<osgi.annotation.version>8.1.0</osgi.annotation.version>
<osgi.annotation.bundle.version>2.0.0</osgi.annotation.bundle.version>
<osgi.annotation.versioning.version>1.1.2</osgi.annotation.versioning.version>
- <palantir-java-format.version>2.38.0</palantir-java-format.version>
+ <palantir-java-format.version>2.39.0</palantir-java-format.version>
<spotbugs-annotations.version>4.8.3</spotbugs-annotations.version>
<!-- plugin versions -->
@@ -878,6 +878,15 @@ import org.apache.commons.codec.digest.*;
</yaml>
<lineEndings>UNIX</lineEndings>
</configuration>
+ <dependencies>
+ <!-- `com.palantir.javaformat:palantir-java-format` is a fake dependency to receive updates from `dependabot`, `maven-versions-plugin`, etc.
+ This dependency is not needed to be defined here, it is implied by `<palantirJavaFormat>` element above. -->
+ <dependency>
+ <groupId>com.palantir.javaformat</groupId>
+ <artifactId>palantir-java-format</artifactId>
+ <version>${palantir-java-format.version}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>default-spotless</id>
(logging-parent) 02/02: Minor changes and bump the required Maven version to `3.8.1`
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.5.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 8dc2241b8646208a89b4474544581a41f9cd4c42
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Dec 18 12:54:42 2023 +0100
Minor changes and bump the required Maven version to `3.8.1`
---
pom.xml | 5 ++++-
src/changelog/10.5.0/.release-notes.adoc.ftl | 1 +
...date_biz_aqute_bnd_bnd_maven_plugin.xml => maven-min-version.xml} | 5 ++---
src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml | 3 +--
src/site/_release-notes/_10.5.0.adoc | 4 +++-
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index cf52a74..e3f3381 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,6 +165,9 @@
`minimalJavaBuildVersion` is used for enforcing the compiler version. -->
<minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion>
+ <!-- `bnd-maven-plugin` 7.x requires a Maven version `3.8.1` or higher -->
+ <minimalMavenBuildVersion>3.8.1</minimalMavenBuildVersion>
+
<!-- JPMS and OSGi options -->
<!-- Overrides some options in multi-release JARs -->
<bnd-multi-release>false</bnd-multi-release>
@@ -278,7 +281,7 @@
<!-- dependency versions -->
<org.eclipse.jgit.version>6.8.0.202311291450-r</org.eclipse.jgit.version>
<!-- These are annotation with a retention of CLASS. They can be freely upgraded. -->
- <bnd.annotation.version>6.4.1</bnd.annotation.version>
+ <bnd.annotation.version>7.0.0</bnd.annotation.version>
<osgi.annotation.version>8.1.0</osgi.annotation.version>
<osgi.annotation.bundle.version>2.0.0</osgi.annotation.bundle.version>
<osgi.annotation.versioning.version>1.1.2</osgi.annotation.versioning.version>
diff --git a/src/changelog/10.5.0/.release-notes.adoc.ftl b/src/changelog/10.5.0/.release-notes.adoc.ftl
index bdcdc24..2eedf4e 100644
--- a/src/changelog/10.5.0/.release-notes.adoc.ftl
+++ b/src/changelog/10.5.0/.release-notes.adoc.ftl
@@ -42,5 +42,6 @@ This minor release contains dependency updates and a change in the way BND is em
BND Maven Plugins are upgraded to version `7.0.0`, which requires Java 17.
Log4j was the blocker for this upgrade and the issue is resolved in https://github.com/apache/logging-log4j2/pull/2021[apache/logging-log4j2#2021].
+Note that BND Maven Plugins version `7.0.0` increased the minimum required Maven version to `3.8.1`.
<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml b/src/changelog/10.5.0/maven-min-version.xml
similarity index 59%
copy from src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
copy to src/changelog/10.5.0/maven-min-version.xml
index 05227a6..72b3dac 100644
--- a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
+++ b/src/changelog/10.5.0/maven-min-version.xml
@@ -2,7 +2,6 @@
<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.3.xsd"
- type="updated">
- <issue id="81" link="https://github.com/apache/logging-parent/pull/81"/>
- <description format="asciidoc">Update `github/codeql-action` to version `3.22.11`</description>
+ type="changed">
+ <description format="asciidoc">Minimum required Maven version is increased to `3.8.1` due to BND Maven Plugin updates</description>
</entry>
diff --git a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml b/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
index 05227a6..d3dc825 100644
--- a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
+++ b/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
@@ -3,6 +3,5 @@
xmlns="http://logging.apache.org/log4j/changelog"
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd"
type="updated">
- <issue id="81" link="https://github.com/apache/logging-parent/pull/81"/>
- <description format="asciidoc">Update `github/codeql-action` to version `3.22.11`</description>
+ <description format="asciidoc">Update `biz.aQute.bnd:bnd-maven-plugin` to version `7.0.0`</description>
</entry>
diff --git a/src/site/_release-notes/_10.5.0.adoc b/src/site/_release-notes/_10.5.0.adoc
index 0ba2ebe..1569852 100644
--- a/src/site/_release-notes/_10.5.0.adoc
+++ b/src/site/_release-notes/_10.5.0.adoc
@@ -42,16 +42,18 @@ This minor release contains dependency updates and a change in the way BND is em
BND Maven Plugins are upgraded to version `7.0.0`, which requires Java 17.
Log4j was the blocker for this upgrade and the issue is resolved in https://github.com/apache/logging-log4j2/pull/2021[apache/logging-log4j2#2021].
+Note that BND Maven Plugins version `7.0.0` increased the minimum required Maven version to `3.8.1`.
==== Changed
* Switch from `bnd:jar` to `bnd:bnd-process` to improve integration with the ecosystem; IDEs, Maven plugins, etc. (https://github.com/apache/logging-parent/issues/69[69])
+* Minimum required Maven version is increased to `3.8.1` due to BND Maven Plugin updates
==== Updated
* Update `biz.aQute.bnd:bnd-baseline-maven-plugin` to version `7.0.0` (https://github.com/apache/logging-parent/pull/78[78])
-* Update `github/codeql-action` to version `3.22.11` (https://github.com/apache/logging-parent/pull/81[81])
+* Update `biz.aQute.bnd:bnd-maven-plugin` to version `7.0.0`
* Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1` (https://github.com/apache/logging-parent/pull/70[70])
* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (https://github.com/apache/logging-parent/pull/80[80])
* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0` (https://github.com/apache/logging-parent/pull/71[71])