xdev-software · AB-xdev · Oct 21, 2024 · Sep 11, 2024 · Sep 15, 2024 · Sep 19, 2024
diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml
@@ -18,7 +18,7 @@ jobs:
 
       - name: Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@v1
+        uses: lycheeverse/lychee-action@v2
 
       - name: Find already existing issue
         id: find-issue

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.3.1
+* Synced ``LineOptions/DataSet`` ``stepped`` and ``tension`` with ChartJS source #262
+* Updated dependencies
+
 ## 2.3.0
 * Update available datasets fields from ChartJS source code #244
 * Removed deprecated code

diff --git a/chartjs-java-model-demo/src/main/java/software/xdev/Application.java b/chartjs-java-model-demo/src/main/java/software/xdev/Application.java
@@ -45,8 +45,7 @@ private static void createAndOpenTestFile(final Chart<?, ?, ?> chart)
 					+ "<html lang='en'>\n"
 					+ "\t<head>\n"
 					+ "\t\t<meta charset='UTF-8'>\n"
-					+ "\t\t<script src=\"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.3.0/chart.umd"
-					+ ".js\"></script>\n"
+					+ "\t\t<script src=\"https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.js\"></script>\n"
 					+ "\t</head>\n"
 					+ "\t<body>\n"
 					+ "\t\t<canvas id='c' style='border:1px solid #555;'></canvas>\n"

diff --git a/chartjs-java-model/pom.xml b/chartjs-java-model/pom.xml
@@ -49,8 +49,8 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<slf4j-version>2.0.16</slf4j-version>
-		<log4j-version>2.24.0</log4j-version>
-		<testcontainers-version>1.20.1</testcontainers-version>
+		<log4j-version>2.24.1</log4j-version>
+		<testcontainers-version>1.20.2</testcontainers-version>
 
 		<!-- by default run no tests as Docker is required -->
 		<skipTests>true</skipTests>
@@ -95,7 +95,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.17.2</version>
+			<version>2.18.0</version>
 		</dependency>
 
 		<!-- Tests -->
@@ -129,7 +129,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.11.0</version>
+			<version>5.11.2</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -170,7 +170,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-chrome-driver</artifactId>
-			<version>4.24.0</version>
+			<version>4.25.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- Tracing is not needed -->
@@ -201,7 +201,7 @@
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>4.5</version>
+				<version>4.6</version>
 				<configuration>
 					<properties>
 						<email>${project.organization.url}</email>
@@ -241,7 +241,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.10.0</version>
+				<version>3.10.1</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -274,7 +274,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.5.1</version>
 				<configuration>
 					<skipTests>${skipTests}</skipTests>
 				</configuration>
@@ -312,7 +312,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.2.5</version>
+						<version>3.2.7</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -360,7 +360,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.18.1</version>
+								<version>10.18.2</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -397,12 +397,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.5.0</version>
+								<version>7.6.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.5.0</version>
+								<version>7.6.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDatasetBase.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDatasetBase.java
@@ -32,7 +32,8 @@ public abstract class LineDatasetBase<T extends PointDataset<T, O>, O> extends P
 
 	private final List<Integer> pointHitRadius = new OptionalArray<>();
 
-	private Boolean stepped;
+	protected Number tension;
+	protected Object stepped;
 
 	public String getXAxisID()
 	{
@@ -78,12 +79,23 @@ public T setSpanGaps(final Object spanGaps)
 		return this.self();
 	}
 
-	public Boolean getStepped()
+	public Number getTension()
+	{
+		return this.tension;
+	}
+
+	public T setTension(final Number tension)
+	{
+		this.tension = tension;
+		return this.self();
+	}
+
+	public Object getStepped()
 	{
 		return this.stepped;
 	}
 
-	public T setStepped(final Boolean stepped)
+	public T setStepped(final Object stepped)
 	{
 		this.stepped = stepped;
 		return this.self();

diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LineOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LineOptions.java
@@ -19,8 +19,14 @@
 import software.xdev.chartjs.model.options.elements.LineElements;
 
 
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.5/src/types/index.d.ts#L1892">ChartJS Source</a>
+ */
 public class LineOptions extends Options<LineOptions, DefaultAnimation>
 {
+	protected Number tension;
+	protected Object stepped;
+
 	/**
 	 * @see #setShowLine(Boolean)
 	 */
@@ -31,6 +37,28 @@ public class LineOptions extends Options<LineOptions, DefaultAnimation>
 	protected Boolean spanGaps;
 	protected LineElements elements;
 
+	public Number getTension()
+	{
+		return this.tension;
+	}
+
+	public LineOptions setTension(final Number tension)
+	{
+		this.tension = tension;
+		return this;
+	}
+
+	public Object getStepped()
+	{
+		return this.stepped;
+	}
+
+	public LineOptions setStepped(final Object stepped)
+	{
+		this.stepped = stepped;
+		return this;
+	}
+
 	/**
 	 * @see #setShowLine(Boolean)
 	 */

diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/DoughnutChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/DoughnutChartBasic.png
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/PieChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/PieChartBasic.png
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/PolarChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/PolarChartBasic.png
diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasic.png
diff --git a/...va-model/src/test/resources/screenshotReferences/RadarChartBasicRadialScale.png b/...va-model/src/test/resources/screenshotReferences/RadarChartBasicRadialScale.png
diff --git a/chartjs-java-model/src/test/resources/test-template.html b/chartjs-java-model/src/test/resources/test-template.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.1/chart.umd.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.5/dist/chart.umd.js"></script>
 </head>
 <body>
     <canvas id='c' style='border:1px solid #555;'></canvas>

diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.18.1</version>
+								<version>10.18.2</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -82,12 +82,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.5.0</version>
+								<version>7.6.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.5.0</version>
+								<version>7.6.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>