Skip to content

Commit 5fea526

Browse files
authored
Merge pull request #176 from ctongfei/0.10.2
0.10.2
2 parents fb08d40 + 1f3db21 commit 5fea526

8 files changed

Lines changed: 75 additions & 58 deletions

File tree

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "maven"
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# Changelog
22
* `0.10.2`:
3+
- Improvements:
4+
- 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 !
35
- Bugfixes:
4-
- Fixed a `NullPointerException` (https://github.com/jline/jline3/issues/930) by updating a `jline` dependency. (PR #164). Thanks @koppor !
5-
* `0.10.1`:
6+
- Fixed a `NullPointerException` (https://github.com/jline/jline3/issues/930) by updating a `jline` dependency (PR #164). Thanks @koppor !
7+
- Fixed a problem with `jline` version mismatch (#169, PR #170). Thanks @hohwille @jan-vcapgemini !
8+
* `0.10.1`:
69
- Improvements:
710
- Changed the JPMS module dependency `org.jline` to a more fine-grained module `org.jline.terminal` (#158, PR #159). Thanks @brett-smith !
811
- Added a new builder method `setRenderer` to allow custom renderers (#157). Thanks @drothmaler !

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015--2024 Tongfei Chen and contributors
3+
Copyright (c) 2015--2026 Tongfei Chen and contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# progressbar
2-
[![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)
2+
[![Maven Central](https://maven-badges.sml.io/maven-central/me.tongfei/progressbar/badge.svg)](https://central.sonatype.com/artifact/me.tongfei/progressbar)
33

44
A console progress bar for JVM with minimal runtime overhead.
55

@@ -29,7 +29,7 @@ Maven:
2929
<dependency>
3030
<groupId>me.tongfei</groupId>
3131
<artifactId>progressbar</artifactId>
32-
<version>0.10.0</version>
32+
<version>$VERSION</version>
3333
</dependency>
3434
```
3535

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Depending on your build tool, add the following setting.
2222
compile 'me.tongfei:progressbar:$VERSION'
2323
```
2424

25-
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).
25+
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).
2626

2727
#### Getting started
2828

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
site_name: 'Progressbar'
22
site_description: 'A terminal progress bar for Java/JVM'
33
site_author: 'Tongfei Chen'
4-
copyright: 'Copyright &copy; 2015-2024 Tongfei Chen and contributors'
4+
copyright: 'Copyright &copy; 2015--2026 Tongfei Chen and contributors'
55

66
theme:
77
name: 'material'

pom.xml

Lines changed: 54 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
<groupId>me.tongfei</groupId>
88
<artifactId>progressbar</artifactId>
9-
<version>0.10.1</version>
9+
<version>0.10.2</version>
1010
<name>progressbar</name>
1111
<description>A terminal-based progress bar for JVM</description>
12-
<url>http://github.com/ctongfei/progressbar</url>
12+
<url>https://github.com/ctongfei/progressbar</url>
1313

1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -20,7 +20,7 @@
2020
<licenses>
2121
<license>
2222
<name>MIT</name>
23-
<url>http://opensource.org/licenses/MIT</url>
23+
<url>https://opensource.org/licenses/MIT</url>
2424
<distribution>repo</distribution>
2525
</license>
2626
</licenses>
@@ -137,13 +137,16 @@
137137
<id>koppor</id>
138138
<name>Oliver Kopp</name>
139139
</developer>
140+
<developer>
141+
<id>jan-vcapgemini</id>
142+
</developer>
140143
</developers>
141144

142145
<dependencies>
143146
<dependency>
144147
<groupId>org.jline</groupId>
145148
<artifactId>jline-terminal</artifactId>
146-
<version>3.26.2</version>
149+
<version>3.29.0</version>
147150
</dependency>
148151

149152
<dependency>
@@ -177,75 +180,76 @@
177180

178181
<distributionManagement>
179182
<snapshotRepository>
180-
<id>ossrh</id>
181-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
183+
<id>central</id>
184+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
182185
</snapshotRepository>
183-
<repository>
184-
<id>ossrh</id>
185-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
186-
</repository>
187186
</distributionManagement>
188187

189188
<build>
190189
<plugins>
191190
<plugin>
192191
<groupId>org.apache.maven.plugins</groupId>
193192
<artifactId>maven-compiler-plugin</artifactId>
194-
<version>3.11.0</version>
195-
<configuration>
196-
<source>8</source>
197-
<target>8</target>
198-
</configuration>
193+
<version>3.13.0</version>
199194
<executions>
195+
<!-- Default compilation for Java 8 -->
200196
<execution>
201197
<id>default-compile</id>
202198
<configuration>
203-
<excludes>
204-
<!-- module-info.java is compiled using ModiTect -->
205-
<exclude>module-info.java</exclude>
206-
</excludes>
199+
<source>1.8</source>
200+
<target>1.8</target>
207201
</configuration>
208202
</execution>
209-
</executions>
210-
</plugin>
211-
<plugin>
212-
<groupId>org.apache.maven.plugins</groupId>
213-
<artifactId>maven-source-plugin</artifactId>
214-
<version>2.2.1</version>
215-
<executions>
203+
<!-- Compile module-info.java for Java 9+ -->
216204
<execution>
217-
<id>attach-sources</id>
205+
<id>compile-java9</id>
206+
<phase>compile</phase>
218207
<goals>
219-
<goal>jar-no-fork</goal>
208+
<goal>compile</goal>
220209
</goals>
210+
<configuration>
211+
<release>9</release>
212+
<compileSourceRoots>
213+
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
214+
</compileSourceRoots>
215+
<multiReleaseOutput>true</multiReleaseOutput>
216+
</configuration>
221217
</execution>
222218
</executions>
219+
<configuration>
220+
<source>9</source>
221+
<target>9</target>
222+
</configuration>
223+
</plugin>
224+
<plugin>
225+
<groupId>org.apache.maven.plugins</groupId>
226+
<artifactId>maven-jar-plugin</artifactId>
227+
<version>3.4.2</version>
228+
<configuration>
229+
<archive>
230+
<manifestEntries>
231+
<Multi-Release>true</Multi-Release>
232+
</manifestEntries>
233+
</archive>
234+
</configuration>
223235
</plugin>
224236
<plugin>
225-
<groupId>org.moditect</groupId>
226-
<artifactId>moditect-maven-plugin</artifactId>
227-
<version>1.2.2.Final</version>
237+
<groupId>org.apache.maven.plugins</groupId>
238+
<artifactId>maven-source-plugin</artifactId>
239+
<version>3.3.1</version>
228240
<executions>
229241
<execution>
230-
<id>add-module-info</id>
231-
<phase>package</phase>
242+
<id>attach-sources</id>
232243
<goals>
233-
<goal>add-module-info</goal>
244+
<goal>jar-no-fork</goal>
234245
</goals>
235-
<configuration>
236-
<jvmVersion>9</jvmVersion>
237-
<module>
238-
<moduleInfoFile>${project.build.sourceDirectory}/module-info.java</moduleInfoFile>
239-
</module>
240-
<overwriteExistingFiles>true</overwriteExistingFiles>
241-
</configuration>
242246
</execution>
243247
</executions>
244248
</plugin>
245249
<plugin>
246250
<groupId>org.apache.maven.plugins</groupId>
247251
<artifactId>maven-javadoc-plugin</artifactId>
248-
<version>3.0.0</version>
252+
<version>3.10.1</version>
249253
<configuration>
250254
<doclint>all,-missing</doclint>
251255
<detectJavaApiLink>false</detectJavaApiLink>
@@ -262,7 +266,7 @@
262266
<plugin>
263267
<groupId>org.apache.maven.plugins</groupId>
264268
<artifactId>maven-gpg-plugin</artifactId>
265-
<version>1.5</version>
269+
<version>3.2.7</version>
266270
<executions>
267271
<execution>
268272
<id>sign-artifacts</id>
@@ -274,20 +278,19 @@
274278
</executions>
275279
</plugin>
276280
<plugin>
277-
<groupId>org.sonatype.plugins</groupId>
278-
<artifactId>nexus-staging-maven-plugin</artifactId>
279-
<version>1.6.3</version>
281+
<groupId>org.sonatype.central</groupId>
282+
<artifactId>central-publishing-maven-plugin</artifactId>
283+
<version>0.6.0</version>
280284
<extensions>true</extensions>
281285
<configuration>
282-
<serverId>ossrh</serverId>
283-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
284-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
286+
<publishingServerId>central</publishingServerId>
287+
<autoPublish>true</autoPublish>
285288
</configuration>
286289
</plugin>
287290
<plugin>
288291
<groupId>org.apache.maven.plugins</groupId>
289292
<artifactId>maven-assembly-plugin</artifactId>
290-
<version>3.2.0</version>
293+
<version>3.7.1</version>
291294
<configuration>
292295
<descriptorRefs>
293296
<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -297,7 +300,7 @@
297300
<plugin>
298301
<groupId>org.apache.maven.plugins</groupId>
299302
<artifactId>maven-surefire-plugin</artifactId>
300-
<version>3.0.0</version>
303+
<version>3.5.2</version>
301304
<configuration>
302305
<useModulePath>false</useModulePath> <!-- tests use classpath -->
303306
</configuration>

0 commit comments

Comments
 (0)