Merge pull request #134 from xdev-software/develop

Release

Author: AB-xdev

.gitattributes

@@ -1,2 +1,9 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+
+# Force sh files to have LF
+*.sh text eol=lf
+
+# Force MVN Wrapper Linux files LF
+mvnw text eol=lf
+.mvn/wrapper/maven-wrapper.properties text eol=lf

.github/dependabot.yml

@@ -7,13 +7,15 @@ on:
     paths-ignore: 
       - '**.md'
       - '.config/**'
+      - '.github/**'
       - '.idea/**'
       - 'assets/**'
   pull_request:
     branches: [ develop ]
     paths-ignore: 
       - '**.md'
       - '.config/**'
+      - '.github/**'
       - '.idea/**'
       - 'assets/**'
 
@@ -41,7 +43,7 @@ jobs:
         cache: 'maven'
 
     - name: Build with Maven
-      run: mvn -B clean package -P run-integration-tests
+      run: ./mvnw -B clean package -P run-integration-tests
 
     - name: Check for uncommited changes
       run: |
@@ -57,7 +59,7 @@ jobs:
           echo ----------------------------------------
           echo Troubleshooting
           echo ----------------------------------------
-          echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && mvn -B clean package"
+          echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && ./mvnw -B clean package"
           exit 1
         fi
 
@@ -78,6 +80,7 @@ jobs:
 
   code-style:
     runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
 
     strategy:
       matrix:
@@ -95,4 +98,4 @@ jobs:
         cache: 'maven'
 
     - name: Run Checkstyle
-      run: mvn -B checkstyle:check -P checkstyle -T2C
+      run: ./mvnw -B checkstyle:check -P checkstyle -T2C

.github/workflows/checkBuild.yml

@@ -25,7 +25,7 @@ jobs:
         cache: 'maven'
 
     - name: Build with Maven
-      run: mvn -B clean package
+      run: ./mvnw -B clean package
 
     - name: Check for uncommited changes
       run: |
@@ -41,7 +41,7 @@ jobs:
           echo ----------------------------------------
           echo Troubleshooting
           echo ----------------------------------------
-          echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && mvn -B clean package"
+          echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && ./mvnw -B clean package"
           exit 1
         fi
 
@@ -60,18 +60,19 @@ jobs:
   
     - name: Un-SNAP 
       run: |
+        mvnwPath=$(readlink -f ./mvnw)
         modules=("") # root
         modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
         for i in "${modules[@]}"
         do
             echo "Processing $i/pom.xml"
