Skip to content

Commit

Permalink
Replace JANSI with JLine 3
Browse files Browse the repository at this point in the history
JANSI is deprecated, see fusesource/jansi#294 for details.
  • Loading branch information
ppkarwasz committed Sep 3, 2024
1 parent 982e0bc commit f774335
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 9 deletions.
18 changes: 16 additions & 2 deletions log4j-jansi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,20 @@
<name>Apache Log4j Core: JANSI support</name>
<description>Support for JANSI library for Log4j Core.</description>

<properties>
<jline.version>3.26.3</jline.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jansi-core</artifactId>
<version>${jline.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<dependency>
Expand All @@ -46,8 +60,8 @@
</dependency>

<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<groupId>org.jline</groupId>
<artifactId>jansi-core</artifactId>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
*/
@Export
@Version("3.0.0")
package org.apache.logging.log4j.jansi;

import org.osgi.annotation.bundle.Export;
import org.osgi.annotation.versioning.Version;
7 changes: 0 additions & 7 deletions log4j-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
<HdrHistogram.version>2.2.2</HdrHistogram.version>
<hsqldb.version>2.7.3</hsqldb.version>
<jackson-bom.version>2.17.2</jackson-bom.version>
<jansi.version>2.4.0</jansi.version>
<javax-jms.version>2.0.1</javax-jms.version>
<java-allocation-instrumenter.version>3.3.4</java-allocation-instrumenter.version>
<jctools.version>4.0.5</jctools.version>
Expand Down Expand Up @@ -416,12 +415,6 @@
<version>${hsqldb.version}</version>
</dependency>

<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>${jansi.version}</version>
</dependency>

<!-- Used for garbage-free tests: -->
<dependency>
<groupId>com.google.code.java-allocation-instrumenter</groupId>
Expand Down

0 comments on commit f774335

Please sign in to comment.