You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/10/19 17:22:41 UTC

[logging-log4j-jmx-gui] branch main updated (11e594d -> c47d478)

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

pkarwasz pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-jmx-gui.git


    from 11e594d  Add `bnd-baseline-maven-plugin` check
     new 01d91f4  Bump `logging-parent` to version 10.2.0
     new c47d478  Improve concurrent of release builds

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:
 .github/workflows/build.yaml                 |  6 ++++++
 pom.xml                                      | 24 ++++++++++++------------
 src/changelog/.2.x.x/bump-logging-parent.xml |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)


[logging-log4j-jmx-gui] 02/02: Improve concurrent of release builds

Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-jmx-gui.git

commit c47d478318e2d2ec258d64667bc3b0d7f7c89008
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Thu Oct 19 19:22:21 2023 +0200

    Improve concurrent of release builds
---
 .github/workflows/build.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a2060f5..d1c192a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -32,6 +32,12 @@ on:
       - "**.md"
       - "**.txt"
 
+# If the branch is 'main' run once per commit.
+# If the branch is 'release/*' allow only one concurrent run.
+concurrency:
+  group: ${{ github.ref_name == 'main' && github.ref || github.ref_name }}
+  cancel-in-progress: true
+
 permissions: read-all
 
 jobs:


[logging-log4j-jmx-gui] 01/02: Bump `logging-parent` to version 10.2.0

Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-jmx-gui.git

commit 01d91f496dbc5bdf44c0f59d78b01df36e680631
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Thu Oct 19 19:20:35 2023 +0200

    Bump `logging-parent` to version 10.2.0
---
 pom.xml                                      | 24 ++++++++++++------------
 src/changelog/.2.x.x/bump-logging-parent.xml |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7e2f6ef..cd5b60d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.logging</groupId>
     <artifactId>logging-parent</artifactId>
-    <version>10.1.1</version>
+    <version>10.2.0</version>
   </parent>
 
   <groupId>org.apache.logging.log4j</groupId>
@@ -132,12 +132,10 @@
   <properties>
 
     <!-- project version -->
-    <revision>2.22.0-SNAPSHOT</revision>
+    <revision>2.21.1-SNAPSHOT</revision>
 
     <!-- dependency versions -->
     <log4j.version>2.21.0</log4j.version>
-    <log4j-changelog-maven-plugin.version>0.5.0</log4j-changelog-maven-plugin.version>
-    <spotbugs-annotations.version>4.8.0</spotbugs-annotations.version>
 
     <!-- Additional manifest entries -->
     <Class-Path>log4j-api-2.21.0.jar log4j-core-2.21.0.jar</Class-Path>
@@ -180,12 +178,14 @@
   <build>
     <plugins>
 
+      <!--
+        ~ Remove dummy JConsole stubs that are placed to enable compilation with Java 8+ versions.
+        -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
         <executions>
           <execution>
-            <!-- Remove dummy JConsole stubs that are placed to enable compilation with Java 8+ versions. -->
             <id>remove-stubs</id>
             <goals>
               <goal>clean</goal>
@@ -207,18 +207,18 @@
       </plugin>
 
       <plugin>
-        <groupId>biz.aQute.bnd</groupId>
-        <artifactId>bnd-baseline-maven-plugin</artifactId>
-        <version>${bnd-maven-plugin.version}</version>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+        <version>${flatten-maven-plugin.version}</version>
         <executions>
           <execution>
-            <id>baseline</id>
-            <goals>
-              <goal>baseline</goal>
-            </goals>
+            <id>flatten-clean</id>
+            <!-- `logging-parent` 10.2.0 does not bind this execution -->
+            <phase>clean</phase>
           </execution>
         </executions>
       </plugin>
+
     </plugins>
   </build>
 
diff --git a/src/changelog/.2.x.x/bump-logging-parent.xml b/src/changelog/.2.x.x/bump-logging-parent.xml
index cc6b7e9..fa23829 100644
--- a/src/changelog/.2.x.x/bump-logging-parent.xml
+++ b/src/changelog/.2.x.x/bump-logging-parent.xml
@@ -4,6 +4,6 @@
        xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
        type="changed">
   <description format="asciidoc">
-    Upgrade `logging-parent` to version 10.1.1, `log4j-core` to version 2.21.0 and `log4j-changelog` to version 0.5.0
+    Upgrade `logging-parent` to version 10.2.0, `log4j-core` to version 2.21.0.
   </description>
 </entry>