Fix scanDependenciesDisable usage in Gradle plugin, use Maven manag…

…ed versions (#1342) * Use Maven managed versions for junit and jackson in Gradle plugin, fixes #1339 * Fix `scanDependenciesDisable` usage for Gradle plugin, fixes #1321 Signed-off-by: Michael Edgar <michael@xlate.io>
smallrye · Jan 9, 2023 · 30597cb · 30597cb
1 parent 85f74ad
commit 30597cb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 
     <properties>
         <version.buildhelper.plugin>3.3.0</version.buildhelper.plugin>
-        <jackson-bom.version>2.13.4.20221013</jackson-bom.version>
+        <jackson-bom.version>2.14.1</jackson-bom.version>
         <version.eclipse.microprofile.config>3.0</version.eclipse.microprofile.config>
         <version.io.smallrye.jandex>3.0.5</version.io.smallrye.jandex>
         <version.io.smallrye.smallrye-config>3.0.0</version.io.smallrye.smallrye-config>

diff --git a/tools/gradle-plugin/.gitignore b/tools/gradle-plugin/.gitignore
@@ -1,6 +1,7 @@
 # Ignore Gradle project-specific cache directory
 .gradle
-# Ignore Gradle build output directory
+# Ignore Gradle build output directories
+bin
 build
 # gradle.properties generated by Maven build from src/maven-build/gradle.properties
 /gradle.properties
diff --git a/tools/gradle-plugin/build.gradle.kts b/tools/gradle-plugin/build.gradle.kts
@@ -17,15 +17,18 @@ repositories {
 }
 
 dependencies {
+    val versionJackson: String by project
+    val versionJunit5: String by project
+
     implementation("io.smallrye:smallrye-open-api-core:$version")
     implementation("io.smallrye:smallrye-open-api-jaxrs:$version")
     implementation("io.smallrye:smallrye-open-api-spring:$version")
     implementation("io.smallrye:smallrye-open-api-vertx:$version")
 
-    testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
+    testImplementation("org.junit.jupiter:junit-jupiter:${versionJunit5}")
     testImplementation(gradleTestKit())
     testImplementation("org.assertj:assertj-core:3.24.1")
-    testImplementation("com.fasterxml.jackson.core:jackson-databind:2.14.1")
+    testImplementation("com.fasterxml.jackson.core:jackson-databind:${versionJackson}")
 }
 
 gradlePlugin {

diff --git a/tools/gradle-plugin/src/main/java/io/smallrye/openapi/gradleplugin/SmallryeOpenApiTask.java b/tools/gradle-plugin/src/main/java/io/smallrye/openapi/gradleplugin/SmallryeOpenApiTask.java
@@ -111,7 +111,7 @@ public void generate() {
 
             Configuration config = configProvider.get();
 
-            PublishArtifactSet allArtifacts = properties.scanDependenciesDisable.get() ? config.getAllArtifacts() : null;
+            PublishArtifactSet allArtifacts = properties.scanDependenciesDisable.get() ? null : config.getAllArtifacts();
 
             IndexView index = new GradleDependencyIndexCreator(getLogger()).createIndex(allArtifacts,
                     classesDirs);

diff --git a/tools/gradle-plugin/src/maven-build/gradle.properties b/tools/gradle-plugin/src/maven-build/gradle.properties
@@ -2,3 +2,5 @@
 # DO ONLY MODIFY THE FILE IN src/maven-build !
 #
 version=${project.version}
+versionJackson=${jackson-bom.version}
+versionJunit5=${version.junit5}