Skip to content

Commit b00849e

Browse files
committed
Merge branch 'develop'
2 parents eab5712 + 8c27e20 commit b00849e

File tree

43 files changed

+1953
-37
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1953
-37
lines changed

.github/workflows/java-ea-maven.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Java-EA with Maven
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
workflow_dispatch:
8+
9+
jobs:
10+
build-and-test-job:
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
java: [ '-ea' ]
15+
os: [ ubuntu-latest ]
16+
17+
name: JDK${{ matrix.java }} on ${{ matrix.os }}
18+
runs-on: ${{ matrix.os }}
19+
20+
steps:
21+
- name: Checkout source code
22+
uses: actions/checkout@v3
23+
with:
24+
submodules: true
25+
fetch-depth: 0
26+
27+
- name: Setup Java
28+
uses: actions/setup-java@v3
29+
with:
30+
distribution: 'temurin'
31+
java-version: ${{ matrix.java }}
32+
cache: 'maven'
33+
34+
- name: Build and (headless) test with Maven
35+
uses: GabrielBB/xvfb-action@v1
36+
with:
37+
run: mvn -U -B -ntp package

.github/workflows/java8-maven.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,9 @@ jobs:
1010
matrix:
1111
java: [ 8, 17 ]
1212
os: [ ubuntu-latest, macOS-latest, windows-latest ]
13-
experimental: [ false ]
14-
include:
15-
- java: '-ea'
16-
os: ubuntu-latest
17-
experimental: true
1813

1914
name: JDK${{ matrix.java }} on ${{ matrix.os }}
2015
runs-on: ${{ matrix.os }}
21-
continue-on-error: ${{ matrix.experimental }}
2216

2317
steps:
2418
- name: Checkout source code

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [2.3.0] - 2022-12-09
10+
11+
### Added
12+
13+
- Add favicon module
14+
15+
### Fixed
16+
17+
- Fix module-info dependencies
18+
919
## [2.2.8] - 2022-10-28
1020

1121
### Fixed
@@ -70,7 +80,8 @@ java-desktop-util follows [semantic versioning](https://semver.org/).
7080
### Fixed
7181
- JDK11 cleanup
7282

73-
[Unreleased]: https://github.com/nbbrd/java-desktop-util/compare/v2.2.8...HEAD
83+
[Unreleased]: https://github.com/nbbrd/java-desktop-util/compare/v2.3.0...HEAD
84+
[2.3.0]: https://github.com/nbbrd/java-desktop-util/compare/v2.2.8...v2.3.0
7485
[2.2.8]: https://github.com/nbbrd/java-desktop-util/compare/v2.2.7...v2.2.8
7586
[2.2.7]: https://github.com/nbbrd/java-desktop-util/compare/v2.2.6...v2.2.7
7687
[2.2.6]: https://github.com/nbbrd/java-desktop-util/compare/v2.2.5...v2.2.6

java-desktop-util-bom/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>java-desktop-util-parent</artifactId>
88
<groupId>com.github.nbbrd.java-desktop-util</groupId>
9-
<version>2.2.8</version>
9+
<version>2.3.0</version>
1010
</parent>
1111

1212
<artifactId>java-desktop-util-bom</artifactId>
@@ -38,6 +38,11 @@
3838
<artifactId>java-desktop-util-swing</artifactId>
3939
<version>${project.version}</version>
4040
</dependency>
41+
<dependency>
42+
<groupId>${project.groupId}</groupId>
43+
<artifactId>java-desktop-util-favicon</artifactId>
44+
<version>${project.version}</version>
45+
</dependency>
4146
</dependencies>
4247
</dependencyManagement>
4348

java-desktop-util-chart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.nbbrd.java-desktop-util</groupId>
88
<artifactId>java-desktop-util-parent</artifactId>
9-
<version>2.2.8</version>
9+
<version>2.3.0</version>
1010
</parent>
1111

1212
<artifactId>java-desktop-util-chart</artifactId>

java-desktop-util-demo/pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>java-desktop-util-parent</artifactId>
88
<groupId>com.github.nbbrd.java-desktop-util</groupId>
9-
<version>2.2.8</version>
9+
<version>2.3.0</version>
1010
</parent>
1111

1212
<artifactId>java-desktop-util-demo</artifactId>
@@ -59,6 +59,11 @@
5959
<artifactId>java-desktop-util-swing</artifactId>
6060
<version>${project.version}</version>
6161
</dependency>
62+
<dependency>
63+
<groupId>${project.groupId}</groupId>
64+
<artifactId>java-desktop-util-favicon</artifactId>
65+
<version>${project.version}</version>
66+
</dependency>
6267
<dependency>
6368
<groupId>org.kordamp.ikonli</groupId>
6469
<artifactId>ikonli-swing</artifactId>
@@ -106,7 +111,7 @@
106111
<plugin>
107112
<groupId>org.jreleaser</groupId>
108113
<artifactId>jreleaser-maven-plugin</artifactId>
109-
<version>1.2.0</version>
114+
<version>1.3.1</version>
110115
<executions>
111116
<execution>
112117
<phase>install</phase>

0 commit comments

Comments
 (0)