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/17 16:14:30 UTC
[logging-log4j-jmx-gui] branch main updated (e892fe9 -> 04dd441)
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 e892fe9 Bump com.github.spotbugs:spotbugs-annotations from 4.7.3 to 4.8.0 (#1)
new 149a140 Upgrade `logging-parent` to version 10.1.1
new a12370d Upgrade `log4j-core` and `log4j-changelog`
new 04dd441 Adapt to `bnd-maven-plugin`
The 3 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 | 56 ++++++++++++++--------
src/changelog/.2.x.x/add-osgi-jpms.xml | 9 ++++
src/changelog/.2.x.x/bump-logging-parent.xml | 9 ++++
.../apache/logging/log4j/jmx/gui/ClientGui.java | 2 +
.../apache/logging/log4j/jmx/gui/package-info.java | 3 ++
5 files changed, 60 insertions(+), 19 deletions(-)
create mode 100644 src/changelog/.2.x.x/add-osgi-jpms.xml
create mode 100644 src/changelog/.2.x.x/bump-logging-parent.xml
[logging-log4j-jmx-gui] 01/03: Upgrade `logging-parent` to version 10.1.1
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 149a1402989b08e682b49e86ddcefa280bcd8c87
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Oct 17 17:06:41 2023 +0200
Upgrade `logging-parent` to version 10.1.1
---
pom.xml | 2 +-
src/changelog/.2.x.x/bump-logging-parent.xml | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 462440f..34d5666 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
- <version>10.0.0</version>
+ <version>10.1.1</version>
</parent>
<artifactId>log4j-jmx-gui</artifactId>
diff --git a/src/changelog/.2.x.x/bump-logging-parent.xml b/src/changelog/.2.x.x/bump-logging-parent.xml
new file mode 100644
index 0000000..f671d4a
--- /dev/null
+++ b/src/changelog/.2.x.x/bump-logging-parent.xml
@@ -0,0 +1,9 @@
+<?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.2.xsd"
+ type="changed">
+ <description format="asciidoc">
+ Upgrade `logging-parent` to version 10.1.1
+ </description>
+</entry>
[logging-log4j-jmx-gui] 03/03: Adapt to `bnd-maven-plugin`
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 04dd44162ef9d2a9139323b36f28298483caa066
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Oct 17 18:14:23 2023 +0200
Adapt to `bnd-maven-plugin`
---
pom.xml | 51 ++++++++++++++--------
src/changelog/.2.x.x/add-osgi-jpms.xml | 9 ++++
.../apache/logging/log4j/jmx/gui/ClientGui.java | 2 +
.../apache/logging/log4j/jmx/gui/package-info.java | 3 ++
4 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0b745e8..7130b04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,21 +138,34 @@
<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>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bnd.annotation</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
- <version>${spotbugs-annotations.version}</version>
- <optional>true</optional>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
@@ -162,21 +175,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
- <id>default-jar</id>
+ <!-- Remove dummy JConsole stubs that are placed to enable compilation with Java 8+ versions. -->
+ <id>remove-stubs</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>process-classes</phase>
<configuration>
- <archive>
- <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>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>com/sun/tools/jconsole/**</include>
+ </includes>
+ </fileset>
+ </filesets>
</configuration>
</execution>
</executions>
diff --git a/src/changelog/.2.x.x/add-osgi-jpms.xml b/src/changelog/.2.x.x/add-osgi-jpms.xml
new file mode 100644
index 0000000..6f57c22
--- /dev/null
+++ b/src/changelog/.2.x.x/add-osgi-jpms.xml
@@ -0,0 +1,9 @@
+<?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.2.xsd"
+ type="changed">
+ <description format="asciidoc">
+ Add OSGi and JPMS descriptor
+ </description>
+</entry>
diff --git a/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java b/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
index a745908..56d40f7 100644
--- a/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
+++ b/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
@@ -56,6 +56,7 @@ import javax.swing.UIManager;
import javax.swing.UIManager.LookAndFeelInfo;
import javax.swing.WindowConstants;
+import aQute.bnd.annotation.jpms.MainClass;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.logging.log4j.core.jmx.LoggerContextAdminMBean;
import org.apache.logging.log4j.core.jmx.Server;
@@ -70,6 +71,7 @@ import org.apache.logging.log4j.core.jmx.StatusLoggerAdminMBean;
* >http://docs.oracle.com/javase/6/docs/technotes/guides/management/
* jconsole.html</a >
*/
+@MainClass
@SuppressFBWarnings("INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE")
public class ClientGui extends JPanel implements NotificationListener {
private static final long serialVersionUID = -253621277232291174L;
diff --git a/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java b/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java
index 3bec4a0..f757353 100644
--- a/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java
+++ b/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java
@@ -18,4 +18,7 @@
/**
* Log4j 2.0 JMX GUI.
*/
+@Export
package org.apache.logging.log4j.jmx.gui;
+
+import org.osgi.annotation.bundle.Export;
[logging-log4j-jmx-gui] 02/03: Upgrade `log4j-core` and `log4j-changelog`
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 a12370d4e25da12b94d54b5550ba6490b4deed65
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Oct 17 17:10:25 2023 +0200
Upgrade `log4j-core` and `log4j-changelog`
---
pom.xml | 3 ++-
src/changelog/.2.x.x/bump-logging-parent.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 34d5666..0b745e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,8 @@
<revision>2.22.0-SNAPSHOT</revision>
<!-- dependency versions -->
- <log4j.version>2.20.0</log4j.version>
+ <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>
</properties>
diff --git a/src/changelog/.2.x.x/bump-logging-parent.xml b/src/changelog/.2.x.x/bump-logging-parent.xml
index f671d4a..cc6b7e9 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
+ Upgrade `logging-parent` to version 10.1.1, `log4j-core` to version 2.21.0 and `log4j-changelog` to version 0.5.0
</description>
</entry>