diff --git a/.circleci/config.yml b/.circleci/config.yml index caf0a50..65723f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,4 @@ -version: 2 +inversion: 2 defaults: &defaults working_directory: ~/repo environment: @@ -6,7 +6,7 @@ defaults: &defaults TERM: dumb CI_NAME: "CircleCI" -defaults_bld: &defaults_bld +defaults_gradle: &defaults_bld steps: - checkout - run: diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 45b3b77..79093d1 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -1,6 +1,6 @@ name: bld-ci -on: [push, pull_request, workflow_dispatch] +on: [ push, pull_request, workflow_dispatch ] jobs: build-bld-project: @@ -11,18 +11,18 @@ jobs: strategy: matrix: - java-version: [17, 21, 22] + java-version: [ 17, 20 ] steps: - name: Checkout source repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v3 with: - distribution: "zulu" + distribution: 'zulu' java-version: ${{ matrix.java-version }} - name: Grant execute permission for bld @@ -50,3 +50,4 @@ jobs: if: success() && matrix.java-version == env.COVERAGE_SDK env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index a2969be..bff4f62 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/launch.json b/.vscode/launch.json index 32bf99b..2dd24a5 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "type": "java", - "name": "Run Tests", - "request": "launch", - "mainClass": "net.thauvin.erik.httpstatus.HttpStatusTest" - } - ] + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Run Tests", + "request": "launch", + "mainClass": "net.thauvin.erik.httpstatus.HttpStatusTest" + } + ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 51d8e7f..5ae2eaa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,12 +3,13 @@ "src/main/java", "src/main/resources", "src/test/java", - "src/bld/java", - "src/bld/resources" + "src/bld/java" ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-1.9.1.jar", - "lib/**/*.jar", + "${HOME}bld-1.7.0.jar", + "lib/compile/*.jar", + "lib/runtime/*.jar", + "lib/test/*.jar" ] } diff --git a/LICENSE.txt b/LICENSE.txt index 8f45c3a..3f79a9e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2015-2024, Erik C. Thauvin (erik@thauvin.net) +Copyright (c) 2015-2023, Erik C. Thauvin (erik@thauvin.net) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/config/pmd.xml b/config/pmd.xml index 3d3203c..1039e40 100644 --- a/config/pmd.xml +++ b/config/pmd.xml @@ -24,8 +24,8 @@ - + @@ -35,9 +35,8 @@ - - + @@ -53,6 +52,8 @@ + + @@ -106,4 +107,4 @@ - + \ No newline at end of file diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index bee10dc..48bd8ab 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 0d4f311..a456ca5 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.9 -bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.5 +bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.2 bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES,MAVEN_LOCAL,RIFE2_SNAPSHOTS bld.downloadLocation= -bld.version=1.9.1 +bld.version=1.8.0 diff --git a/pom.xml b/pom.xml index a847a0e..7e35552 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ The BSD 3-Clause License - https://opensource.org/licenses/BSD-3-Clause + http://opensource.org/licenses/BSD-3-Clause @@ -30,7 +30,7 @@ jakarta.el jakarta.el-api - 6.0.0 + 5.0.1 compile diff --git a/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java b/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java index 24393e2..88657d8 100644 --- a/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java +++ b/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java @@ -50,11 +50,6 @@ import static rife.bld.dependencies.Scope.test; import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING; public class HttpStatusBuild extends Project { - final PmdOperation pmdOp = new PmdOperation() - .fromProject(this) - .failOnViolation(true) - .ruleSets("config/pmd.xml"); - public HttpStatusBuild() { pkg = "net.thauvin.erik.httpstatus"; name = "HttpStatus"; @@ -74,11 +69,11 @@ public class HttpStatusBuild extends Project { scope(compile) .include(dependency("jakarta.servlet", "jakarta.servlet-api", version(6, 0, 0))) .include(dependency("jakarta.servlet.jsp", "jakarta.servlet.jsp-api", version(3, 1, 1))) - .include(dependency("jakarta.el", "jakarta.el-api", version(6, 0, 0))); + .include(dependency("jakarta.el", "jakarta.el-api", version(5, 0, 1))); scope(test) - .include(dependency("org.assertj", "assertj-core", version(3, 25, 3))) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2))); + .include(dependency("org.assertj", "assertj-core", version(3, 25, 2))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1))); jarOperation().manifestAttribute(Attributes.Name.MAIN_CLASS, pkg + '.' + "Reasons"); @@ -109,7 +104,7 @@ public class HttpStatusBuild extends Project { .license( new PublishLicense() .name("The BSD 3-Clause License") - .url("https://opensource.org/licenses/BSD-3-Clause") + .url("http://opensource.org/licenses/BSD-3-Clause") ) .scm(new PublishScm() .connection("scm:git:" + url + ".git") @@ -132,12 +127,11 @@ public class HttpStatusBuild extends Project { @BuildCommand(summary = "Runs PMD analysis") public void pmd() { - pmdOp.execute(); - } - - @BuildCommand(value = "pmd-cli", summary = "Runs PMD analysis (CLI)") - public void pmdCli() { - pmdOp.includeLineNumber(false).execute(); + new PmdOperation() + .fromProject(this) + .failOnViolation(true) + .ruleSets("config/pmd.xml") + .execute(); } @Override @@ -153,7 +147,7 @@ public class HttpStatusBuild extends Project { } private void rootPom() throws FileUtilsErrorException { - PomBuilder.generateInto(publishOperation().info(), dependencies(), + PomBuilder.generateInto(publishOperation().info(), publishOperation().dependencies(), Path.of(workDirectory.getPath(), "pom.xml").toFile()); } }