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/09/18 07:02:37 UTC

[logging-log4j-jmx-gui] branch main updated (55739eb -> 576458a)

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

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


    from 55739eb  Fix distribution path in `README.adoc`
     new 82786ba  Merge `0.21.0` release changes
     new 576458a  Bump version to `0.22.0-SNAPSHOT`

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                                                     |  9 ++++++---
 src/changelog/{.2.x.x => 2.21.0}/.release-notes.md.ftl      |  0
 .../{.2.x.x/.release-notes.md.ftl => 2.21.0/.release.xml}   | 13 ++++++-------
 src/changelog/{.2.x.x => 2.21.0}/add-repository.xml         |  0
 4 files changed, 12 insertions(+), 10 deletions(-)
 copy src/changelog/{.2.x.x => 2.21.0}/.release-notes.md.ftl (100%)
 copy src/changelog/{.2.x.x/.release-notes.md.ftl => 2.21.0/.release.xml} (70%)
 rename src/changelog/{.2.x.x => 2.21.0}/add-repository.xml (100%)


[logging-log4j-jmx-gui] 01/02: Merge `0.21.0` release changes

Posted by vy...@apache.org.
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-log4j-jmx-gui.git

commit 82786bab6f240f18af75271074916c0c708ffe43
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Sep 18 09:03:03 2023 +0200

    Merge `0.21.0` release changes
---
 src/changelog/2.21.0/.release-notes.md.ftl         | 22 ++++++++++++++++++++++
 src/changelog/2.21.0/.release.xml                  | 21 +++++++++++++++++++++
 .../{.2.x.x => 2.21.0}/add-repository.xml          |  0
 3 files changed, 43 insertions(+)

diff --git a/src/changelog/2.21.0/.release-notes.md.ftl b/src/changelog/2.21.0/.release-notes.md.ftl
new file mode 100644
index 0000000..d2635ca
--- /dev/null
+++ b/src/changelog/2.21.0/.release-notes.md.ftl
@@ -0,0 +1,22 @@
+<#--
+  ~ 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.
+  -->
+
+# ${release.version}<#if release.date?has_content> (${release.date})</#if>
+
+This marks the first release where the Log4j JMX GUI is released separately from the Log4j itself.
+
+<#include "../.changelog.md.ftl">
diff --git a/src/changelog/2.21.0/.release.xml b/src/changelog/2.21.0/.release.xml
new file mode 100644
index 0000000..5b4bbf7
--- /dev/null
+++ b/src/changelog/2.21.0/.release.xml
@@ -0,0 +1,21 @@
+<?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.
+  -->
+<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.0.xsd"
+         date="2023-09-15" version="2.21.0"/>
diff --git a/src/changelog/.2.x.x/add-repository.xml b/src/changelog/2.21.0/add-repository.xml
similarity index 100%
rename from src/changelog/.2.x.x/add-repository.xml
rename to src/changelog/2.21.0/add-repository.xml


[logging-log4j-jmx-gui] 02/02: Bump version to `0.22.0-SNAPSHOT`

Posted by vy...@apache.org.
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-log4j-jmx-gui.git

commit 576458a7fbb212313ae51b4fbcaef6017c4d3b72
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Sep 18 09:03:08 2023 +0200

    Bump version to `0.22.0-SNAPSHOT`
---
 pom.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4c3131c..206d711 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
   <properties>
 
     <!-- project version -->
-    <revision>2.21.0-SNAPSHOT</revision>
+    <revision>2.22.0-SNAPSHOT</revision>
 
     <!-- dependency versions -->
     <log4j.version>2.20.0</log4j.version>
@@ -159,7 +159,6 @@
   <build>
     <plugins>
 
-      <!-- Excluding dummy JConsole stubs that are placed to enable compilation with Java 8+ versions. -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -168,8 +167,12 @@
             <id>default-jar</id>
             <configuration>
               <archive>
-                <manifestFile combine.self="override" />
+                <manifest>
+                  <addClasspath>true</addClasspath>
+                  <mainClass>org.apache.logging.log4j.jmx.gui.ClientGui</mainClass>
+                </manifest>
               </archive>
+              <!-- Exclude dummy JConsole stubs that are placed to enable compilation with Java 8+ versions. -->
               <excludes>
                 <exclude>com/sun/tools/jconsole/*</exclude>
               </excludes>