chore(deps): update dependency com.puppycrawl.tools:checkstyle to v10 (…

…#2663) * chore(deps): update dependency com.puppycrawl.tools:checkstyle to v10 * fix build * rollback jest-dom --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stephan Köninger <stephan.koeninger@codecentric.de>
codecentric · Aug 23, 2023 · 340d081 · 340d081
1 parent 0d0a33d
commit 340d081
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
         <git-commit-id-maven-plugin.version>4.9.10</git-commit-id-maven-plugin.version>
         <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
         <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
-        <checkstyle.version>9.3</checkstyle.version>
+        <checkstyle.version>10.12.2</checkstyle.version>
         <spring-javaformat-checkstyle.version>0.0.39</spring-javaformat-checkstyle.version>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
         <node.version>v18.16.0</node.version>

diff --git a/spring-boot-admin-server-ui/package-lock.json b/spring-boot-admin-server-ui/package-lock.json
diff --git a/spring-boot-admin-server-ui/package.json b/spring-boot-admin-server-ui/package.json
@@ -71,7 +71,7 @@
     "@storybook/addon-mdx-gfm": "^7.0.5",
     "@storybook/vue3": "7.3.2",
     "@storybook/vue3-vite": "^7.0.5",
-    "@testing-library/jest-dom": "6.1.0",
+    "@testing-library/jest-dom": "6.0.1",
     "@testing-library/user-event": "14.4.3",
     "@testing-library/vue": "7.0.0",
     "@trivago/prettier-plugin-sort-imports": "^4.0.0",

diff --git a/spring-boot-admin-server-ui/src/main/frontend/tests/setup.js b/spring-boot-admin-server-ui/src/main/frontend/tests/setup.js
@@ -1,12 +1,9 @@
-import matchers from '@testing-library/jest-dom/matchers';
+import '@testing-library/jest-dom/vitest';
 import { cleanup } from '@testing-library/vue';
 import { afterAll, afterEach, beforeAll, expect, vi } from 'vitest';
 
 import { server } from '@/mocks/server';
 
-// extends Vitest's expect method with methods from react-testing-library
-expect.extend(matchers);
-
 global.IntersectionObserver = vi.fn().mockImplementation(() => ({
   observe: vi.fn(),
   unobserve: vi.fn(),

diff --git a/.../src/test/java/de/codecentric/boot/admin/server/ui/web/HomepageForwardingMatcherTest.java b/.../src/test/java/de/codecentric/boot/admin/server/ui/web/HomepageForwardingMatcherTest.java
@@ -61,7 +61,7 @@ public void should_return_true() {
 	}
 
 	@Data
-	private static class MockRequest {
+	private static final class MockRequest {
 
 		private final String method;