Merge pull request #27 from xdev-software/develop

Release 1.1.0

Author: AB-xdev

.github/workflows/checkBuild.yml

@@ -21,11 +21,11 @@ jobs:
 
     strategy:
       matrix:
-        java: [17]
+        java: [17, 21]
         distribution: [temurin]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up JDK
       uses: actions/setup-java@v3

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
   check_code: # Validates the code
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up JDK
       uses: actions/setup-java@v3
@@ -52,7 +52,7 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Configure Git
       run: |
@@ -111,7 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Init Git and pull
       run: |
@@ -143,7 +143,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Init Git and pull
       run: |
@@ -197,7 +197,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [publish_central]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Init Git and pull
       run: |
@@ -223,9 +223,12 @@ jobs:
         git push origin
     
     - name: pull-request
-      uses: repo-sync/pull-request@v2
-      with:
-        destination_branch: "develop"
-        pr_title: "Sync back"
-        pr_body: "An automated PR to sync changes back"
-
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        gh_pr_up() { 
+          gh pr create "$@" || gh pr edit "$@" 
+        }
+        gh_pr_up -B "develop" \
+          --title "Sync back" \
+          --body "An automated PR to sync changes back"

.github/workflows/sonar.yml

@@ -26,7 +26,7 @@ jobs:
     # Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 

.github/workflows/test-deploy.yml

@@ -10,7 +10,7 @@ jobs:
   publish_central: # Publish the code to central
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up JDK OSSRH
       uses: actions/setup-java@v3

.github/workflows/update-from-template.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Required because otherwise there are always changes detected when executing diff/rev-list
           fetch-depth: 0
@@ -81,12 +81,13 @@ jobs:
           echo "abort=0" >> $GITHUB_OUTPUT
           
       - name: pull-request
-        uses: repo-sync/pull-request@v2
         if: steps.main.outputs.abort == 0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          source_branch: ${{ env.UPDATE_BRANCH }}
-          destination_branch: ${{ steps.main.outputs.current_branch }}
-          pr_title: "Update from template"
-          pr_body: "An automated PR to sync changes from the template into this repo"
-          
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh_pr_up() { 
+            gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@")
+          }
+          gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
+            --title "Update from template" \
+            --body "An automated PR to sync changes from the template into this repo"

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.1.0
+* Updated to Jasperreports ``6.20.6``
+  * API changes: Html - ``borderCollapse`` is now an enum
+
 # 1.0.3
 * Re-Added ``ecj`` dependency #12
 

CONTRIBUTING.md

@@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
 ### Software Requirements
 You should have the following things installed:
 * Git
-* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
+* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
 * Maven
 
 ### Recommended setup

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

@@ -6,7 +6,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>dynamicreports-core-for-grid-exporter-demo</artifactId>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<inceptionYear>2022</inceptionYear>

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

@@ -6,7 +6,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>dynamicreports-core-for-grid-exporter</artifactId>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>dynamicreports-core-for-grid-exporter</name>
@@ -89,7 +89,7 @@
 		<dependency>
 			<groupId>net.sf.jasperreports</groupId>
 			<artifactId>jasperreports</artifactId>
-			<version>6.20.5</version>
+			<version>6.20.6</version>
 			<exclusions>
 				<!-- Charts are not needed -->
 				<exclusion>
@@ -103,13 +103,13 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.12.0</version>
+			<version>3.13.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.9.3</version>
+			<version>5.10.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -119,7 +119,7 @@
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>4.2</version>
+				<version>4.3</version>
 				<configuration>
 					<properties>
 						<email>${project.organization.url}</email>
@@ -159,7 +159,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.6.2</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -191,7 +191,7 @@
 
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.1.2</version>
+				<version>3.2.2</version>
 			</plugin>
 		</plugins>
 	</build>