Merge pull request #318 from xdev-software/develop

Release

Author: AB-xdev

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,7 @@
 name: 🐞 Bug
 description: Create a bug report for something that is broken
 labels: [bug]
+type: bug
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,6 +1,7 @@
 name: ✨ Feature/Enhancement
 description: Suggest a new feature or enhancement
 labels: [enhancement]
+type: feature
 body:
   - type: markdown
     attributes:

.github/workflows/release.yml

@@ -169,6 +169,7 @@ jobs:
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site
+        force_orphan: true
 
   after-release:
     runs-on: ubuntu-latest

.idea/checkstyle-idea.xml

@@ -1,3 +1,6 @@
+## 2.7.0
+* ``Title``: Make it possible to set custom padding and multi-line text #316
+
 ## 2.6.0
 * Synced ``Doughnut/PieOptions`` from ChartJS source code #293
 * Synced ``GridLineConfiguration`` from ChartJS source code / improved Types for more options #289

.idea/saveactions_settings.xml

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

CHANGELOG.md

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model</artifactId>
-	<version>2.6.1-SNAPSHOT</version>
+	<version>2.7.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>chartjs-java-model</name>
@@ -49,7 +49,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<slf4j-version>2.0.16</slf4j-version>
-		<log4j-version>2.24.2</log4j-version>
+		<log4j-version>2.24.3</log4j-version>
 		<testcontainers-version>1.20.4</testcontainers-version>
 
 		<!-- by default run no tests as Docker is required -->
@@ -129,7 +129,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.11.3</version>
+			<version>5.11.4</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -170,7 +170,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-chrome-driver</artifactId>
-			<version>4.27.0</version>
+			<version>4.28.1</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- Tracing is not needed -->
@@ -241,7 +241,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.11.1</version>
+				<version>3.11.2</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -360,7 +360,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.20.2</version>
+								<version>10.21.2</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -397,12 +397,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.8.0</version>
+								<version>7.10.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.8.0</version>
+								<version>7.10.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

chartjs-java-model-demo/pom.xml

@@ -26,59 +26,36 @@ public class Title
 	protected Boolean fullSize;
 	protected String position;
 	protected Font font;
-	protected Integer padding;
-	protected String text;
+	protected Object padding;
+	protected Object text;
 
-	/**
-	 * @see #setAlign(String)
-	 */
 	public String getAlign()
 	{
 		return this.align;
 	}
 
-	/**
-	 * Alignment of the title
-	 *
-	 * <p>Default: center</p>
-	 */
 	public Title setAlign(final String align)
 	{
 		this.align = align;
 		return this;
 	}
 
-	/**
-	 * @see #setColor(Object)
-	 */
 	public Object getColor()
 	{
 		return this.color;
 	}
 
-	/**
-	 * Color of text
-	 */
 	public Title setColor(final Object color)
 	{
 		this.color = color;
 		return this;
 	}
 
-	/**
-	 * @see #setFullSize(Boolean)
-	 */
 	public Boolean getFullSize()
 	{
 		return this.fullSize;
 	}
 
-	/**
-	 * Marks that this box should take the full width/height of the canvas. If false, the box is sized and placed
-	 * above/beside the chart area.
-	 *
-	 * <p>Default: true</p>
-	 */
 	public Title setFullSize(final Boolean fullSize)
 	{
 		this.fullSize = fullSize;
@@ -96,93 +73,45 @@ public Title setFont(final Font font)
 		return this;
 	}
 
-	/**
-	 * @see #setDisplay(Boolean)
-	 */
 	public Boolean getDisplay()
 	{
 		return this.display;
 	}
 
-	/**
-	 * <p>
-	 * Display the title block
-	 * </p>
-	 *
-	 * <p>
-	 * Default {@code false}
-	 * </p>
-	 */
 	public Title setDisplay(final Boolean display)
 	{
 		this.display = display;
 		return this;
 	}
 
-	/**
-	 * @see #setPosition(String)
-	 */
 	public String getPosition()
 	{
 		return this.position;
 	}
 
-	/**
-	 * <p>
-	 * Position of the title. Only 'top' or 'bottom' are currently allowed
-	 * </p>
-	 *
-	 * <p>
-	 * Default {@code 'top'}
-	 * </p>
-	 */
 	public Title setPosition(final String position)
 	{
 		this.position = position;
 		return this;
 	}
 
-	/**
-	 * @see #setPadding(Integer)
-	 */
-	public Integer getPadding()
+	public Object getPadding()
 	{
 		return this.padding;
 	}
 
-	/**
-	 * <p>
-	 * Number of pixels to add above and below the title text
-	 * </p>
-	 *
-	 * <p>
-	 * Default {@code 10}
-	 * </p>
-	 */
-	public Title setPadding(final Integer padding)
+	public Title setPadding(final Object padding)
 	{
 		this.padding = padding;
 		return this;
 	}
 
-	/**
-	 * @see #setText(String)
-	 */
-	public String getText()
+	public Object getText()
 	{
 		return this.text;
 	}
 
-	/**
-	 * <p>
-	 * Title text
-	 * </p>
-	 *
-	 * <p>
-	 * Default {@code ""}
-	 * </p>
-	 */
-	public Title setText(final String text)
+	public Title setText(final Object text)
 	{
 		this.text = text;
 		return this;

chartjs-java-model/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model-root</artifactId>
-	<version>2.6.1-SNAPSHOT</version>
+	<version>2.7.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -45,7 +45,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.20.2</version>
+								<version>10.21.2</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -82,12 +82,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.8.0</version>
+								<version>7.10.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.8.0</version>
+								<version>7.10.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>