Skip to content

Commit 1dbaec0

Browse files
committed
Merge branch 'develop' into update-from-template-github_com_xdev-software_standard-maven-template_master-merged
2 parents 4dc1db8 + e4b7e37 commit 1dbaec0

174 files changed

Lines changed: 12760 additions & 32 deletions

File tree

Some content is hidden

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

.github/.lycheeignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# Ignorefile for broken link check
22
localhost
33
mvnrepository.com
4+
# Hides behind CloudFlare
5+
showcase.primefaces.org

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ body:
1515
attributes:
1616
label: "Checklist"
1717
options:
18-
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
18+
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/chartjs-java-model/releases/latest)"
1919
required: true
20-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
20+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/chartjs-java-model/issues) or [closed](https://github.com/xdev-software/chartjs-java-model/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
2121
required: true
2222
- label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
2323
required: true

.github/ISSUE_TEMPLATE/enhancement.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ body:
1313
attributes:
1414
label: "Checklist"
1515
options:
16-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
16+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/chartjs-java-model/issues) or [closed](https://github.com/xdev-software/chartjs-java-model/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1717
required: true
1818
- label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
1919
required: true

.github/ISSUE_TEMPLATE/question.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
attributes:
1313
label: "Checklist"
1414
options:
15-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
15+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/chartjs-java-model/issues) or [closed](https://github.com/xdev-software/chartjs-java-model/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1616
required: true
1717
- label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
1818
required: true

.github/workflows/check-build.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
${{ runner.os }}-mvn-build-
4949
5050
- name: Build with Maven
51-
run: ./mvnw -B clean package
51+
run: ./mvnw -B clean package -P run-integration-tests
5252

5353
- name: Check for uncommited changes
5454
run: |
@@ -75,6 +75,14 @@ jobs:
7575
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
7676
if-no-files-found: error
7777

78+
- name: Upload screenshots of test failures
79+
if: failure()
80+
uses: actions/upload-artifact@v7
81+
with:
82+
name: test-fail-screenshots-${{ matrix.java }}
83+
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/screenshots
84+
if-no-files-found: ignore
85+
7886
checkstyle:
7987
runs-on: ubuntu-latest
8088
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
3838
- name: Build with Maven
3939
run: ./mvnw -B clean package -T2C
40-
40+
4141
- name: Check for uncommited changes
4242
run: |
4343
if [[ "$(git status --porcelain)" != "" ]]; then

.run/Run Demo.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Demo" type="Application" factoryName="Application">
33
<option name="MAIN_CLASS_NAME" value="software.xdev.Application" />
4-
<module name="template-placeholder-demo" />
4+
<module name="chartjs-java-model-demo" />
55
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
66
<extension name="coverage">
77
<pattern>

CHANGELOG.md

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
# 3.0.2
2+
* Updated dependencies
3+
4+
# 3.0.1
5+
* Updated dependencies
6+
7+
# 3.0.0
8+
_Java 17 is now required_
9+
* Updated dependencies
10+
* Updated to Jackson v3 #477
11+
12+
# 2.9.1
13+
* Updated dependencies
14+
15+
# 2.9.0
16+
* Synced `LineOptions` from ChartJS source code #439
17+
* Updated dependencies
18+
19+
# 2.8.1
20+
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
21+
22+
# 2.8.0
23+
* Synced ``TooltipOptions`` from ChartJS source code #330
24+
25+
# 2.7.0
26+
* ``Title``: Make it possible to set custom padding and multi-line text #316
27+
28+
# 2.6.0
29+
* Synced ``Doughnut/PieOptions`` from ChartJS source code #293
30+
* Synced ``GridLineConfiguration`` from ChartJS source code / improved Types for more options #289
31+
* Updated dependencies
32+
33+
# 2.5.0
34+
* Synced ``Legend`` from ChartJS source code #285
35+
36+
# 2.4.0
37+
* PointStyle can also contain non-string constants #280
38+
* Use ``CoreInteractionOptions`` for ``Options#interaction`` and ``Options#hover`` #281
39+
* Updated dependencies
40+
41+
# 2.3.1
42+
* Synced ``LineOptions/DataSet`` ``stepped`` and ``tension`` with ChartJS source #262
43+
* Updated dependencies
44+
45+
# 2.3.0
46+
* Update available datasets fields from ChartJS source code #244
47+
* Removed deprecated code
48+
49+
# 2.2.0
50+
* Improve color handling #238
51+
* Change ``Color`` to ``RGBAColor`` as it only handles RGBA
52+
* Change all occurrences of ``Color`` to ``Object`` so that other color models (e.g. HSLA or Hex) can be applied
53+
* Created ``HSLAColor`` that can be used like ``RGBAColor``
54+
55+
# 2.1.0
56+
* Charts no longer check if they are drawable #198
57+
* ChartJS behavior: If a chart can't be drawn it will render a empty canvas
58+
* Deprecated methods: ``Chart#toJsonNative`` and ``Chart#isDrawable``
59+
* Make ``IndexAxis`` available in all options
60+
61+
# 2.0.2
62+
_Same as version 2.1.0 - Version was not incremented correctly_
63+
64+
# 2.0.1
65+
* Restored ``DisplayFormats`` #186
66+
67+
# 2.0.0
68+
* Scales have been reworked and are now nearly identical to the [types defined in ChartJS](https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts)
69+
* The use of ``Color`` for various coloring related options is no longer required.
70+
* It's now possible to use e.g. strings
71+
72+
# 1.5.0
73+
* Added ``JsonIgnore`` to certain fields to help prevent infinite loops #174
74+
* Corrected model for ``Title`` and ``Font`` #175
75+
76+
# 1.4.1
77+
* Use ``Number`` instead of ``BigDecimal`` in some additional places #159 (@aripddev)
78+
79+
# 1.4.0
80+
* Simplify API by using ``Number`` instead of ``BigDecimal``, ``int`` and ``double`` for ``Datapoints`` #154 (@aripddev)
81+
82+
# 1.3.1
83+
* Add subtitle option #141 (@aripddev)
84+
* Add ``PointStyle#rectRounded`` #143 (@aripddev)
85+
* Add ``BubbleDataset#pointStyle`` #144 (@aripddev)
86+
* ``reverse`` property should be on the ``Scale`` object #145
87+
* Added all available properties for ``Legend``
88+
89+
# 1.3.0
90+
* Allows creation of mixed charts #128
91+
* New chart class: ``MixedChart``
92+
* Some classes have been renamed
93+
* ``Data`` -> ``HomogeneousData``
94+
* ``AbstractChart`` -> ``HomogeneousChart``
95+
* Slim down test dependencies
96+
97+
# 1.2.0
98+
* Add TimeScale and TimeTicks to allow building linear time charts #90 (@astappiev)
99+
* Add options for the [Zoom plugin](https://www.chartjs.org/chartjs-plugin-zoom/latest/) #117 (@astappiev)
100+
* Updated dependencies
101+
102+
# 1.1.3
103+
* Add ``toJsonNative`` method which doesn't run the ``isDrawable`` check #91
104+
105+
# 1.1.2
106+
* ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``
107+
108+
# 1.1.1
109+
* ``AngleLines#lineWidth`` now uses ``BigDecimal`` #76
110+
* Updated dependencies
111+
112+
# 1.1.0
113+
* Added support for more [data structures](https://www.chartjs.org/docs/4.4.0/general/data-structures.html) inside ``Dataset#data``
114+
* ``Dataset#data`` can now contain ``Object``s
115+
116+
# 1.0.2
117+
* Support Java 11
118+
* Updated dependencies
119+
120+
# 1.0.1
121+
* Added support for [stacked bar chart with groups](https://www.chartjs.org/docs/4.4.0/samples/bar/stacked-groups.html) (@dlemaignent)
122+
123+
# 1.0.0
124+
Initial release
125+
126+
Support for Chart.js v4
127+
128+
Noteworthy changes compared to [Chart.java](https://github.com/mdewilde/chart):
129+
* Changed the package to ``software.xdev.chartjs.model``
130+
* All charts (e.g. ``BarChart``, ``LineChart``, ...) are now inside the ``charts`` package
131+
* Breaking API changes due to compatibility with Chart.js v4; You may checkout the migration guides
132+
* [3.x Migration Guide](https://www.chartjs.org/docs/4.3.0/migration/v3-migration.html)
133+
* [4.x Migration Guide](https://www.chartjs.org/docs/4.3.0/migration/v4-migration.html)
134+
* JSON is no longer pretty printed by default due to performance reasons
135+
* Implemented integration tests
136+
* Requires Java 17

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ You should have the following things installed:
3434
* Ensure that the JDK/Java-Version is correct
3535

3636

37-
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/template-placeholder/release.yml?branch=master)](https://github.com/xdev-software/template-placeholder/actions/workflows/release.yml)
37+
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/chartjs-java-model/release.yml?branch=master)](https://github.com/xdev-software/chartjs-java-model/actions/workflows/release.yml)
3838

3939
Before releasing:
40-
* Consider doing a [test-deployment](https://github.com/xdev-software/template-placeholder/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
40+
* Consider doing a [test-deployment](https://github.com/xdev-software/chartjs-java-model/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
4141
* Check the [changelog](CHANGELOG.md)
4242

4343
If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes

LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
identification within third-party archives.
188188

189189
Copyright 2024 XDEV Software
190+
Copyright 2020 Marceau Dewilde
190191

191192
Licensed under the Apache License, Version 2.0 (the "License");
192193
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)