From e6104f1fed5078fcb411422876fa19afc53fd8bd Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 12 Apr 2024 00:12:40 -0700 Subject: [PATCH 1/3] Bumped workflows actions to latest versions --- .github/workflows/bld.yml | 4 ++-- .github/workflows/pages.yml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 422b9cc..3c9d30a 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -12,12 +12,12 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: "zulu" java-version: ${{ matrix.java-version }} diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 2120d4c..e191f6d 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -30,14 +30,14 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: "zulu" java-version: 17 - name: Build Javadocs @@ -50,8 +50,8 @@ jobs: uses: actions/upload-pages-artifact@v1 with: # Upload generated Javadocs repository - path: 'build/javadoc/' + path: "build/javadoc/" - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 \ No newline at end of file + uses: actions/deploy-pages@v1 From 40dd2ce116db4c499b6892ff0f3c2c04bdd75b13 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 12 Apr 2024 00:13:37 -0700 Subject: [PATCH 2/3] Log if execution was successful --- .../rife/bld/extension/DetektOperation.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/rife/bld/extension/DetektOperation.java b/src/main/java/rife/bld/extension/DetektOperation.java index 3ed4d2e..359037f 100644 --- a/src/main/java/rife/bld/extension/DetektOperation.java +++ b/src/main/java/rife/bld/extension/DetektOperation.java @@ -18,8 +18,11 @@ package rife.bld.extension; import rife.bld.BaseProject; import rife.bld.operations.AbstractProcessOperation; +import rife.bld.operations.exceptions.ExitStatusException; +import rife.tools.exceptions.FileUtilsErrorException; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -241,6 +244,22 @@ public class DetektOperation extends AbstractProcessOperation { return this; } + /** + * Performs the operation. + * + * @throws InterruptedException when the operation was interrupted + * @throws IOException when an exception occurred during the execution of the process + * @throws FileUtilsErrorException when an exception occurred during the retrieval of the operation output + * @throws ExitStatusException when the exit status was changed during the operation + */ + @Override + public void execute() throws IOException, FileUtilsErrorException, InterruptedException, ExitStatusException { + super.execute(); + if (successful_ && LOGGER.isLoggable(Level.INFO)) { + LOGGER.info("Detekt executed successfully."); + } + } + /** * Part of the {@link #execute} operation, constructs the command list * to use for building the process. From 5f33e4263c7d8bed71a77ab6051af219950cc9c2 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 17 Apr 2024 22:36:26 -0700 Subject: [PATCH 3/3] Bumped to version 0.9.4-SNAPSHOT --- config/pmd.xml | 11 +++++------ .../java/rife/bld/extension/DetektOperationBuild.java | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config/pmd.xml b/config/pmd.xml index cb0b643..3d3203c 100644 --- a/config/pmd.xml +++ b/config/pmd.xml @@ -19,15 +19,15 @@ + - + - @@ -35,8 +35,9 @@ - + + @@ -52,8 +53,6 @@ - - @@ -107,4 +106,4 @@ - \ No newline at end of file + diff --git a/src/bld/java/rife/bld/extension/DetektOperationBuild.java b/src/bld/java/rife/bld/extension/DetektOperationBuild.java index 36e7dea..207a826 100644 --- a/src/bld/java/rife/bld/extension/DetektOperationBuild.java +++ b/src/bld/java/rife/bld/extension/DetektOperationBuild.java @@ -34,7 +34,7 @@ public class DetektOperationBuild extends Project { public DetektOperationBuild() { pkg = "rife.bld.extension"; name = "DetektOperation"; - version = version(0, 9, 3); + version = version(0, 9, 4, "SNAPSHOT"); javaRelease = 17; downloadSources = true; @@ -72,7 +72,7 @@ public class DetektOperationBuild extends Project { .license( new PublishLicense() .name("The Apache License, Version 2.0") - .url("http://www.apache.org/licenses/LICENSE-2.0.txt") + .url("https://www.apache.org/licenses/LICENSE-2.0.txt") ) .scm( new PublishScm()