Merge pull request #283 from xdev-software/develop

Release

.config/pmd/ruleset.xml

@@ -151,5 +151,12 @@
 		<exclude name="UseStringBufferForStringAppends"/>
 	</rule>
 
+	<rule ref="category/java/performance.xml/TooFewBranchesForSwitch">
+		<properties>
+			<!-- If you have one case only please use a if -->
+			<property name="minimumNumberCaseForASwitch" value="2"/>
+		</properties>
+	</rule>
+
 	<rule ref="category/java/security.xml"/>
 </ruleset>

.github/workflows/broken-links.yml

@@ -11,6 +11,7 @@ permissions:
 jobs:
   link-checker:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
 
@@ -19,6 +20,8 @@ jobs:
       - name: Link Checker
         id: lychee
         uses: lycheeverse/lychee-action@v2
+        with:
+          fail: false # Don't fail on broken links, create an issue instead
 
       - name: Find already existing issue
         id: find-issue

.github/workflows/check-build.yml

@@ -26,6 +26,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     strategy:
       matrix:
@@ -82,6 +83,7 @@ jobs:
   checkstyle:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
+    timeout-minutes: 15
 
     strategy:
       matrix:
@@ -104,6 +106,7 @@ jobs:
   pmd:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
+    timeout-minutes: 15
 
     strategy:
       matrix:

.github/workflows/release.yml

@@ -14,6 +14,7 @@ permissions:
 jobs:
   check-code:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
 
@@ -48,6 +49,7 @@ jobs:
   prepare-release:
     runs-on: ubuntu-latest
     needs: [check-code]
+    timeout-minutes: 10
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
@@ -109,6 +111,7 @@ jobs:
   publish-maven:
     runs-on: ubuntu-latest
     needs: [prepare-release]
+    timeout-minutes: 60
     steps:
     - uses: actions/checkout@v4
 
@@ -140,6 +143,7 @@ jobs:
   publish-pages:
     runs-on: ubuntu-latest
     needs: [prepare-release]
+    timeout-minutes: 15
     steps:
     - uses: actions/checkout@v4
 
@@ -169,6 +173,7 @@ jobs:
   after-release:
     runs-on: ubuntu-latest
     needs: [publish-maven]
+    timeout-minutes: 10
     steps:
     - uses: actions/checkout@v4
 

.github/workflows/sonar.yml

