Skip to content

Commit 253a90d

Browse files
authored
Merge pull request #94 from xdev-software/develop
Release
2 parents 4055827 + b51d394 commit 253a90d

File tree

7 files changed

+29
-14
lines changed

7 files changed

+29
-14
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
131131

132132
- name: Publish to Apache Maven Central
133-
run: ../mvnw -B deploy -Possrh
133+
run: ../mvnw -B deploy -Possrh -DskipTests
134134
env:
135135
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
136136
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
@@ -157,7 +157,7 @@ jobs:
157157
cache: 'maven'
158158

159159
- name: Build site
160-
run: ../mvnw -B site
160+
run: ../mvnw -B compile site -DskipTests -T2C
161161
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
162162

163163
- name: Deploy to Github pages
@@ -186,7 +186,7 @@ jobs:
186186
for i in "${modules[@]}"
187187
do
188188
echo "Processing $i/pom.xml"
189-
(cd "$i" && $mvnwPath -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
189+
(cd "$i" && $mvnwPath -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true -DupdateMatchingVersions=false)
190190
done
191191
192192
- name: Git Commit and Push

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 2.0.1
2+
* Fix textfields cutting away text
3+
14
# 2.0.0
25
* Updated to JasperReports 7
36
* Removed support for Maps

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212

1313
<artifactId>dynamicreports-core-for-grid-exporter-demo</artifactId>
14-
<version>2.0.2-SNAPSHOT</version>
14+
<version>2.0.1-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<organization>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<dependency>
124124
<groupId>org.junit.jupiter</groupId>
125125
<artifactId>junit-jupiter</artifactId>
126-
<version>5.10.2</version>
126+
<version>5.10.3</version>
127127
<scope>test</scope>
128128
</dependency>
129129
</dependencies>
@@ -139,7 +139,7 @@
139139
<plugin>
140140
<groupId>org.apache.maven.plugins</groupId>
141141
<artifactId>maven-project-info-reports-plugin</artifactId>
142-
<version>3.6.1</version>
142+
<version>3.6.2</version>
143143
</plugin>
144144
</plugins>
145145
</pluginManagement>
@@ -219,7 +219,7 @@
219219

220220
<plugin>
221221
<artifactId>maven-surefire-plugin</artifactId>
222-
<version>3.3.0</version>
222+
<version>3.3.1</version>
223223
</plugin>
224224
</plugins>
225225
</build>
@@ -321,7 +321,7 @@
321321
<plugin>
322322
<groupId>org.apache.maven.plugins</groupId>
323323
<artifactId>maven-pmd-plugin</artifactId>
324-
<version>3.23.0</version>
324+
<version>3.24.0</version>
325325
<configuration>
326326
<includeTests>true</includeTests>
327327
<printFailingErrors>true</printFailingErrors>
@@ -338,12 +338,12 @@
338338
<dependency>
339339
<groupId>net.sourceforge.pmd</groupId>
340340
<artifactId>pmd-core</artifactId>
341-
<version>7.2.0</version>
341+
<version>7.3.0</version>
342342
</dependency>
343343
<dependency>
344344
<groupId>net.sourceforge.pmd</groupId>
345345
<artifactId>pmd-java</artifactId>
346-
<version>7.2.0</version>
346+
<version>7.3.0</version>
347347
</dependency>
348348
</dependencies>
349349
</plugin>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ public class Default
126126
// text field
127127
protected int textFieldWidth;
128128
protected boolean textFieldPrintRepeatedValues;
129+
protected TextAdjust textFieldTextAdjust;
129130
// image
130131
protected int imageWidth;
131132
protected int imageHeight;
@@ -326,6 +327,7 @@ protected void init()
326327

327328
this.textFieldWidth = 100;
328329
this.textFieldPrintRepeatedValues = true;
330+
this.textFieldTextAdjust = TextAdjust.STRETCH_HEIGHT;
329331

330332
this.imageWidth = 100;
331333
this.imageHeight = 100;
@@ -745,7 +747,7 @@ public boolean isTextFieldPrintRepeatedValues()
745747

746748
public TextAdjust getTextFieldTextAdjust()
747749
{
748-
return null;
750+
return this.textFieldTextAdjust;
749751
}
750752

751753
public int getImageWidth()

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<plugin>
7171
<groupId>org.apache.maven.plugins</groupId>
7272
<artifactId>maven-pmd-plugin</artifactId>
73-
<version>3.23.0</version>
73+
<version>3.24.0</version>
7474
<configuration>
7575
<includeTests>true</includeTests>
7676
<printFailingErrors>true</printFailingErrors>
@@ -87,12 +87,12 @@
8787
<dependency>
8888
<groupId>net.sourceforge.pmd</groupId>
8989
<artifactId>pmd-core</artifactId>
90-
<version>7.2.0</version>
90+
<version>7.3.0</version>
9191
</dependency>
9292
<dependency>
9393
<groupId>net.sourceforge.pmd</groupId>
9494
<artifactId>pmd-java</artifactId>
95-
<version>7.2.0</version>
95+
<version>7.3.0</version>
9696
</dependency>
9797
</dependencies>
9898
</plugin>

renovate.json5

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
"maven"
1010
],
1111
"enabled": false
12+
},
13+
{
14+
"description": "Group net.sourceforge.pmd",
15+
"matchPackagePatterns": [
16+
"^net.sourceforge.pmd"
17+
],
18+
"datasources": [
19+
"maven"
20+
],
21+
"groupName": "net.sourceforge.pmd"
1222
}
1323
]
1424
}

0 commit comments

Comments
 (0)