Skip to content

Commit

Permalink
Dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
mdewilde committed Mar 2, 2020
1 parent a684b13 commit 80bbc67
Show file tree
Hide file tree
Showing 129 changed files with 218 additions and 195 deletions.
6 changes: 6 additions & 0 deletions changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2.6.0 [2020-02]

* Java baseline bump to 1.7
* dependency updates (Jackson CVEs)
* default constructor for object Fill

2.5.0 [2018-11]

* added support for tooltips callbacks and modified fill to support more fill settings [thanks Tomáš Jochec]
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<packaging>jar</packaging>
<groupId>be.ceau</groupId>
<artifactId>chart</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
<name>Chart</name>
<description>Java library for use with Chart.js javascript</description>
<url>https://www.ceau.be/chart.html</url>
Expand Down Expand Up @@ -46,17 +46,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.7</version>
<version>2.10.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -66,8 +66,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<compilerArgs><compilerArg>-Xlint:all</compilerArg></compilerArgs>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/BarChart.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/BubbleChart.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/Chart.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/DoughnutChart.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/LineChart.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/PieChart.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/PolarChart.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/RadarChart.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/ScatterLineChart.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/color/Color.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/color/package-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/data/BarData.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/data/BubbleData.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/data/Data.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/data/DoughnutData.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/data/LineData.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/data/PieData.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/data/PolarData.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/data/RadarData.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/data/ScatterLineData.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/data/package-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/datapoint/BubbleDataPoint.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/datapoint/package-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/dataset/BarDataset.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/dataset/BaseLineDataset.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/dataset/BubbleDataset.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/dataset/Dataset.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/dataset/DoughnutDataset.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/dataset/LineDataset.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/dataset/PieDataset.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
16 changes: 15 additions & 1 deletion src/main/java/be/ceau/chart/dataset/PointDataset.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
/*
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed 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.
*/
package be.ceau.chart.dataset;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/dataset/PolarDataset.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/dataset/RadarDataset.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/dataset/RoundDataset.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/dataset/package-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/enums/BorderCapStyle.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/enums/BorderJoinStyle.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/enums/BorderSkipped.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/enums/Easing.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/enums/Event.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/enums/FillMode.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/enums/FontFamily.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/enums/FontStyle.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/be/ceau/chart/enums/HoverMode.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2018 Marceau Dewilde <[email protected]>
Copyright 2020 Marceau Dewilde <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit 80bbc67

Please sign in to comment.