diff --git a/.config/pmd/ruleset.xml b/.config/pmd/ruleset.xml index 5f88156..7a03f17 100644 --- a/.config/pmd/ruleset.xml +++ b/.config/pmd/ruleset.xml @@ -59,6 +59,9 @@ + + + @@ -148,5 +151,12 @@ + + + + + + + diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 96af798..8f98f1a 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -11,6 +11,7 @@ permissions: jobs: link-checker: runs-on: ubuntu-latest + timeout-minutes: 15 steps: - uses: actions/checkout@v4 @@ -18,7 +19,9 @@ jobs: - name: Link Checker id: lychee - uses: lycheeverse/lychee-action@v1 + uses: lycheeverse/lychee-action@v2 + with: + fail: false # Don't fail on broken links, create an issue instead - name: Find already existing issue id: find-issue diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index 2ac6530..0818116 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -26,6 +26,7 @@ env: jobs: build: runs-on: ubuntu-latest + timeout-minutes: 30 strategy: matrix: @@ -73,6 +74,7 @@ jobs: checkstyle: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }} + timeout-minutes: 15 strategy: matrix: @@ -95,6 +97,7 @@ jobs: pmd: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }} + timeout-minutes: 15 strategy: matrix: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0bf3805..236c0f5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,7 @@ permissions: jobs: check-code: runs-on: ubuntu-latest + timeout-minutes: 30 steps: - uses: actions/checkout@v4 @@ -48,6 +49,7 @@ jobs: prepare-release: runs-on: ubuntu-latest needs: [check-code] + timeout-minutes: 10 outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} steps: @@ -109,6 +111,7 @@ jobs: publish-maven: runs-on: ubuntu-latest needs: [prepare-release] + timeout-minutes: 60 steps: - uses: actions/checkout@v4 @@ -140,6 +143,7 @@ jobs: publish-pages: runs-on: ubuntu-latest needs: [prepare-release] + timeout-minutes: 15 steps: - uses: actions/checkout@v4 @@ -169,6 +173,7 @@ jobs: after-release: runs-on: ubuntu-latest needs: [publish-maven] + timeout-minutes: 10 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 7824917..df6dbb7 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -11,7 +11,7 @@ on: - '.idea/**' - 'assets/**' pull_request: - types: [opened, synchronize, reopened] + branches: [ develop ] paths-ignore: - '**.md' - '.config/**' @@ -27,6 +27,7 @@ jobs: token-check: runs-on: ubuntu-latest if: ${{ !(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')) }} + timeout-minutes: 5 outputs: hasToken: ${{ steps.check-token.outputs.has }} steps: @@ -40,6 +41,7 @@ jobs: runs-on: ubuntu-latest needs: token-check if: ${{ needs.token-check.outputs.hasToken }} + timeout-minutes: 30 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index ff880f0..c9d7ec7 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -14,6 +14,7 @@ permissions: jobs: labels: runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 9c07de2..03f5339 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -9,6 +9,7 @@ env: jobs: publish-maven: runs-on: ubuntu-latest + timeout-minutes: 60 steps: - uses: actions/checkout@v4 @@ -24,7 +25,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 }} diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index aa33de4..6f9497e 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -31,6 +31,7 @@ permissions: jobs: update: runs-on: ubuntu-latest + timeout-minutes: 60 outputs: update_branch_merged_commit: ${{ steps.manage-branches.outputs.update_branch_merged_commit }} create_update_branch_merged_pr: ${{ steps.manage-branches.outputs.create_update_branch_merged_pr }} @@ -180,6 +181,7 @@ jobs: needs: [update] if: needs.update.outputs.create_update_branch_merged_pr == 1 runs-on: ubuntu-latest + timeout-minutes: 60 steps: - uses: actions/checkout@v4 with: diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml index eb3fcd8..5f35e01 100644 --- a/.idea/checkstyle-idea.xml +++ b/.idea/checkstyle-idea.xml @@ -1,7 +1,7 @@ - 10.15.0 + 10.20.1 JavaOnlyWithTests true true diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index e56bc18..4d624fa 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.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.8/apache-maven-3.9.8-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index ecb13f1..167858d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 2.0.2 +* Updated dependencies (JasperReports 7.0.1) + # 2.0.1 * Fix textfields cutting away text diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0f81bee..c7bb1ab 100644 --- a/CONTRIBUTING.md +++ b/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,
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
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.
+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 diff --git a/dynamicreports-core-for-grid-exporter/pom.xml b/dynamicreports-core-for-grid-exporter/pom.xml index 205f556..fe2e48a 100644 --- a/dynamicreports-core-for-grid-exporter/pom.xml +++ b/dynamicreports-core-for-grid-exporter/pom.xml @@ -89,7 +89,7 @@ net.sf.jasperreports jasperreports - 7.0.0 + 7.0.1 org.apache.xmlgraphics @@ -104,26 +104,26 @@ net.sf.jasperreports jasperreports-pdf - 7.0.0 + 7.0.1 net.sf.jasperreports jasperreports-jdt - 7.0.0 + 7.0.1 org.apache.commons commons-lang3 - 3.14.0 + 3.17.0 org.junit.jupiter junit-jupiter - 5.10.3 + 5.11.3 test @@ -134,12 +134,12 @@ org.apache.maven.plugins maven-site-plugin - 4.0.0-M15 + 4.0.0-M16 org.apache.maven.plugins maven-project-info-reports-plugin - 3.6.2 + 3.8.0 @@ -147,7 +147,7 @@ com.mycila license-maven-plugin - 4.5 + 4.6 ${project.organization.url} @@ -187,7 +187,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.11.1 attach-javadocs @@ -219,7 +219,7 @@ maven-surefire-plugin - 3.3.1 + 3.5.2 @@ -248,7 +248,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.4 + 3.2.7 sign-artifacts @@ -291,12 +291,12 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.4.0 + 3.6.0 com.puppycrawl.tools checkstyle - 10.17.0 + 10.20.1 @@ -321,7 +321,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.24.0 + 3.26.0 true true @@ -338,12 +338,12 @@ net.sourceforge.pmd pmd-core - 7.3.0 + 7.7.0 net.sourceforge.pmd pmd-java - 7.3.0 + 7.7.0 @@ -355,7 +355,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.4.0 + 3.6.0 diff --git a/pom.xml b/pom.xml index 80b6696..7e26b75 100644 --- a/pom.xml +++ b/pom.xml @@ -40,12 +40,12 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.4.0 + 3.6.0 com.puppycrawl.tools checkstyle - 10.17.0 + 10.20.1 @@ -70,7 +70,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.24.0 + 3.26.0 true true @@ -87,12 +87,12 @@ net.sourceforge.pmd pmd-core - 7.3.0 + 7.7.0 net.sourceforge.pmd pmd-java - 7.3.0 + 7.7.0 @@ -104,7 +104,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.4.0 + 3.6.0 diff --git a/renovate.json5 b/renovate.json5 index b4aa281..db09328 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -19,6 +19,16 @@ "maven" ], "groupName": "net.sourceforge.pmd" + }, + { + "description": "Group net.sf.jasperreports", + "matchPackagePatterns": [ + "^net.sf.jasperreports" + ], + "datasources": [ + "maven" + ], + "groupName": "net.sf.jasperreports" } ] }