@@ -27,6 +27,7 @@ jobs:
   token-check:
     runs-on: ubuntu-latest
     if: ${{ !(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')) }}
+    timeout-minutes: 5
     outputs:
       hasToken: ${{ steps.check-token.outputs.has }}
     steps:
@@ -40,6 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: token-check
     if: ${{ needs.token-check.outputs.hasToken }}
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/sync-labels.yml

@@ -14,6 +14,7 @@ permissions:
 jobs:
   labels:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/test-deploy.yml

@@ -9,6 +9,7 @@ env:
 jobs:
   publish-maven:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
     - uses: actions/checkout@v4
 

.github/workflows/update-from-template.yml

@@ -31,6 +31,7 @@ permissions:
 jobs:
   update:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     outputs:
       update_branch_merged_commit: ${{ steps.manage-branches.outputs.update_branch_merged_commit }}
       create_update_branch_merged_pr: ${{ steps.manage-branches.outputs.create_update_branch_merged_pr }}
@@ -180,6 +181,7 @@ jobs:
     needs: [update]
     if: needs.update.outputs.create_update_branch_merged_pr == 1
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
         with:

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.4.0
+* PointStyle can also contain non-string constants #280
+* Use ``CoreInteractionOptions`` for ``Options#interaction`` and ``Options#hover`` #281
+* Updated dependencies
+
 ## 2.3.1
 * Synced ``LineOptions/DataSet`` ``stepped`` and ``tension`` with ChartJS source #262
 * Updated dependencies

chartjs-java-model-demo/pom.xml

@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>chartjs-java-model-root</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>chartjs-java-model-demo</artifactId>
-	<version>2.3.2-SNAPSHOT</version>
+	<version>2.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>

chartjs-java-model-demo/src/main/java/software/xdev/Application.java

@@ -45,7 +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://cdn.jsdelivr.net/npm/chart.js@4.4.5/dist/chart.umd.js\"></script>\n"
+					+ "\t\t<script src=\"https://cdn.jsdelivr.net/npm/chart.js@4.4.6/dist/chart.umd.js\"></script>\n"
 					+ "\t</head>\n"
 					+ "\t<body>\n"
 					+ "\t\t<canvas id='c' style='border:1px solid #555;'></canvas>\n"

chartjs-java-model/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model</artifactId>
-	<version>2.3.2-SNAPSHOT</version>
+	<version>2.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>chartjs-java-model</name>
@@ -50,7 +50,7 @@
 
 		<slf4j-version>2.0.16</slf4j-version>
 		<log4j-version>2.24.1</log4j-version>
-		<testcontainers-version>1.20.2</testcontainers-version>
+		<testcontainers-version>1.20.3</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.18.0</version>
+			<version>2.18.1</version>
 		</dependency>
 
 		<!-- Tests -->
@@ -129,7 +129,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.11.2</version>
+			<version>5.11.3</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -162,15 +162,15 @@
 		<dependency>
 			<groupId>software.xdev</groupId>
 			<artifactId>testcontainers-selenium</artifactId>
-			<version>1.0.2</version>
+			<version>1.1.0</version>
 			<scope>test</scope>
 		</dependency>
 
 		<!-- Selenium -->
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-chrome-driver</artifactId>
-			<version>4.25.0</version>
+			<version>4.26.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- Tracing is not needed -->
@@ -193,7 +193,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.7.0</version>
+					<version>3.8.0</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -241,7 +241,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.11.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.1</version>
+				<version>3.5.2</version>
 				<configuration>
 					<skipTests>${skipTests}</skipTests>
 				</configuration>
@@ -355,12 +355,12 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-checkstyle-plugin</artifactId>
-						<version>3.5.0</version>
+						<version>3.6.0</version>
 						<dependencies>
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.18.2</version>
+								<version>10.20.1</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -385,7 +385,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>
-						<version>3.25.0</version>
+						<version>3.26.0</version>
 						<configuration>
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
@@ -397,12 +397,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.6.0</version>
+								<version>7.7.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.6.0</version>
+								<version>7.7.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
@@ -414,7 +414,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-jxr-plugin</artifactId>
-						<version>3.5.0</version>
+						<version>3.6.0</version>
 					</plugin>
 				</plugins>
 			</reporting>

chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BarDataset.java

@@ -18,7 +18,6 @@
 import java.util.List;
 
 import software.xdev.chartjs.model.enums.BorderSkipped;
-import software.xdev.chartjs.model.enums.PointStyle;
 import software.xdev.chartjs.model.objects.OptionalArray;
 
 
@@ -35,7 +34,7 @@ public class BarDataset extends BackgroundBorderHoverDataset<BarDataset, Number>
 	protected Object barThickness;
 	protected Number maxBarThickness;
 	protected Number minBarLength;
-	protected PointStyle pointStyle;
+	protected Object pointStyle;
 	protected Boolean grouped;
 
 	protected final List<BorderSkipped> borderSkipped = new OptionalArray<>();
@@ -123,12 +122,12 @@ public BarDataset setMinBarLength(final Number minBarLength)
 		return this;
 	}
 
-	public PointStyle getPointStyle()
+	public Object getPointStyle()
 	{
 		return this.pointStyle;
 	}
 
-	public BarDataset setPointStyle(final PointStyle pointStyle)
+	public BarDataset setPointStyle(final Object pointStyle)
 	{
 		this.pointStyle = pointStyle;
 		return this;

chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BubbleDataset.java

@@ -18,7 +18,6 @@
 import java.util.List;
 
 import software.xdev.chartjs.model.datapoint.BubbleDataPoint;
-import software.xdev.chartjs.model.enums.PointStyle;
 import software.xdev.chartjs.model.objects.OptionalArray;
 
 
@@ -32,7 +31,7 @@ public class BubbleDataset extends BackgroundBorderHoverDataset<BubbleDataset, B
 
 	protected final List<Integer> hoverRadius = new OptionalArray<>();
 
-	protected PointStyle pointStyle;
+	protected Object pointStyle;
 
 	@Override
 	protected String defaultType()
@@ -95,12 +94,12 @@ public List<Integer> getHoverRadius()
 		return this.hoverRadius;
 	}
 
-	public PointStyle getPointStyle()
+	public Object getPointStyle()
 	{
 		return this.pointStyle;
 	}
 
-	public BubbleDataset setPointStyle(final PointStyle pointStyle)
+	public BubbleDataset setPointStyle(final Object pointStyle)
 	{
 		this.pointStyle = pointStyle;
 		return this;