Merge pull request #94 from xdev-software/develop

Release

Author: AB-xdev

.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

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.0.1
+* Fix textfields cutting away text
+
 # 2.0.0
 * Updated to JasperReports 7
 * Removed support for Maps

dynamicreports-core-for-grid-exporter-demo/pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 
 	<artifactId>dynamicreports-core-for-grid-exporter-demo</artifactId>
-	<version>2.0.2-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>

dynamicreports-core-for-grid-exporter/pom.xml

@@ -123,7 +123,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.10.2</version>
+			<version>5.10.3</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -139,7 +139,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.6.1</version>
+					<version>3.6.2</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -219,7 +219,7 @@
 
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.3.1</version>
 			</plugin>
 		</plugins>
 	</build>
@@ -321,7 +321,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>
-						<version>3.23.0</version>
+						<version>3.24.0</version>
 						<configuration>
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
@@ -338,12 +338,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.2.0</version>
+								<version>7.3.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.2.0</version>
+								<version>7.3.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Default.java

@@ -126,6 +126,7 @@ public class Default
 	// text field
 	protected int textFieldWidth;
 	protected boolean textFieldPrintRepeatedValues;
+	protected TextAdjust textFieldTextAdjust;
 	// image
 	protected int imageWidth;
 	protected int imageHeight;
@@ -326,6 +327,7 @@ protected void init()
 
 		this.textFieldWidth = 100;
 		this.textFieldPrintRepeatedValues = true;
+		this.textFieldTextAdjust = TextAdjust.STRETCH_HEIGHT;
 
 		this.imageWidth = 100;
 		this.imageHeight = 100;
@@ -745,7 +747,7 @@ public boolean isTextFieldPrintRepeatedValues()
 
 	public TextAdjust getTextFieldTextAdjust()
 	{
-		return null;
+		return this.textFieldTextAdjust;
 	}
 
 	public int getImageWidth()

pom.xml

@@ -70,7 +70,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>
-						<version>3.23.0</version>
+						<version>3.24.0</version>
 						<configuration>
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
@@ -87,12 +87,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.2.0</version>
+								<version>7.3.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.2.0</version>
+								<version>7.3.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

renovate.json5

@@ -9,6 +9,16 @@
         "maven"
       ],
       "enabled": false
+    },
+    {
+      "description": "Group net.sourceforge.pmd",
+      "matchPackagePatterns": [
+        "^net.sourceforge.pmd"
+      ],
+      "datasources": [
+        "maven"
+      ],
+      "groupName": "net.sourceforge.pmd"
     }
   ]
 }