From fe9f5c6d378b5200dc6e060ab618e6d8bce3acd3 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Mon, 12 May 2025 12:44:57 +0200 Subject: [PATCH 1/4] #169: Upgrade jline-terminal to 3.29.0 Fixes: #169 **Implements** * changed jline-terminal from 3.26.2 to 3.29.0 * added dependabot suggestion --- .github/dependabot.yml | 11 +++++++++++ pom.xml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..9c837ba --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "weekly" diff --git a/pom.xml b/pom.xml index 554f371..5cf8eef 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ org.jline jline-terminal - 3.26.2 + 3.29.0 From 464d1ab961b1157c1cd5f6ffdc39a3da72085b8b Mon Sep 17 00:00:00 2001 From: Tongfei Chen Date: Wed, 14 Jan 2026 00:13:08 -0800 Subject: [PATCH 2/4] restore jdk8 compatibility w/ multi-release JAR --- CHANGELOG.md | 2 ++ pom.xml | 45 +++++++++++++++++++++++++++++----- src/main/java/module-info.java | 4 --- 3 files changed, 41 insertions(+), 10 deletions(-) delete mode 100644 src/main/java/module-info.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 302e06c..d0ba38e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog * `0.10.2`: + - Improvements: + - Restored JDK 8 compatibility by using a multi-release JAR. The library now works on JDK 8+ while still providing JPMS module support for JDK 9+. - Bugfixes: - Fixed a `NullPointerException` (https://github.com/jline/jline3/issues/930) by updating a `jline` dependency. (PR #164). Thanks @koppor ! * `0.10.1`: diff --git a/pom.xml b/pom.xml index 4f7cb27..f9d22d0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,10 +6,10 @@ me.tongfei progressbar - 0.10.1 + 0.10.2 progressbar A terminal-based progress bar for JVM - http://github.com/ctongfei/progressbar + https://github.com/ctongfei/progressbar UTF-8 @@ -20,7 +20,7 @@ MIT - http://opensource.org/licenses/MIT + https://opensource.org/licenses/MIT repo @@ -143,7 +143,7 @@ org.jline jline-terminal - 3.26.2 + 3.29.0 @@ -192,9 +192,42 @@ org.apache.maven.plugins maven-compiler-plugin 3.11.0 + + + + default-compile + + 1.8 + 1.8 + + + + + compile-java9 + compile + + compile + + + 9 + + ${project.basedir}/src/main/java9 + + true + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 - 9 - 9 + + + true + + diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java deleted file mode 100644 index 9758395..0000000 --- a/src/main/java/module-info.java +++ /dev/null @@ -1,4 +0,0 @@ -module me.tongfei.progressbar { - requires org.jline.terminal; - exports me.tongfei.progressbar; -} From 38c1e41ce3fc5d1e7330ca47ad6279e38b5f9173 Mon Sep 17 00:00:00 2001 From: Tongfei Chen Date: Wed, 14 Jan 2026 00:29:15 -0800 Subject: [PATCH 3/4] update contributors --- CHANGELOG.md | 5 +++-- pom.xml | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33232a3..f96b2f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,9 @@ - Improvements: - Restored JDK 8 compatibility by using a multi-release JAR. The library now works on JDK 8+ while still providing JPMS module support for JDK 9+. This fixes #175. Thanks @LyingDoc ! - Bugfixes: - - Fixed a `NullPointerException` (https://github.com/jline/jline3/issues/930) by updating a `jline` dependency. (PR #164). Thanks @koppor ! - * `0.10.1`: + - Fixed a `NullPointerException` (https://github.com/jline/jline3/issues/930) by updating a `jline` dependency (PR #164). Thanks @koppor ! + - Fixed a problem with `jline` version mismatch (#169, PR #170). Thanks @hohwille @jan-vcapgemini ! + * `0.10.1`: - Improvements: - Changed the JPMS module dependency `org.jline` to a more fine-grained module `org.jline.terminal` (#158, PR #159). Thanks @brett-smith ! - Added a new builder method `setRenderer` to allow custom renderers (#157). Thanks @drothmaler ! diff --git a/pom.xml b/pom.xml index f9d22d0..4f9d5e0 100644 --- a/pom.xml +++ b/pom.xml @@ -137,6 +137,9 @@ koppor Oliver Kopp + + jan-vcapgemini + @@ -217,6 +220,10 @@ + + 9 + 9 + org.apache.maven.plugins From 1f3db21e7735997de39ab2b1b68e7d121a0c507d Mon Sep 17 00:00:00 2001 From: Tongfei Chen Date: Thu, 15 Jan 2026 00:01:04 -0800 Subject: [PATCH 4/4] update versions --- LICENSE | 2 +- README.md | 4 ++-- docs/index.md | 2 +- mkdocs.yml | 2 +- pom.xml | 33 ++++++++++++++------------------- 5 files changed, 19 insertions(+), 24 deletions(-) diff --git a/LICENSE b/LICENSE index 4a58ef9..8a93c2e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015--2024 Tongfei Chen and contributors +Copyright (c) 2015--2026 Tongfei Chen and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 2625482..94f07fc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # progressbar -[![Maven Central](https://img.shields.io/maven-central/v/me.tongfei/progressbar.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/me.tongfei/progressbar) +[![Maven Central](https://maven-badges.sml.io/maven-central/me.tongfei/progressbar/badge.svg)](https://central.sonatype.com/artifact/me.tongfei/progressbar) A console progress bar for JVM with minimal runtime overhead. @@ -29,7 +29,7 @@ Maven: me.tongfei progressbar - 0.10.0 + $VERSION ``` diff --git a/docs/index.md b/docs/index.md index d96581d..1dc21f2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -22,7 +22,7 @@ Depending on your build tool, add the following setting. compile 'me.tongfei:progressbar:$VERSION' ``` -The newest `$VERSION` is [![Maven Central](https://img.shields.io/maven-central/v/me.tongfei/progressbar.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/me.tongfei/progressbar). +The newest `$VERSION` is [![Maven Central](https://maven-badges.sml.io/maven-central/me.tongfei/progressbar/badge.svg)](https://central.sonatype.com/artifact/me.tongfei/progressbar). #### Getting started diff --git a/mkdocs.yml b/mkdocs.yml index 26c4c2c..2eab5a6 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,7 +1,7 @@ site_name: 'Progressbar' site_description: 'A terminal progress bar for Java/JVM' site_author: 'Tongfei Chen' -copyright: 'Copyright © 2015-2024 Tongfei Chen and contributors' +copyright: 'Copyright © 2015--2026 Tongfei Chen and contributors' theme: name: 'material' diff --git a/pom.xml b/pom.xml index 4f9d5e0..9349199 100644 --- a/pom.xml +++ b/pom.xml @@ -180,13 +180,9 @@ - ossrh - https://oss.sonatype.org/content/repositories/snapshots + central + https://central.sonatype.com/repository/maven-snapshots/ - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - @@ -194,7 +190,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 @@ -228,7 +224,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.2 @@ -240,7 +236,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.3.1 attach-sources @@ -253,7 +249,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.0 + 3.10.1 all,-missing false @@ -270,7 +266,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 3.2.7 sign-artifacts @@ -282,20 +278,19 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.3 + org.sonatype.central + central-publishing-maven-plugin + 0.6.0 true - ossrh - https://oss.sonatype.org/ - true + central + true org.apache.maven.plugins maven-assembly-plugin - 3.2.0 + 3.7.1 jar-with-dependencies @@ -305,7 +300,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.5.2 false