From 5523f56c3fb46c89e065a8ca20d904f81b20bc1c Mon Sep 17 00:00:00 2001 From: Sebastian Diaz Torres Date: Fri, 10 Apr 2026 08:41:30 -0500 Subject: [PATCH 1/3] fix: change branch name and add develop on pull request --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f112deb..9f66a8f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -2,9 +2,9 @@ name: Java CI with Maven on: push: - branches: [ "master" ] + branches: [ "main" ] pull_request: - branches: [ "master" ] + branches: [ "main", "develop" ] jobs: build: From 2e47bb2b92f7ec4e13f8c068e20921d7c19ed511 Mon Sep 17 00:00:00 2001 From: Melsy Huamani Date: Fri, 10 Apr 2026 09:16:33 -0500 Subject: [PATCH 2/3] fix: remove newline at end of file in YAML metrics files --- .../openapi/metrics/FileLinesVisitorTest.java | 12 ++++++------ .../resources/metrics/embedded-newlines-lines.yaml | 2 +- .../src/test/resources/metrics/file-lines.yaml | 2 +- .../src/test/resources/metrics/multiline-lines.yaml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/openapi-front-end/src/test/java/org/apiaddicts/apitools/dosonarapi/openapi/metrics/FileLinesVisitorTest.java b/openapi-front-end/src/test/java/org/apiaddicts/apitools/dosonarapi/openapi/metrics/FileLinesVisitorTest.java index 6d79293..33af1a2 100644 --- a/openapi-front-end/src/test/java/org/apiaddicts/apitools/dosonarapi/openapi/metrics/FileLinesVisitorTest.java +++ b/openapi-front-end/src/test/java/org/apiaddicts/apitools/dosonarapi/openapi/metrics/FileLinesVisitorTest.java @@ -38,8 +38,8 @@ public void can_report_metrics() { TestOpenApiVisitorRunner.scanFile(new File(BASE_DIR, "file-lines.yaml"), visitor); // sonar extensions are counted as lines of code - assertThat(visitor.getLinesOfCode()).hasSize(16); - assertThat(visitor.getLinesOfCode()).containsOnly(1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 17, 18, 19); + assertThat(visitor.getLinesOfCode()).hasSize(15); + assertThat(visitor.getLinesOfCode()).containsOnly(1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 17, 18); assertThat(visitor.getLinesOfComments()).hasSize(3); assertThat(visitor.getLinesOfComments()).containsOnly(8, 15, 16); @@ -55,8 +55,8 @@ public void correctly_reports_strings_with_embedded_newline() { TestOpenApiVisitorRunner.scanFile(new File(BASE_DIR, "embedded-newlines-lines.yaml"), visitor); - assertThat(visitor.getLinesOfCode()).hasSize(16); - assertThat(visitor.getLinesOfCode()).containsOnly(1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 17, 18, 19); + assertThat(visitor.getLinesOfCode()).hasSize(15); + assertThat(visitor.getLinesOfCode()).containsOnly(1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 17, 18); } @Test @@ -65,7 +65,7 @@ public void correctly_reports_multiline_strings() { TestOpenApiVisitorRunner.scanFile(new File(BASE_DIR, "multiline-lines.yaml"), visitor); - assertThat(visitor.getLinesOfCode()).hasSize(18); - assertThat(visitor.getLinesOfCode()).containsOnly(1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 16, 19, 20, 21); + assertThat(visitor.getLinesOfCode()).hasSize(17); + assertThat(visitor.getLinesOfCode()).containsOnly(1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 16, 19, 20); } } diff --git a/openapi-front-end/src/test/resources/metrics/embedded-newlines-lines.yaml b/openapi-front-end/src/test/resources/metrics/embedded-newlines-lines.yaml index fb3cfc8..19302af 100644 --- a/openapi-front-end/src/test/resources/metrics/embedded-newlines-lines.yaml +++ b/openapi-front-end/src/test/resources/metrics/embedded-newlines-lines.yaml @@ -15,4 +15,4 @@ paths: # # another comment line /newpets: - $ref: '#/paths/~1pets' + $ref: '#/paths/~1pets' \ No newline at end of file diff --git a/openapi-front-end/src/test/resources/metrics/file-lines.yaml b/openapi-front-end/src/test/resources/metrics/file-lines.yaml index dba6079..6ca3c06 100644 --- a/openapi-front-end/src/test/resources/metrics/file-lines.yaml +++ b/openapi-front-end/src/test/resources/metrics/file-lines.yaml @@ -15,4 +15,4 @@ paths: # # another comment line /newpets: - $ref: '#/paths/~1pets' + $ref: '#/paths/~1pets' \ No newline at end of file diff --git a/openapi-front-end/src/test/resources/metrics/multiline-lines.yaml b/openapi-front-end/src/test/resources/metrics/multiline-lines.yaml index 75c4d26..2bfdb36 100644 --- a/openapi-front-end/src/test/resources/metrics/multiline-lines.yaml +++ b/openapi-front-end/src/test/resources/metrics/multiline-lines.yaml @@ -17,4 +17,4 @@ paths: # # another comment line /newpets: - $ref: '#/paths/~1pets' + $ref: '#/paths/~1pets' \ No newline at end of file From 3fff9bea997ec5e79631a3ef0890e27527cc1591 Mon Sep 17 00:00:00 2001 From: Sebastian Diaz Torres Date: Fri, 10 Apr 2026 10:33:49 -0500 Subject: [PATCH 3/3] fix: Change dependency graph dependency submission version to v4 --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9f66a8f..efe3046 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,4 +29,4 @@ jobs: run: mvn sonar:sonar -Dsonar.token=$SONAR_TOKEN - name: Update dependency graph - uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 + uses: advanced-security/maven-dependency-submission-action@v4