Merge pull request #37 from xdev-software/develop

Release 1.0.1

Author: AB-xdev

.github/workflows/checkBuild.yml

@@ -25,7 +25,7 @@ jobs:
         distribution: [temurin]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up JDK
       uses: actions/setup-java@v3

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
   check_code: # Validates the code
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up JDK
       uses: actions/setup-java@v3
@@ -52,7 +52,7 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Configure Git
       run: |
@@ -111,7 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Init Git and pull
       run: |
@@ -143,7 +143,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Init Git and pull
       run: |
@@ -197,7 +197,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [publish_central]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Init Git and pull
       run: |
@@ -223,9 +223,12 @@ jobs:
         git push origin
     
     - name: pull-request
-      uses: repo-sync/pull-request@v2
-      with:
-        destination_branch: "develop"
-        pr_title: "Sync back"
-        pr_body: "An automated PR to sync changes back"
-
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        gh_pr_up() { 
+          gh pr create "$@" || gh pr edit "$@" 
+        }
+        gh_pr_up -B "develop" \
+          --title "Sync back" \
+          --body "An automated PR to sync changes back"

.github/workflows/sonar.yml

@@ -26,7 +26,7 @@ jobs:
     # Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 

.github/workflows/test-deploy.yml

@@ -10,7 +10,7 @@ jobs:
   publish_central: # Publish the code to central
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up JDK OSSRH
       uses: actions/setup-java@v3

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

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Required because otherwise there are always changes detected when executing diff/rev-list
           fetch-depth: 0
@@ -81,12 +81,14 @@ jobs:
           echo "abort=0" >> $GITHUB_OUTPUT
           
       - name: pull-request
-        uses: repo-sync/pull-request@v2
         if: steps.main.outputs.abort == 0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          source_branch: ${{ env.UPDATE_BRANCH }}
-          destination_branch: ${{ steps.main.outputs.current_branch }}
-          pr_title: "Update from template"
-          pr_body: "An automated PR to sync changes from the template into this repo"
-          
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh_pr_up() { 
+            gh pr create "$@" || gh pr edit "$@" 
+          }
+          gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
+            -H "${{ env.UPDATE_BRANCH }}" \
+            --title "Update from template" \
+            --body "An automated PR to sync changes from the template into this repo"

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.1
+* Added support for [stacked bar chart with groups](https://www.chartjs.org/docs/latest/samples/bar/stacked-groups.html)
+
 ## 1.0.0
 Initial release
 
@@ -11,3 +14,4 @@ Noteworthy changes compared to [Chart.java](https://github.com/mdewilde/chart):
   * [4.x Migration Guide](https://www.chartjs.org/docs/4.3.0/migration/v4-migration.html)
 * JSON is no longer pretty printed by default due to performance reasons
 * Implemented integration tests
+* Requires Java 17

CONTRIBUTING.md

@@ -1,19 +1,18 @@
 ## Contributing
 
-We would absolutely love to get the community involved, and we welcome any form of contributions – comments and questions on different communication channels, issues and pull request in the repositories, and anything that you build and share using our components.
+We would absolutely love to get the community involved, and we welcome any form of contributions – comments and questions on different communication channels, issues and pull request and anything that you build and share using our components.
 
-### Get in touch with the team
+### Communication channels
+* Communication is primarily done using issues.
+* If you need support as soon as possible and you can't wait for any pull request, feel free to use [our support](https://xdev.software/en/services/support).
+* As a last resort measure or on otherwise important matter you may also [contact us directly](https://xdev.software/en/about-us/contact).
 
-Twitter: https://twitter.com/xdevsoftware 
-<br/>
-Mail: [email protected]
+### Ways to help
+* **Report bugs**<br/>Create an issue or send a pull request
+* **Send pull requests**<br/>If you want to contribute code, check out the development instructions below.
+  * However when contributing new features, please first discuss the change you wish to make via issue with the owners of this repository before making a change. Otherwise your work might be rejected and your effort was pointless.
 
-### Some ways to help:
-
-- **Report bugs**: File issues on GitHub.
-- **Send pull requests**: If you want to contribute code, check out the development instructions below.
-
-We encourage you to read the [contribution instructions by GitHub](https://guides.github.com/activities/contributing-to-open-source/#contributing) also.
+We also encourage you to read the [contribution instructions by GitHub](https://docs.github.com/en/get-started/quickstart/contributing-to-projects).
 
 ## Developing
 
@@ -26,7 +25,7 @@ You should have the following things installed:
 ### Recommended setup
 * Install ``IntelliJ`` (Community Edition is sufficient)
   * Install the following plugins:
-    * [Save Actions](https://plugins.jetbrains.com/plugin/7642-save-actions) - Provides save actions, like running the formatter or adding ``final`` to fields
+    * [Save Actions](https://plugins.jetbrains.com/plugin/22113) - Provides save actions, like running the formatter or adding ``final`` to fields
     * [SonarLint](https://plugins.jetbrains.com/plugin/7973-sonarlint) - CodeStyle/CodeAnalysis
     * [Checkstyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) - CodeStyle/CodeAnalysis
   * Import the project

chartjs-java-model-demo/pom.xml

@@ -16,16 +16,7 @@
 		<url>https://xdev.software</url>
 	</organization>
 
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-		</license>
-	</licenses>
-
 	<properties>
-		<license.licenseName>apache_v2</license.licenseName>
-
 		<javaVersion>17</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
@@ -58,11 +49,10 @@
 					</compilerArgs>
 				</configuration>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.6.0</version>
 				<configuration>
 					<archive>
 						<manifest>

chartjs-java-model/pom.xml

@@ -48,9 +48,9 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<slf4j-version>2.0.7</slf4j-version>
+		<slf4j-version>2.0.9</slf4j-version>
 		<log4j-version>2.20.0</log4j-version>
-		<testcontainers-version>1.18.0</testcontainers-version>
+		<testcontainers-version>1.19.1</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.15.0</version>
+			<version>2.15.2</version>
 		</dependency>
 
 		<!-- Tests -->
@@ -129,7 +129,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.9.3</version>
+			<version>5.10.0</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -157,7 +157,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-chrome-driver</artifactId>
-			<version>4.9.0</version>
+			<version>4.10.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -167,7 +167,7 @@
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>4.2</version>
+				<version>4.3</version>
 				<configuration>
 					<properties>
 						<email>${project.organization.url}</email>
@@ -207,7 +207,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.6.0</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -225,7 +225,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.2.1</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -240,7 +240,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>3.1.2</version>
 				<configuration>
 					<skipTests>${skipTests}</skipTests>
 				</configuration>
@@ -261,7 +261,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.0.1</version>
+						<version>3.1.0</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>

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

@@ -29,7 +29,7 @@ public class BarDataset extends BackgroundBorderHoverDataset<BarDataset, BigDeci
 	private String xAxisID;
 	private String yAxisID;
 	private final List<BorderSkipped> borderSkipped = new OptionalArray<>();
-	
+	private String stack;
 
 	public String getLabel()
 	{
@@ -84,4 +84,15 @@ public BarDataset setBorderSkipped(final List<BorderSkipped> borderSkipped)
 		}
 		return this;
 	}
+	
+	public String getStack()
+	{
+		return this.stack;
+	}
+	
+	public BarDataset setStack(final String stack)
+	{
+		this.stack = stack;
+		return this;
+	}
 }