diff --git a/.github/workflows/detekt-verify.yml b/.github/workflows/detekt-verify.yml index 579a84a2..b04f607d 100644 --- a/.github/workflows/detekt-verify.yml +++ b/.github/workflows/detekt-verify.yml @@ -64,7 +64,7 @@ jobs: - name: Get detekt plugin for kafka streams uses: extenda/actions/maven@v0 with: - args: dependency:get -Dartifact=com.retailsvc:pnp-processors-core-common:0.125.0:jar + args: dependency:get -Dartifact=com.retailsvc:pnp-processors-core-common:0.173.1:jar service-account-key: ${{ secrets.SECRET_AUTH }} - name: Build classpath with Maven @@ -92,4 +92,4 @@ jobs: --input src/main/kotlin \ --config detekt.yml \ --classpath "target/classes:$(cat cp.txt)" \ - --plugins ~/.m2/repository/com/retailsvc/pnp-processors-core-common/0.125.0/pnp-processors-core-common-0.125.0.jar \ \ No newline at end of file + --plugins ~/.m2/repository/com/retailsvc/pnp-processors-core-common/0.173.1/pnp-processors-core-common-0.173.1.jar \ \ No newline at end of file diff --git a/.github/workflows/kafka-streams-lint.yml b/.github/workflows/kafka-streams-lint.yml index 1791ec79..bbeb247c 100644 --- a/.github/workflows/kafka-streams-lint.yml +++ b/.github/workflows/kafka-streams-lint.yml @@ -10,7 +10,7 @@ on: description: 'The Java version.' type: number required: false - default: 25 # + default: 21 jdk-distribution: description: 'The JDK distribution.' type: string @@ -56,14 +56,22 @@ jobs: java-version: ${{ inputs.java-version }} cache: maven - - name: Prepare Classes and Dependencies + - name: Get detekt plugin for kafka streams uses: extenda/actions/maven@v0 with: - args: > - compile -Denforcer.skip=true -q - dependency:get -Dartifact=com.retailsvc:pnp-processors-core-common:0.125.0:jar - dependency:build-classpath -DincludeScope=test -Dmdep.outputFile=cp.txt - dependency:copy-dependencies -DoutputDirectory=lib + args: dependency:get -Dartifact=com.retailsvc:pnp-processors-core-common:0.173.1:jar + service-account-key: ${{ secrets.SECRET_AUTH }} + + - name: Build classpath with Maven + uses: extenda/actions/maven@v0 + with: + args: dependency:build-classpath -DincludeScope=runtime -Dmdep.outputFile=cp.txt -q + service-account-key: ${{ secrets.SECRET_AUTH }} + + - name: Build classpath lib dir with Maven + uses: extenda/actions/maven@v0 + with: + args: dependency:copy-dependencies -DoutputDirectory=lib -q service-account-key: ${{ secrets.SECRET_AUTH }} - name: Download Detekt CLI @@ -74,9 +82,9 @@ jobs: - name: Verify with Detekt run: | - java -cp "target/classes:$(cat cp.txt):lib/*" \ + java -cp "target/classes:lib/*" \ io.gitlab.arturbosch.detekt.cli.Main \ --input src/main/kotlin \ --config detekt.yml \ --classpath "target/classes:$(cat cp.txt)" \ - --plugins ~/.m2/repository/com/retailsvc/pnp-processors-core-common/0.125.0/pnp-processors-core-common-0.125.0.jar \ No newline at end of file + --plugins ~/.m2/repository/com/retailsvc/pnp-processors-core-common/0.173.1/pnp-processors-core-common-0.173.1.jar \ No newline at end of file diff --git a/.github/workflows/pnp-build-autopilot-processor-nested.yml b/.github/workflows/pnp-build-autopilot-processor-nested.yml index 76eaba75..fca74176 100644 --- a/.github/workflows/pnp-build-autopilot-processor-nested.yml +++ b/.github/workflows/pnp-build-autopilot-processor-nested.yml @@ -191,7 +191,7 @@ jobs: if: ${{ inputs.enable-kafka-streams-lint == true }} uses: extenda/actions/maven@v0 with: - args: dependency:get -Dartifact=com.retailsvc:pnp-processors-core-common:0.169.2:jar + args: dependency:get -Dartifact=com.retailsvc:pnp-processors-core-common:0.173.1:jar service-account-key: ${{ secrets.SECRET_AUTH }} working-directory: ${{ inputs.working-directory || '.' }} @@ -238,7 +238,7 @@ jobs: DETEKT_CLASSPATH="$BASE_DIR/target/classes:$(cat "$BASE_DIR/cp.txt")" LIB_JARS_CLASSPATH="$(find "$BASE_DIR/lib" -maxdepth 1 -type f -name '*.jar' -printf ':%p' | tr -d '\n')" - DETEKT_PLUGIN_JAR="$HOME/.m2/repository/com/retailsvc/pnp-processors-core-common/0.169.2/pnp-processors-core-common-0.169.2.jar" + DETEKT_PLUGIN_JAR="$HOME/.m2/repository/com/retailsvc/pnp-processors-core-common/0.173.1/pnp-processors-core-common-0.173.1.jar" KAFKA_STREAMS_JAR="$(tr ':' '\n' < "$BASE_DIR/cp.txt" | grep -E '/kafka-streams-[^/]+\.jar$' | head -n1 || true)" if [[ ! -f "$DETEKT_PLUGIN_JAR" ]]; then diff --git a/.github/workflows/pnp-build-autopilot-processor.yml b/.github/workflows/pnp-build-autopilot-processor.yml index d38fbb68..10ba7b2e 100644 --- a/.github/workflows/pnp-build-autopilot-processor.yml +++ b/.github/workflows/pnp-build-autopilot-processor.yml @@ -180,7 +180,7 @@ jobs: if: ${{ inputs.enable-kafka-streams-lint == true }} uses: extenda/actions/maven@v0 with: - args: dependency:get -Dartifact=com.retailsvc:pnp-processors-core-common:0.169.2:jar + args: dependency:get -Dartifact=com.retailsvc:pnp-processors-core-common:0.173.1:jar service-account-key: ${{ secrets.SECRET_AUTH }} - name: Kafka Streams lint - build classpath with maven @@ -212,7 +212,7 @@ jobs: --config pnp-detekt-plugin.yml \ --classpath "target/classes:$(cat cp.txt)" \ --jvm-target 21 \ - --plugins ~/.m2/repository/com/retailsvc/pnp-processors-core-common/0.169.2/pnp-processors-core-common-0.169.2.jar \ + --plugins ~/.m2/repository/com/retailsvc/pnp-processors-core-common/0.173.1/pnp-processors-core-common-0.173.1.jar \ - name: Analyze with Sonar uses: extenda/actions/sonar-scanner@v0 diff --git a/.github/workflows/pnp-processor-build-image.yml b/.github/workflows/pnp-processor-build-image.yml index 2b2735cf..5fd532b1 100644 --- a/.github/workflows/pnp-processor-build-image.yml +++ b/.github/workflows/pnp-processor-build-image.yml @@ -168,7 +168,7 @@ jobs: if: ${{ inputs.enable-kafka-streams-lint == true }} uses: extenda/actions/maven@v0 with: - args: dependency:get -Dartifact=com.retailsvc:pnp-processors-core-common:0.169.2:jar + args: dependency:get -Dartifact=com.retailsvc:pnp-processors-core-common:0.173.1:jar service-account-key: ${{ secrets.SECRET_AUTH }} working-directory: ${{ inputs.working-directory || '.' }} @@ -219,7 +219,7 @@ jobs: --config "$BASE_DIR/pnp-detekt-plugin.yml" \ --classpath "$BASE_DIR/target/classes:$(cat "$BASE_DIR/cp.txt")" \ --jvm-target "$DETEKT_JVM_TARGET" \ - --plugins "$HOME/.m2/repository/com/retailsvc/pnp-processors-core-common/0.169.2/pnp-processors-core-common-0.169.2.jar" + --plugins "$HOME/.m2/repository/com/retailsvc/pnp-processors-core-common/0.173.1/pnp-processors-core-common-0.173.1.jar" - name: Analyze with Sonar uses: extenda/actions/sonar-scanner@v0