From 916cc520ab396f71c4c1dbc423fbb40cbf572917 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 14:53:08 +0000 Subject: [PATCH 1/4] Bump archunit-junit5-api from 0.23.1 to 1.0.0 Bumps [archunit-junit5-api](https://github.com/TNG/ArchUnit) from 0.23.1 to 1.0.0. - [Release notes](https://github.com/TNG/ArchUnit/releases) - [Commits](https://github.com/TNG/ArchUnit/compare/v0.23.1...v1.0.0) --- updated-dependencies: - dependency-name: com.tngtech.archunit:archunit-junit5-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e4a07195f89..caff80a995b 100644 --- a/build.gradle +++ b/build.gradle @@ -212,7 +212,7 @@ dependencies { testImplementation 'org.xmlunit:xmlunit-core:2.9.0' testImplementation 'org.xmlunit:xmlunit-matchers:2.9.0' testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.23.1' - testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.23.1' + testImplementation 'com.tngtech.archunit:archunit-junit5-api:1.0.0' testImplementation "org.testfx:testfx-core:4.0.16-alpha" testImplementation "org.testfx:testfx-junit5:4.0.16-alpha" testImplementation "org.hamcrest:hamcrest-library:2.2" From 05eb5e3f6a16721e17550fcf4782cdf85e2d8556 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Mon, 10 Oct 2022 17:54:43 +0200 Subject: [PATCH 2/4] Fix archunit --- build.gradle | 2 +- src/main/java/module-info.java | 1 + .../java/org/jabref/architecture/MainArchitectureTests.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index caff80a995b..02b80ec5e04 100644 --- a/build.gradle +++ b/build.gradle @@ -211,7 +211,7 @@ dependencies { testImplementation 'org.mockito:mockito-core:4.8.0' testImplementation 'org.xmlunit:xmlunit-core:2.9.0' testImplementation 'org.xmlunit:xmlunit-matchers:2.9.0' - testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.23.1' + testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:1.0.0' testImplementation 'com.tngtech.archunit:archunit-junit5-api:1.0.0' testImplementation "org.testfx:testfx-core:4.0.16-alpha" testImplementation "org.testfx:testfx-junit5:4.0.16-alpha" diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 4edbf562d8c..4320a13cae1 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -116,6 +116,7 @@ requires net.harawata.appdirs; requires org.eclipse.jgit; + requires com.tngtech.archunit.junit5.api; uses org.eclipse.jgit.transport.SshSessionFactory; uses org.eclipse.jgit.lib.GpgSigner; } diff --git a/src/test/java/org/jabref/architecture/MainArchitectureTests.java b/src/test/java/org/jabref/architecture/MainArchitectureTests.java index 5f67761f064..4002a6a7e70 100644 --- a/src/test/java/org/jabref/architecture/MainArchitectureTests.java +++ b/src/test/java/org/jabref/architecture/MainArchitectureTests.java @@ -11,6 +11,7 @@ import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; import static com.tngtech.archunit.library.Architectures.layeredArchitecture; + @AnalyzeClasses(packages = "org.jabref") class MainArchitectureTests { @@ -72,7 +73,7 @@ public static void doNotUsePaths(JavaClasses classes) { @ArchIgnore // Fails currently public static void respectLayeredArchitecture(JavaClasses classes) { - layeredArchitecture() + layeredArchitecture().consideringOnlyDependenciesInLayers() .layer("Gui").definedBy(PACKAGE_ORG_JABREF_GUI) .layer("Logic").definedBy(PACKAGE_ORG_JABREF_LOGIC) .layer("Model").definedBy(PACKAGE_ORG_JABREF_MODEL) From 06779bbc0d8fb11507170b9f8b78e979e51ae14a Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Mon, 10 Oct 2022 18:02:48 +0200 Subject: [PATCH 3/4] remove from module patHh --- src/main/java/module-info.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 4320a13cae1..4edbf562d8c 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -116,7 +116,6 @@ requires net.harawata.appdirs; requires org.eclipse.jgit; - requires com.tngtech.archunit.junit5.api; uses org.eclipse.jgit.transport.SshSessionFactory; uses org.eclipse.jgit.lib.GpgSigner; } From 107474237c4b13a03e2c131993e39c940c26df92 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Mon, 10 Oct 2022 18:08:24 +0200 Subject: [PATCH 4/4] checkstyle --- src/test/java/org/jabref/architecture/MainArchitectureTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/org/jabref/architecture/MainArchitectureTests.java b/src/test/java/org/jabref/architecture/MainArchitectureTests.java index 4002a6a7e70..25b60cea46c 100644 --- a/src/test/java/org/jabref/architecture/MainArchitectureTests.java +++ b/src/test/java/org/jabref/architecture/MainArchitectureTests.java @@ -11,7 +11,6 @@ import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; import static com.tngtech.archunit.library.Architectures.layeredArchitecture; - @AnalyzeClasses(packages = "org.jabref") class MainArchitectureTests {