-            (cd "$i" && mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
+            (cd "$i" && $mvnwPath -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
         done
   
     - name: Get version
       id: version
       run: |
-        version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+        version=$(../mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
         echo "release=$version" >> $GITHUB_OUTPUT
         echo "releasenumber=${version//[!0-9]/}" >> $GITHUB_OUTPUT
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
@@ -129,15 +130,14 @@ jobs:
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
 
     - name: Publish to Apache Maven Central
-      run: mvn -B deploy -Possrh
+      run: ../mvnw -B deploy -Possrh
       env:
         MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
   publish-pages:
-    name: Publish dependencies and licenses to github pages
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
@@ -156,40 +156,15 @@ jobs:
         distribution: 'temurin'
         cache: 'maven'
 
-    - name: Build dependencies/licenses files
-      run: mvn -B project-info-reports:dependencies
+    - name: Build site
+      run: ../mvnw -B site
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
-    - name: Upload licenses - Upload Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: dependencies-licenses
-        path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site
-
-    - name: Generate docs/dependencies dir
-      run: mkdir -p docs/dependencies
-
-    - name: Move built files into docs/dependencies
-      run: mv ${{ env.PRIMARY_MAVEN_MODULE }}/target/site/* docs/dependencies
-
-    - name: Rename dependencies.html to index.html
-      working-directory: docs/dependencies
-      run: mv dependencies.html index.html
-
-    - name: Copy Readme into docs (as index.md)
-      run: cp README.md docs/index.md
-
-    - name: Configure Pages
-      working-directory: docs
-      run: |-
-        echo "theme: jekyll-theme-tactile" > _config.yml
-
     - name: Deploy to Github pages
-      uses: peaceiris/actions-gh-pages@v3
+      uses: peaceiris/actions-gh-pages@v4
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./docs
-        enable_jekyll: true
+        publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site
 
   after_release:
     runs-on: ubuntu-latest
@@ -205,12 +180,13 @@ jobs:
 
     - name: Inc Version and SNAP 
       run: |
+        mvnwPath=$(readlink -f ./mvnw)
         modules=("") # root
         modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
         for i in "${modules[@]}"
         do
             echo "Processing $i/pom.xml"
-            (cd "$i" && mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
+            (cd "$i" && $mvnwPath -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
         done
 
     - name: Git Commit and Push

.github/workflows/release.yml

@@ -7,13 +7,15 @@ on:
     paths-ignore: 
       - '**.md'
       - '.config/**'
+      - '.github/**'
       - '.idea/**'
       - 'assets/**'
   pull_request:
     types: [opened, synchronize, reopened]
     paths-ignore: 
       - '**.md'
       - '.config/**'
+      - '.github/**'
       - '.idea/**'
       - 'assets/**'
 
@@ -25,8 +27,7 @@ jobs:
   sonar:
     name: SonarCloud Scan
     runs-on: ubuntu-latest
-    # Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
-    if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }}
+    if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -54,7 +55,7 @@ jobs:
 
       - name: Build with Maven
         run: |
-          mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
+          ./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
             -DskipTests \
             -Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} \
             -Dsonar.organization=${{ env.SONARCLOUD_ORG }} \

.github/workflows/sonar.yml

@@ -24,7 +24,7 @@ jobs:
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
 
     - name: Publish to OSSRH
-      run: mvn -B deploy -Possrh
+      run: ../mvnw -B deploy -Possrh
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
       env:
         MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}

.github/workflows/test-deploy.yml

@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip

.idea/checkstyle-idea.xml

@@ -1,3 +1,8 @@
+## 1.2.0
+* Add TimeScale and TimeTicks to allow building linear time charts #90
+* Add options for the [Zoom plugin](https://www.chartjs.org/chartjs-plugin-zoom/latest/) #117
+* Updated dependencies
+
 ## 1.1.3
 * Add ``toJsonNative`` method which doesn't run the ``isDrawable`` check #91
 

.mvn/wrapper/maven-wrapper.properties

@@ -20,7 +20,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
 You should have the following things installed:
 * Git
 * Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
-* Maven
+* Maven (Note that the [Maven Wrapper](https://maven.apache.org/wrapper/) is shipped with the repo)
 
 ### Recommended setup
 * Install ``IntelliJ`` (Community Edition is sufficient)

CHANGELOG.md

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 XDEV Software 
+   Copyright 2024 XDEV Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

CONTRIBUTING.md

@@ -23,4 +23,4 @@ If you need support as soon as possible and you can't wait for any pull request,
 See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
 
 ## Dependencies and Licenses
-View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/chartjs-java-model/dependencies/)
+View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/chartjs-java-model/dependencies)

LICENSE

@@ -6,11 +6,9 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model-demo</artifactId>
-	<version>1.1.4-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<inceptionYear>2022</inceptionYear>
-
 	<organization>
 		<name>XDEV Software</name>
 		<url>https://xdev.software</url>
@@ -41,7 +39,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.12.1</version>
+				<version>3.13.0</version>
 				<configuration>
 					<release>${maven.compiler.release}</release>
 					<compilerArgs>
@@ -52,7 +50,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.6.0</version>
+				<version>3.7.1</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -92,11 +90,12 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.13.0</version>
+								<version>10.16.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
 							<configLocation>../.config/checkstyle/checkstyle.xml</configLocation>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
 						</configuration>
 						<executions>
 							<execution>