From a2a0c4a79b48399dee1db793d528575c6af18df9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:29:04 +0000 Subject: [PATCH 01/15] Bump org.junit.platform:junit-platform-launcher from 1.7.1 to 1.10.2 Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit5) from 1.7.1 to 1.10.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/commits) --- updated-dependencies: - dependency-name: org.junit.platform:junit-platform-launcher dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 15869d0..bb5f0b3 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.1' testImplementation 'org.junit-pioneer:junit-pioneer:1.3.8' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.7.1' // required when testing in Eclipse + testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.2' // required when testing in Eclipse } shadowJar { From df4c5d761f0d354b1deaf83a794e5e92a25db446 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:29:13 +0000 Subject: [PATCH 02/15] Bump actions/setup-java from 2 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d2068b..fe999ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: - name: Git checkout uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: cache: gradle distribution: microsoft diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 71f7fb1..27ab969 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,7 @@ jobs: - name: Git checkout uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: cache: gradle distribution: microsoft From 6f596e998d71a063d44c7bd4f97ae99d16cd0f2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:29:28 +0000 Subject: [PATCH 03/15] Bump org.junit.jupiter:junit-jupiter-params from 5.7.1 to 5.10.2 Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.7.1 to 5.10.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.1...r5.10.2) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 15869d0..531d7a3 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ dependencies { testImplementation 'com.google.guava:guava-base:r03' testImplementation 'com.google.guava:guava-io:r03' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' - testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2' testImplementation 'org.junit-pioneer:junit-pioneer:1.3.8' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.7.1' // required when testing in Eclipse From d8076c9ed7f0c56157030bc759f8d44f69359abd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:29:28 +0000 Subject: [PATCH 04/15] Bump com.github.javaparser:javaparser-symbol-solver-core Bumps [com.github.javaparser:javaparser-symbol-solver-core](https://github.com/javaparser/javaparser) from 3.13.5 to 3.25.8. - [Release notes](https://github.com/javaparser/javaparser/releases) - [Changelog](https://github.com/javaparser/javaparser/blob/master/changelog.md) - [Commits](https://github.com/javaparser/javaparser/compare/javaparser-parent-3.13.5...javaparser-parent-3.25.8) --- updated-dependencies: - dependency-name: com.github.javaparser:javaparser-symbol-solver-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 13a2331..b8c5b54 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ configurations { dependencies { implementation gradleApi() implementation 'org.jooq:joor:0.9.15' - plugin 'com.github.javaparser:javaparser-symbol-solver-core:3.13.5' + plugin 'com.github.javaparser:javaparser-symbol-solver-core:3.25.8' testImplementation gradleTestKit() testImplementation 'com.google.guava:guava-base:r03' From 5d9c236bb9fad280ea9c392f6b9324c57a52e2c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Feb 2024 11:41:22 +0000 Subject: [PATCH 05/15] Bump org.junit-pioneer:junit-pioneer from 1.3.8 to 2.2.0 Bumps [org.junit-pioneer:junit-pioneer](https://github.com/junit-pioneer/junit-pioneer) from 1.3.8 to 2.2.0. - [Release notes](https://github.com/junit-pioneer/junit-pioneer/releases) - [Commits](https://github.com/junit-pioneer/junit-pioneer/compare/v1.3.8...v2.2.0) --- updated-dependencies: - dependency-name: org.junit-pioneer:junit-pioneer 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 972ba5e..0bd9e3d 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ dependencies { testImplementation 'com.google.guava:guava-io:r03' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2' - testImplementation 'org.junit-pioneer:junit-pioneer:1.3.8' + testImplementation 'org.junit-pioneer:junit-pioneer:2.2.0' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.2' // required when testing in Eclipse } From 29918958c875c7b1aef950039a9c013682214007 Mon Sep 17 00:00:00 2001 From: Big Andy <8012398+big-andy-coates@users.noreply.github.com> Date: Sat, 17 Feb 2024 15:23:42 +0000 Subject: [PATCH 06/15] Update code inline with dependency change --- .../moduleplugin/ModulePluginSmokeTest.java | 57 +++++++++---------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java b/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java index 2af33e0..3c07c31 100644 --- a/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java +++ b/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java @@ -8,9 +8,7 @@ import org.gradle.testkit.runner.GradleRunner; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junitpioneer.jupiter.CartesianEnumSource; -import org.junitpioneer.jupiter.CartesianProductTest; -import org.junitpioneer.jupiter.CartesianValueSource; +import org.junitpioneer.jupiter.cartesian.CartesianTest; import java.io.File; import java.io.IOException; @@ -60,10 +58,10 @@ void before() throws IOException { .collect(Collectors.toList()); } - @CartesianProductTest(name = "smokeTest({arguments})") - @CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) - @CartesianEnumSource(GradleVersion.class) - void smokeTest(String projectName, GradleVersion gradleVersion) { + @CartesianTest(name = "smokeTest({arguments})") + void smokeTest( + @CartesianTest.Values(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) String projectName, + @CartesianTest.Enum GradleVersion gradleVersion) { LOGGER.lifecycle("Executing smokeTest of {} with Gradle {}", projectName, gradleVersion); if(!checkCombination(projectName, gradleVersion)) return; var result = GradleRunner.create() @@ -84,10 +82,10 @@ void smokeTest(String projectName, GradleVersion gradleVersion) { assertOutputDoesNotContain(result, "warning: [options] --add-opens has no effect at compile time"); } - @CartesianProductTest(name = "smokeTestRun({arguments})") - @CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) - @CartesianEnumSource(GradleVersion.class) - void smokeTestRun(String projectName, GradleVersion gradleVersion) { + @CartesianTest(name = "smokeTestRun({arguments})") + void smokeTestRun( + @CartesianTest.Values(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) String projectName, + @CartesianTest.Enum GradleVersion gradleVersion) { LOGGER.lifecycle("Executing smokeTestRun of {} with Gradle {}", projectName, gradleVersion); if(!checkCombination(projectName, gradleVersion)) return; var writer = new StringWriter(256); @@ -108,10 +106,10 @@ void smokeTestRun(String projectName, GradleVersion gradleVersion) { assertEquals("welcome", lines.get(2)); } - @CartesianProductTest(name = "smokeTestJunit5({arguments})") - @CartesianValueSource(strings = {"5.4.2/1.4.2", "5.5.2/1.5.2", "5.7.1/1.7.1"}) - @CartesianEnumSource(GradleVersion.class) - void smokeTestJunit5(String junitVersionPair, GradleVersion gradleVersion) { + @CartesianTest(name = "smokeTestJunit5({arguments})") + void smokeTestJunit5( + @CartesianTest.Values(strings = {"5.4.2/1.4.2", "5.5.2/1.5.2", "5.7.1/1.7.1"}) String junitVersionPair, + @CartesianTest.Enum GradleVersion gradleVersion) { LOGGER.lifecycle("Executing smokeTestJunit5 with junitVersionPair {} and Gradle {}", junitVersionPair, gradleVersion); var junitVersionParts = junitVersionPair.split("/"); var junitVersionProperty = String.format("-PjUnitVersion=%s", junitVersionParts[0]); @@ -130,9 +128,8 @@ void smokeTestJunit5(String junitVersionPair, GradleVersion gradleVersion) { assertTasksSuccessful(result, "greeter.runner", "build", "run"); } - @CartesianProductTest(name = "smokeTestMixed({arguments})") - @CartesianEnumSource(GradleVersion.class) - void smokeTestMixed(GradleVersion gradleVersion) { + @CartesianTest(name = "smokeTestMixed({arguments})") + void smokeTestMixed(@CartesianTest.Enum GradleVersion gradleVersion) { LOGGER.lifecycle("Executing smokeTestMixed with Gradle {}", gradleVersion); var result = GradleRunner.create() .withProjectDir(new File("test-project-mixed")) @@ -181,10 +178,10 @@ private static void assertExpectedClassFileFormats( } } - @CartesianProductTest(name = "smokeTestDist({arguments})") - @CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) - @CartesianEnumSource(GradleVersion.class) - void smokeTestDist(String projectName, GradleVersion gradleVersion) { + @CartesianTest(name = "smokeTestDist({arguments})") + void smokeTestDist( + @CartesianTest.Values(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) String projectName, + @CartesianTest.Enum GradleVersion gradleVersion) { LOGGER.lifecycle("Executing smokeTestDist of {} with Gradle {}", projectName, gradleVersion); if(!checkCombination(projectName, gradleVersion)) return; var result = GradleRunner.create() @@ -222,10 +219,10 @@ void smokeTestDist(String projectName, GradleVersion gradleVersion) { assertTrue(ctx.getAppOutput("greeter.runner").contains("welcome")); } - @CartesianProductTest(name = "smokeTestRunDemo({arguments})") - @CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) - @CartesianEnumSource(GradleVersion.class) - void smokeTestRunDemo(String projectName, GradleVersion gradleVersion) { + @CartesianTest(name = "smokeTestRunDemo({arguments})") + void smokeTestRunDemo( + @CartesianTest.Values(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) String projectName, + @CartesianTest.Enum GradleVersion gradleVersion) { LOGGER.lifecycle("Executing smokeTestRunDemo of {} with Gradle {}", projectName, gradleVersion); if(!checkCombination(projectName, gradleVersion)) return; var result = GradleRunner.create() @@ -241,10 +238,10 @@ void smokeTestRunDemo(String projectName, GradleVersion gradleVersion) { assertFalse(result.getOutput().contains("Using Java lambdas is not supported as task inputs")); } - @CartesianProductTest(name = "smokeTestRunStartScripts({arguments})") - @CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) - @CartesianEnumSource(GradleVersion.class) - void smokeTestRunStartScripts(String projectName, GradleVersion gradleVersion) { + @CartesianTest(name = "smokeTestRunStartScripts({arguments})") + void smokeTestRunStartScripts( + @CartesianTest.Values(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) String projectName, + @CartesianTest.Enum GradleVersion gradleVersion) { LOGGER.lifecycle("Executing smokeTestRunScripts of {} with Gradle {}", projectName, gradleVersion); if(!checkCombination(projectName, gradleVersion)) return; var result = GradleRunner.create() From 40f67028ab945363eb46f357be1fb5aa1bd26007 Mon Sep 17 00:00:00 2001 From: Big Andy <8012398+big-andy-coates@users.noreply.github.com> Date: Sat, 17 Feb 2024 15:26:41 +0000 Subject: [PATCH 07/15] Enable dependabot on subprojects --- .github/dependabot.yml | 24 ++++++++++++++++++++---- .github/workflows/build.yml | 7 ++++++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2d2afba..0abea42 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -22,11 +22,27 @@ updates: schedule: interval: monthly - package-ecosystem: gradle - directory: /docs-examples + directory: /test-project open-pull-requests-limit: 50 schedule: - interval: weekly - - package-ecosystem: docker - directory: /test-service + interval: monthly + - package-ecosystem: gradle + directory: /test-project-groovy + open-pull-requests-limit: 50 + schedule: + interval: monthly + - package-ecosystem: gradle + directory: /test-project-kotlin + open-pull-requests-limit: 50 + schedule: + interval: monthly + - package-ecosystem: gradle + directory: /test-project-kotlin-pre-1-7 + open-pull-requests-limit: 50 + schedule: + interval: monthly + - package-ecosystem: gradle + directory: /test-project-mixed + open-pull-requests-limit: 50 schedule: interval: monthly \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe999ef..4b2a6b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,11 @@ name: Build -on: [push, pull_request, workflow_dispatch] +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + workflow_dispatch: {} jobs: build: From 261b51bba35c507f250b51acde8404eb7a492708 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Feb 2024 15:59:23 +0000 Subject: [PATCH 08/15] Bump org.hamcrest:hamcrest from 2.1+ to 2.2 in /test-project Bumps [org.hamcrest:hamcrest](https://github.com/hamcrest/JavaHamcrest) from 2.1+ to 2.2. - [Release notes](https://github.com/hamcrest/JavaHamcrest/releases) - [Changelog](https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md) - [Commits](https://github.com/hamcrest/JavaHamcrest/commits/v2.2) --- updated-dependencies: - dependency-name: org.hamcrest:hamcrest dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- test-project/greeter.provider/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-project/greeter.provider/build.gradle b/test-project/greeter.provider/build.gradle index 5e51048..f7e9cd0 100644 --- a/test-project/greeter.provider/build.gradle +++ b/test-project/greeter.provider/build.gradle @@ -4,7 +4,7 @@ dependencies { implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation 'javax.annotation:jsr250-api:1.0' - testImplementation 'org.hamcrest:hamcrest:2.1+' + testImplementation 'org.hamcrest:hamcrest:2.2+' } patchModules.config = [ From 8978dafa8158ac22a5948720e875cd277bd24ffb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Feb 2024 15:59:24 +0000 Subject: [PATCH 09/15] Bump org.hamcrest:hamcrest from 2.1+ to 2.2 in /test-project-kotlin Bumps [org.hamcrest:hamcrest](https://github.com/hamcrest/JavaHamcrest) from 2.1+ to 2.2. - [Release notes](https://github.com/hamcrest/JavaHamcrest/releases) - [Changelog](https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md) - [Commits](https://github.com/hamcrest/JavaHamcrest/commits/v2.2) --- updated-dependencies: - dependency-name: org.hamcrest:hamcrest dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- test-project-kotlin/greeter.provider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-project-kotlin/greeter.provider/build.gradle.kts b/test-project-kotlin/greeter.provider/build.gradle.kts index 2c2795e..49bc1ea 100644 --- a/test-project-kotlin/greeter.provider/build.gradle.kts +++ b/test-project-kotlin/greeter.provider/build.gradle.kts @@ -6,7 +6,7 @@ dependencies { implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("javax.annotation:jsr250-api:1.0") - testImplementation("org.hamcrest:hamcrest:2.1+") + testImplementation("org.hamcrest:hamcrest:2.2+") } patchModules.config = listOf( From c1598a96f30f1631e5bbdda05bb652528decca28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Feb 2024 15:59:24 +0000 Subject: [PATCH 10/15] Bump org.codehaus.groovy:groovy in /test-project-groovy Bumps [org.codehaus.groovy:groovy](https://github.com/apache/groovy) from 3.0.7 to 3.0.20. - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-project-groovy/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-project-groovy/build.gradle b/test-project-groovy/build.gradle index 72f526e..8bd5412 100644 --- a/test-project-groovy/build.gradle +++ b/test-project-groovy/build.gradle @@ -26,7 +26,7 @@ subprojects { } dependencies { - implementation 'org.codehaus.groovy:groovy:3.0.7' + implementation 'org.codehaus.groovy:groovy:3.0.20' testImplementation "org.junit.jupiter:junit-jupiter-api:$jUnitVersion" testImplementation "org.junit.jupiter:junit-jupiter-params:$jUnitVersion" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$jUnitVersion" From c88599e637ae3623ac59ab48c64a00f76268a0f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Feb 2024 16:00:26 +0000 Subject: [PATCH 11/15] Bump org.hamcrest:hamcrest in /test-project-kotlin-pre-1-7 Bumps [org.hamcrest:hamcrest](https://github.com/hamcrest/JavaHamcrest) from 2.1+ to 2.2. - [Release notes](https://github.com/hamcrest/JavaHamcrest/releases) - [Changelog](https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md) - [Commits](https://github.com/hamcrest/JavaHamcrest/commits/v2.2) --- updated-dependencies: - dependency-name: org.hamcrest:hamcrest dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- test-project-kotlin-pre-1-7/greeter.provider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-project-kotlin-pre-1-7/greeter.provider/build.gradle.kts b/test-project-kotlin-pre-1-7/greeter.provider/build.gradle.kts index 2c2795e..49bc1ea 100644 --- a/test-project-kotlin-pre-1-7/greeter.provider/build.gradle.kts +++ b/test-project-kotlin-pre-1-7/greeter.provider/build.gradle.kts @@ -6,7 +6,7 @@ dependencies { implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("javax.annotation:jsr250-api:1.0") - testImplementation("org.hamcrest:hamcrest:2.1+") + testImplementation("org.hamcrest:hamcrest:2.2+") } patchModules.config = listOf( From 7cc35adea160ce8e9a21148df0d32feac6826c59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Feb 2024 16:00:26 +0000 Subject: [PATCH 12/15] Bump jvm from 1.7.10 to 1.9.22 in /test-project-kotlin Bumps [jvm](https://github.com/JetBrains/kotlin) from 1.7.10 to 1.9.22. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.9.22) --- updated-dependencies: - dependency-name: jvm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test-project-kotlin/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-project-kotlin/build.gradle.kts b/test-project-kotlin/build.gradle.kts index d3ae2c2..278e54e 100644 --- a/test-project-kotlin/build.gradle.kts +++ b/test-project-kotlin/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.10" apply false + kotlin("jvm") version "1.9.22" apply false id("org.javamodularity.moduleplugin") version "1.8.13" apply false } From b90a83fc2307fbf9d1ec1b1b04f8441495eda045 Mon Sep 17 00:00:00 2001 From: Big Andy <8012398+big-andy-coates@users.noreply.github.com> Date: Sat, 17 Feb 2024 16:32:17 +0000 Subject: [PATCH 13/15] Bump com.gradle.plugin-publish to 1.2.1 AND com.github.johnrengelman.shadow to 7.1.2 Updates to the latest `com.gradle.plugin-publish` plugin, which required updating `com.github.johnrengelman.shadow` from `5.0.0` to `7.1.2`. It's not possible to update to a later version of `com.github.johnrengelman.shadow` as v8+ requires Gradle 8+, which would mean dropping support for earlier versions of Gradle. One for another day. --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 0bd9e3d..6330f1a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,8 @@ plugins { id 'eclipse' id 'java-gradle-plugin' id 'maven-publish' // used for publishing to local maven repository - id 'com.gradle.plugin-publish' version '0.12.0' - id 'com.github.johnrengelman.shadow' version '5.0.0' + id 'com.gradle.plugin-publish' version '1.2.0' + id 'com.github.johnrengelman.shadow' version '7.1.2' id 'com.github.ben-manes.versions' version '0.51.0' } @@ -44,7 +44,7 @@ dependencies { shadowJar { configurations = [project.configurations.plugin] - classifier = null + archiveClassifier = null dependencies { include(dependency('com.github.javaparser:javaparser-symbol-solver-core')) include(dependency('com.github.javaparser:javaparser-symbol-solver-logic')) From 1e7e363bf4bcecae7ceb79aa86b404684b4d3c23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Feb 2024 17:16:40 +0000 Subject: [PATCH 14/15] Bump com.gradle.plugin-publish from 0.12.0 to 1.2.1 Bumps com.gradle.plugin-publish from 0.12.0 to 1.2.1. --- updated-dependencies: - dependency-name: com.gradle.plugin-publish 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 6330f1a..3ad28be 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'eclipse' id 'java-gradle-plugin' id 'maven-publish' // used for publishing to local maven repository - id 'com.gradle.plugin-publish' version '1.2.0' + id 'com.gradle.plugin-publish' version '1.2.1' id 'com.github.johnrengelman.shadow' version '7.1.2' id 'com.github.ben-manes.versions' version '0.51.0' } From 4d6035f84bba3fe73a15186aa77c6dcc57f8f835 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Feb 2024 18:10:00 +0000 Subject: [PATCH 15/15] Bump com.github.johnrengelman.shadow from 5.0.0 to 8.1.1 Bumps com.github.johnrengelman.shadow from 5.0.0 to 8.1.1. --- updated-dependencies: - dependency-name: com.github.johnrengelman.shadow 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 3ad28be..21b9af9 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'java-gradle-plugin' id 'maven-publish' // used for publishing to local maven repository id 'com.gradle.plugin-publish' version '1.2.1' - id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'com.github.johnrengelman.shadow' version '8.1.1' id 'com.github.ben-manes.versions' version '0.51.0' }