Release

.config/pmd/ruleset.xml

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="Default"
+		 xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+	<description>
+		This ruleset checks the code for discouraged programming constructs.
+	</description>
+
+	<!-- Only rules that don't overlap with CheckStyle! -->
+
+	<rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP"/>
+	<rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
+	<rule ref="category/java/bestpractices.xml/UseCollectionIsEmpty"/>
+	<rule ref="category/java/bestpractices.xml/UseStandardCharsets"/>
+
+	<!-- Native code is platform dependent; Loading external native libs might pose a security threat -->
+	<rule ref="category/java/codestyle.xml/AvoidUsingNativeCode"/>
+	<rule ref="category/java/codestyle.xml/IdenticalCatchBranches"/>
+	<rule ref="category/java/codestyle.xml/NoPackage"/>
+	<rule ref="category/java/codestyle.xml/PrematureDeclaration"/>
+
+	<rule ref="category/java/design.xml">
+		<!-- Sometimes abstract classes have just fields -->
+		<exclude name="AbstractClassWithoutAnyMethod"/>
+
+		<!-- Using RuntimeExceptions is ok -->
+		<exclude name="AvoidCatchingGenericException"/>
+		<exclude name="AvoidThrowingRawExceptionTypes"/>
+
+		<!-- Limit too low -->
+		<exclude name="AvoidDeeplyNestedIfStmts"/>
+
+		<!-- Limit too low -->
+		<exclude name="CouplingBetweenObjects"/>
+
+		<!-- Limit too low -->
+		<exclude name="CyclomaticComplexity"/>
+
+		<!-- Makes entity classes impossible -->
+		<exclude name="DataClass"/>
+
+		<!-- Used commonly particular in bigger methods with upstream throws -->
+		<exclude name="ExceptionAsFlowControl"/>
+
+		<!-- Limit too low -->
+		<exclude name="ExcessiveImports"/>
+
+		<!-- Handled by TooManyFields/TooManyMethods -->
+		<exclude name="ExcessivePublicCount"/>
+
+		<!-- Prohibits accessing members using multiple depths -->
+		<exclude name="LawOfDemeter"/>
+
+		<!-- No effect -->
+		<exclude name="LoosePackageCoupling"/>
+
+		<!-- Prohibits singleton pattern -->
+		<exclude name="MutableStaticState"/>
+
+		<!-- Checks LoC, already handled by Checkstyle -->
+		<exclude name="NcssCount"/>
+
+		<!-- Some override methods or Junit require this -->
+		<exclude name="SignatureDeclareThrowsException"/>
+
+		<!-- Reports FP for equals methods -->
+		<exclude name="SimplifyBooleanReturns"/>
+
+		<!-- Limit too low -->
+		<exclude name="TooManyFields"/>
+
+		<!-- Limit too low -->
+		<exclude name="TooManyMethods"/>
+
+		<!-- Limit too low -->
+		<exclude name="UseObjectForClearerAPI"/>
+
+		<!-- Handled by checkstyle -->
+		<exclude name="UseUtilityClass"/>
+	</rule>
+
+	<rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts">
+		<properties>
+			<property name="problemDepth" value="4"/>
+		</properties>
+	</rule>
+	<rule ref="category/java/design.xml/CouplingBetweenObjects">
+		<properties>
+			<property name="threshold" value="100"/>
+		</properties>
+	</rule>
+	<rule ref="category/java/design.xml/CyclomaticComplexity">
+		<properties>
+			<property name="classReportLevel" value="150"/>
+			<property name="methodReportLevel" value="25"/>
+			<property name="cycloOptions" value=""/>
+		</properties>
+	</rule>
+	<rule ref="category/java/design.xml/ExcessiveImports">
+		<properties>
+			<property name="minimum" value="200"/>
+		</properties>
+	</rule>
+	<rule ref="category/java/design.xml/TooManyFields">
+		<properties>
+			<property name="maxfields" value="50"/>
+		</properties>
+	</rule>
+	<rule ref="category/java/design.xml/TooManyMethods">
+		<properties>
+			<property name="maxmethods" value="100"/>
+		</properties>
+	</rule>
+
+	<rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
+	<rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
+	<rule ref="category/java/errorprone.xml/ComparisonWithNaN"/>
+	<rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
+	<rule ref="category/java/errorprone.xml/DontImportSun"/>
+	<rule ref="category/java/errorprone.xml/MisplacedNullCheck"/>
+	<rule ref="category/java/errorprone.xml/UnnecessaryCaseChange"/>
+
+
+	<rule ref="category/java/multithreading.xml">
+		<!-- Just bloats code -->
+		<exclude name="AvoidSynchronizedAtMethodLevel"/>
+
+		<!-- NOPE -->
+		<exclude name="DoNotUseThreads"/>
+
+		<!-- Doesn't detect nested thread safe singleton pattern -->
+		<exclude name="NonThreadSafeSingleton"/>
+
+		<!-- Should relevant for fields that use multithreading which is rare -->
+		<exclude name="UseConcurrentHashMap"/>
+	</rule>
+
+	<rule ref="category/java/performance.xml">
+		<!-- This was fixed in Java 10 -->
+		<exclude name="AvoidFileStream"/>
+
+		<!-- Used everywhere and has neglectable performance impact -->
+		<exclude name="AvoidInstantiatingObjectsInLoops"/>
+
+		<!-- Handled by checkstyle -->
+		<exclude name="RedundantFieldInitializer"/>
+
+		<!-- Nowadays optimized by compiler; No code bloating needed -->
+		<exclude name="UseStringBufferForStringAppends"/>
+	</rule>
+
+	<rule ref="category/java/security.xml"/>
+</ruleset>

