From c2895a79937b8aabb81c6b5566a2e13c9db3ceb0 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Thu, 16 May 2024 10:40:44 +0100 Subject: [PATCH 01/16] chore : update readme --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c8903b5..cddb3d7 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,15 @@ that consumes this library. # Rules This library uses AXE-CORE to scan for accessibility violations. The full rules that the scan covers -can be found on the following link https://dequeuniversity.com/rules/axe/3.2 \ No newline at end of file +can be found on the following link https://dequeuniversity.com/rules/axe/3.2 + +## Installation +Add the following Maven dependency to your project's `pom.xml` file: +```xml + + org.dvsa.testing.framework + accessibility-library + [insert latest version of package] + +``` + From 78af345f73e0786233f81a380caf35aa8f2d68bd Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Thu, 16 May 2024 10:47:30 +0100 Subject: [PATCH 02/16] chore : amend pom --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d3f6e0e..ec4992f 100644 --- a/pom.xml +++ b/pom.xml @@ -62,9 +62,9 @@ - github-vol-active-support + dvsa-github-packages GitHub dvsa Apache Maven Packages - https://maven.pkg.github.com/dvsa/vol-active-support + https://maven.pkg.github.com/dvsa/* true From 0e25ed3794d6c7bb59188331861b4cffd2d91c78 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Thu, 16 May 2024 10:51:27 +0100 Subject: [PATCH 03/16] chore : amend security.yamal as per comments --- .github/workflows/security.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 9a4e077..84e29a6 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -35,8 +35,8 @@ jobs: cache: maven - uses: whelk-io/maven-settings-xml-action@v22 with: - servers: '[{ "id":"github-vol-active-support", "configuration": { "httpHeaders": { "property": { "name":"Authorization", "value":"Bearer ${{ secrets.GITHUB_TOKEN }}"} } } } ]' + servers: '[{ "id":"dvsa-github-packages", "configuration": { "httpHeaders": { "property": { "name":"Authorization", "value":"Bearer ${{ secrets.GITHUB_TOKEN }}"} } } } ]' - run: snyk test --severity-threshold=${{ inputs.severity-threshold || 'high' }} -- -P github env: - SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} \ No newline at end of file + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} From 65045ae4243aed3fbdb7bccd0661d1c15fee9ee2 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Thu, 16 May 2024 10:58:10 +0100 Subject: [PATCH 04/16] chore: copy profile directly from api calls --- pom.xml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index ec4992f..2e3649d 100644 --- a/pom.xml +++ b/pom.xml @@ -47,30 +47,22 @@ - + github central https://repo1.maven.org/maven2 - - true - - - true - + true + true dvsa-github-packages GitHub dvsa Apache Maven Packages https://maven.pkg.github.com/dvsa/* - - true - - - true - + true + true From e734b36981d06b039a9c91c78960dc0a6160295d Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Thu, 16 May 2024 11:16:58 +0100 Subject: [PATCH 05/16] chore: amend yamal --- .github/workflows/maven.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index d1dbf31..3213bb9 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: whelk-io/maven-settings-xml-action@v22 with: - servers: '[{ "id":"github-vol-active-support", "configuration": { "httpHeaders": { "property": { "name":"Authorization", "value":"Bearer ${{ secrets.GITHUB_TOKEN }}"} } } } ]' + servers: '[{ "id":"dvsa-github-packages", "configuration": { "httpHeaders": { "property": { "name":"Authorization", "value":"Bearer ${{ secrets.GITHUB_TOKEN }}"} } } } ]' - run: mvn -B -P github ${{ inputs.maven-goal}} - \ No newline at end of file + From b5d01dc38b3bb4142e87c5f7b59bfcf10e123bf7 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Thu, 16 May 2024 14:32:55 +0100 Subject: [PATCH 06/16] fix:revert scanner changes --- src/main/java/scanner/AXEScanner.java | 1 + src/main/java/scanner/ReportGenerator.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/scanner/AXEScanner.java b/src/main/java/scanner/AXEScanner.java index 0cab74d..8722789 100644 --- a/src/main/java/scanner/AXEScanner.java +++ b/src/main/java/scanner/AXEScanner.java @@ -4,6 +4,7 @@ import activesupport.driver.Browser; import com.deque.html.axecore.args.AxeRuleOptions; import com.deque.html.axecore.args.AxeRunOptions; +import com.deque.html.axecore.args.AxeRunOptions; import com.deque.html.axecore.results.Results; import com.deque.html.axecore.results.Rule; import com.deque.html.axecore.selenium.AxeBuilder; diff --git a/src/main/java/scanner/ReportGenerator.java b/src/main/java/scanner/ReportGenerator.java index 6a1dc76..422db5d 100644 --- a/src/main/java/scanner/ReportGenerator.java +++ b/src/main/java/scanner/ReportGenerator.java @@ -231,8 +231,7 @@ private static String readLinesAsInputStream(InputStream inputStream) throws IOE private static String readLines(String filePath) { StringBuilder contentBuilder = new StringBuilder(); try (Stream stream = Files.lines(Paths.get(filePath), StandardCharsets.UTF_8)) { - final StringBuilder finalContentBuilder = contentBuilder; - stream.forEach(s -> finalContentBuilder.append(s).append("\n")); + stream.forEach(s -> contentBuilder.append(s).append("\n")); } catch (IOException e) { e.printStackTrace(); } From 79290401fb789291ae4c34aa9b7ca235e2fb1047 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Fri, 17 May 2024 12:03:42 +0100 Subject: [PATCH 07/16] fix:Update cd.yaml --- .github/workflows/cd.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 6dd4764..f66a22b 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -16,7 +16,7 @@ jobs: tag_name: ${{ steps.release.outputs.tag_name }} release_created: ${{ steps.release.outputs.release_created }} steps: - - uses: google-github-actions/release-please-action@v4 + - uses: googleapis/release-please-action@v4 id: release with: release-type: maven @@ -51,4 +51,4 @@ jobs: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - \ No newline at end of file + From de52a71d34734d013c01a28ed1d6523609a55671 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Fri, 17 May 2024 12:10:20 +0100 Subject: [PATCH 08/16] fix:Update cd.yaml --- .github/workflows/cd.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index f66a22b..88d00c0 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -48,7 +48,7 @@ jobs: with: maven-goal: deploy needs: release-please - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + + From fe05785f35084d9de0ea00b234367569dc581b6d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 11:12:47 +0000 Subject: [PATCH 09/16] chore(main): release 1.0.0 --- CHANGELOG.md | 23 +++++++++++++++++++++++ pom.xml | 6 ++---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..7cd8e6a --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,23 @@ +# Changelog + +## 1.0.0 (2024-05-17) + + +### Features + +* axe core ([b4c300e](https://github.com/dvsa/vol-accessibility-lib/commit/b4c300ea36a522ef6d90fbc2332c063d62020b1c)) +* compiler ([c44e6ee](https://github.com/dvsa/vol-accessibility-lib/commit/c44e6ee668ddaad23bf02b7f37665bf540e99beb)) +* github packages ([411c290](https://github.com/dvsa/vol-accessibility-lib/commit/411c290ea233798573c4d27c3b07c72671bf72fb)) +* pom changes ([442af2c](https://github.com/dvsa/vol-accessibility-lib/commit/442af2c7693dacea1c78f50c4b4b4687bce17ffc)) +* snyk ([f697056](https://github.com/dvsa/vol-accessibility-lib/commit/f697056a07f18f78c8d2b4a1a0568d19abf432b9)) +* snyk ([ecbe0b8](https://github.com/dvsa/vol-accessibility-lib/commit/ecbe0b87e823375d973723a544bdf17ba26f21e6)) +* snyk ([fb2a0b1](https://github.com/dvsa/vol-accessibility-lib/commit/fb2a0b1adf603c3c927abb94ffb9c5ad167b767c)) +* snyk ignore ([1d4160a](https://github.com/dvsa/vol-accessibility-lib/commit/1d4160afb14470705eda69affb6637588b2de2ec)) + + +### Bug Fixes + +* revert scanner changes ([b5d01dc](https://github.com/dvsa/vol-accessibility-lib/commit/b5d01dc38b3bb4142e87c5f7b59bfcf10e123bf7)) +* Update cd.yaml ([de52a71](https://github.com/dvsa/vol-accessibility-lib/commit/de52a71d34734d013c01a28ed1d6523609a55671)) +* Update cd.yaml ([7929040](https://github.com/dvsa/vol-accessibility-lib/commit/79290401fb789291ae4c34aa9b7ca235e2fb1047)) +* version ([9f19a59](https://github.com/dvsa/vol-accessibility-lib/commit/9f19a59444254398f03e3cc348bfbf5a934946d2)) diff --git a/pom.xml b/pom.xml index 2e3649d..530f6dc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.dvsa.testing.lib accessibility-library - 2.9 + 1.0.0 UTF-8 From 9c855a8b36b1a93606676aee76e67cd10cf3c4b7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 11:13:54 +0000 Subject: [PATCH 10/16] chore(main): release 1.0.1-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 530f6dc..d467fde 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.dvsa.testing.lib accessibility-library - 1.0.0 + 1.0.1-SNAPSHOT UTF-8 From cae6e1f8d50fac9e6af3ecc6cb898fc5fdf9ab1d Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Fri, 17 May 2024 12:23:48 +0100 Subject: [PATCH 11/16] fix:Update cd.yaml --- .github/workflows/cd.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 88d00c0..7beaa89 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -48,6 +48,8 @@ jobs: with: maven-goal: deploy needs: release-please + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From 0d0950718a2015094e80d1e6923a0fc10264c7e9 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Fri, 17 May 2024 12:28:30 +0100 Subject: [PATCH 12/16] fix:env --- .github/workflows/cd.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 88d00c0..f66a22b 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -48,7 +48,7 @@ jobs: with: maven-goal: deploy needs: release-please - - + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From 9a4f79ffbc9cc2f315a2c8c2cbc1334827157b13 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Fri, 17 May 2024 12:51:44 +0100 Subject: [PATCH 13/16] fix:Update cd.yaml --- .github/workflows/cd.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index f66a22b..7586745 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -45,10 +45,9 @@ jobs: if: ${{needs.release-please.outputs.release_created}} name: Publish to GitHub Packages Apache Maven uses: ./.github/workflows/maven.yaml + secrets: inherit with: maven-goal: deploy - needs: release-please - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + From 670bf904a6068108c2d006a1628c5882940bd828 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 11:54:27 +0000 Subject: [PATCH 14/16] chore(main): release 1.0.1 --- CHANGELOG.md | 9 +++++++++ pom.xml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cd8e6a..0ccbbd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [1.0.1](https://github.com/dvsa/vol-accessibility-lib/compare/v1.0.0...v1.0.1) (2024-05-17) + + +### Bug Fixes + +* env ([0d09507](https://github.com/dvsa/vol-accessibility-lib/commit/0d0950718a2015094e80d1e6923a0fc10264c7e9)) +* Update cd.yaml ([9a4f79f](https://github.com/dvsa/vol-accessibility-lib/commit/9a4f79ffbc9cc2f315a2c8c2cbc1334827157b13)) +* Update cd.yaml ([cae6e1f](https://github.com/dvsa/vol-accessibility-lib/commit/cae6e1f8d50fac9e6af3ecc6cb898fc5fdf9ab1d)) + ## 1.0.0 (2024-05-17) diff --git a/pom.xml b/pom.xml index d467fde..24c4b3b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.dvsa.testing.lib accessibility-library - 1.0.1-SNAPSHOT + 1.0.1 UTF-8 From cd57ec42137e3ea1b6611380016eca6e5f265639 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Fri, 17 May 2024 15:46:31 +0100 Subject: [PATCH 15/16] fix:Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cddb3d7..f3bf706 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Description +# Description. Accessibility scanner library. This is a wrapper for the selenium axe framework. Once the scan has completed and any issues found, there will be a REPORT folder created in the project From 699f727d01563acaf2dc6dc7571835abcb5bf045 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 14:47:39 +0000 Subject: [PATCH 16/16] chore(main): release 1.0.2-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24c4b3b..8c47b20 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.dvsa.testing.lib accessibility-library - 1.0.1 + 1.0.2-SNAPSHOT UTF-8