.github/workflows/check-build.yml

@@ -79,7 +79,7 @@ jobs:
         path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/screenshots
         if-no-files-found: ignore
 
-  code-style:
+  checkstyle:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
 
@@ -100,3 +100,40 @@ jobs:
 
     - name: Run Checkstyle
       run: ./mvnw -B checkstyle:check -P checkstyle -T2C
+
+  pmd:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
+
+    strategy:
+      matrix:
+        java: [17]
+        distribution: [temurin]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: ${{ matrix.distribution }}
+        java-version: ${{ matrix.java }}
+        cache: 'maven'
+
+    - name: Run PMD
+      run: ./mvnw -B test pmd:aggregate-pmd-no-fork pmd:check -P pmd -DskipTests -T2C
+
+    - name: Run CPD (Copy Paste Detector)
+      run: ./mvnw -B pmd:aggregate-cpd pmd:cpd-check -P pmd -DskipTests -T2C
+
+    - name: Upload report
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: pmd-report
+        if-no-files-found: ignore
+        path: |
+          target/site/*.html
+          target/site/css/**
+          target/site/images/logos/maven-feather.png
+          target/site/images/external.png

.github/workflows/release.yml

@@ -130,7 +130,7 @@ jobs:
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
 
     - name: Publish to Apache Maven Central
-      run: ../mvnw -B deploy -Possrh
+      run: ../mvnw -B deploy -Possrh -DskipTests
       env:
         MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
@@ -157,7 +157,7 @@ jobs:
         cache: 'maven'
 
     - name: Build site
-      run: ../mvnw -B site
+      run: ../mvnw -B compile site -DskipTests -T2C
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Deploy to Github pages
@@ -186,7 +186,7 @@ jobs:
         for i in "${modules[@]}"
         do
             echo "Processing $i/pom.xml"
-            (cd "$i" && $mvnwPath -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 -DupdateMatchingVersions=false)
         done
 
     - name: Git Commit and Push

.github/workflows/test-deploy.yml

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

.gitignore

@@ -39,11 +39,6 @@ buildNumber.properties
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
-
-# bin / compiled stuff
-target/
-
-
 # JRebel
 **/resources/rebel.xml
 **/resources/rebel-remote.xml

.mvn/wrapper/maven-wrapper.properties

@@ -14,4 +14,4 @@
 # 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.7/apache-maven-3.9.7-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.1.0
+* Charts no longer check if they are drawable #198
+  * ChartJS behavior: If a chart can't be drawn it will render a empty canvas
+  * Deprecated methods: ``Chart#toJsonNative`` and ``Chart#isDrawable``
+* Make ``IndexAxis`` available in all options
+
 ## 2.0.1
 * Restored ``DisplayFormats`` #186
 

CONTRIBUTING.md

@@ -44,3 +44,31 @@ If the ``develop`` is ready for release, create a pull request to the ``master``
 
 When the release is finished do the following:
 * Merge the auto-generated PR (with the incremented version number) back into the ``develop``
+
+### Release failures
+
+There are 2 modes of release failure:
+1. The remote server was e.g. down and non of the artifacts got published
+2. There was a build failure during release and only parts of the artifacts got released
+
+In case 1 we can re-release the existing version,<br/>in case 2 we have to release a new version when we can't get the artifacts deleted (as is the case with Maven Central)
+
+#### How-to: Re-Releasing an existing version
+
+1. Delete the release on GitHub
+2. Delete the release Git tag from the repo (locally and remote!)
+3. Delete the ``master``-Branch and re-create it from the ``develop`` branch (or reset it to the state before the release-workflow commits have been done)
+    * This requires __temporarily__ removing the branch protection
+    * Once this was done a new release is triggered immediately!
+
+#### How-to: Releasing a new version
+
+1. Merge the ``master`` branch back into ``develop`` (or another temporary branch)
+2. Make sure all master branch versions are prepared for a new release<br/>e.g. if the broken release was ``1.0.0`` the version should now be at ``1.0.1-SNAPSHOT`` - the ``SNAPSHOT`` is important for the workflow!
+3. Mark the broken release as broken e.g. inside the Changelog, GitHub Release page, etc.<br/>
+You can use something like this:
+    ```
+    > [!WARNING]
+    > This release is broken as my cat accidentally clicked the abort button during the process
+    ```
+4. Merge the changes back into the ``master`` branch to trigger a new release

chartjs-java-model-demo/pom.xml

@@ -4,7 +4,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>software.xdev</groupId>
+	<parent>
+		<groupId>software.xdev</groupId>
+		<artifactId>chartjs-java-model-root</artifactId>
+		<version>2.0.2-SNAPSHOT</version>
+	</parent>
+
 	<artifactId>chartjs-java-model-demo</artifactId>
 	<version>2.0.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
@@ -77,36 +82,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>checkstyle</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-checkstyle-plugin</artifactId>
-						<version>3.4.0</version>
-						<dependencies>
-							<dependency>
-								<groupId>com.puppycrawl.tools</groupId>
-								<artifactId>checkstyle</artifactId>
-								<version>10.17.0</version>
-							</dependency>
-						</dependencies>
-						<configuration>
-							<configLocation>../.config/checkstyle/checkstyle.xml</configLocation>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-						</configuration>
-						<executions>
-							<execution>
-								<goals>
-									<goal>check</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>