Merge pull request #7541 from planetf1/issue7424

odpi · Mar 21, 2023 · 19d3bc1 · 19d3bc1
2 parents cb5610f + 5eb8e95
commit 19d3bc1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 51 deletions.
diff --git a/bom/build.gradle b/bom/build.gradle
@@ -90,7 +90,6 @@ ext {
     snakeyamlVersion = '2.0'
     slf4jVersion = '2.0.6'
     snappyVersion = '1.1.9.1'
-    springdocVersion = '1.6.15'
     springbootVersion = '3.0.4'
     spotbugsVersion = '4.7.3'
     springdataVersion = '3.0.3'
@@ -113,7 +112,7 @@ ext {
     log4jVersion = '2.20.0'
     jacksonjdk8Version = '2.14.2'
     reactivestreamsVersion = '1.0.4'
-    springdocStarterVersion = '2.0.3'
+    springdocStarterVersion = '2.0.4'
     jacocoVersion = '0.8.8'
 }
 
@@ -203,7 +202,6 @@ dependencies {
         api("org.javassist:${javassistVersion}")
         api("org.quartz-scheduler:quartz:${quartzVersion}")
         api("org.reflections:reflections:${reflectionsVersion}")
-        api("org.springdoc:springdoc-openapi-ui:${springdocVersion}")
         api("org.slf4j:jcl-over-slf4j:${slf4jVersion}")
         api("org.slf4j:slf4j-api:${slf4jVersion}")
         api("org.springframework.boot:spring-boot-autoconfigure:${springbootVersion}")

diff --git a/build.gradle b/build.gradle
@@ -5,16 +5,17 @@
 
 /*
  * Plugins for this parent module only - so just high level project related
+ * Plugin management - ie version specs - are in settings.gradle
  */
 plugins {
-    id "io.freefair.aggregate-javadoc" version "6.6.3"
-    id "io.freefair.lombok" version "6.6.3"
+    id "io.freefair.aggregate-javadoc"
+    id "io.freefair.lombok"
     // Checks for unnecessary dependencies
-    id 'com.autonomousapps.dependency-analysis' version "1.19.0"
+    id 'com.autonomousapps.dependency-analysis'
     // helps resolve log implementation clashes
-    id 'dev.jacomet.logging-capabilities' version "0.11.0"
+    id 'dev.jacomet.logging-capabilities'
     // This plugin helps resolve jakarta/javax dev.jacomet.logging-capabilities
-    id 'org.gradlex.java-ecosystem-capabilities' version "1.1"
+    id 'org.gradlex.java-ecosystem-capabilities'
     id 'checkstyle'
 }
 
@@ -260,12 +261,6 @@ dependencyAnalysis {
             onAny {
                 severity('fail')
             }
-            onUnusedDependencies {
-                exclude("junit:junit", "org.junit.jupiter:junit-jupiter-api",
-                        "org.junit.jupiter:junit-jupiter-engine",
-                        "org.springdoc:springdoc-openapi-starter-webmvc-ui"
-                )
-            }
         }
     }
 }

diff --git a/open-metadata-implementation/server-chassis/server-chassis-spring/build.gradle b/open-metadata-implementation/server-chassis/server-chassis-spring/build.gradle
@@ -3,16 +3,6 @@
  * Copyright Contributors to the ODPi Egeria project.
  */
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin")
-    }
-}
-
 plugins {
     id 'org.springframework.boot'
 }
@@ -27,7 +17,6 @@ dependencies {
     implementation 'org.apache.tomcat.embed:tomcat-embed-core'
     //implementation 'org.springframework.boot:spring-boot-starter-tomcat'
     implementation 'jakarta.servlet:jakarta.servlet-api'
-    // Explicitly needed for gradle - added by maven plugin
 
     runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
     implementation 'org.springframework:spring-beans'
@@ -39,11 +28,11 @@ dependencies {
     runtimeOnly 'ch.qos.logback:logback-classic'
     implementation project(':open-metadata-implementation:adapters:authentication-plugins:http-helper')
     implementation 'org.slf4j:slf4j-api'
-    runtimeOnly 'org.springdoc:springdoc-openapi-ui'
-    implementation 'io.swagger.core.v3:swagger-annotations'
     runtimeOnly 'org.hibernate:hibernate-validator'
     runtimeOnly project(':open-metadata-implementation:platform-services:platform-services-spring')
     runtimeOnly project(':open-metadata-implementation:admin-services:admin-services-spring')
+    runtimeOnly 'org.springdoc:springdoc-openapi-starter-webmvc-ui'
+    compileOnly 'io.swagger.core.v3:swagger-annotations-jakarta'
 
     // The following are only included at runtime for the full platform (ie adminChassisOnly is not set as a property)
     if (!project.hasProperty("adminChassisOnly")) {

diff --git a/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/build.gradle b/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/build.gradle
@@ -3,22 +3,9 @@
  * Copyright Contributors to the ODPi Egeria project.
  */
 
-buildscript {
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-    }
-
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin")
-        classpath("org.springdoc.openapi-gradle-plugin:org.springdoc.openapi-gradle-plugin.gradle.plugin")
-    }
-}
-
 plugins {
     id 'io.freefair.lombok'
     id 'org.springframework.boot'
-    id 'org.springdoc.openapi-gradle-plugin' version("1.6.0")
 }
 
 dependencies {
@@ -88,8 +75,8 @@ dependencies {
     implementation project(':open-metadata-implementation:view-services:dino-view:dino-view-server')
     runtimeOnly project(':open-metadata-implementation:view-services:dino-view:dino-view-spring')
     implementation project(':open-metadata-implementation:admin-services:admin-services-registration')
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui'
-    runtimeOnly 'io.swagger.core.v3:swagger-annotations-jakarta'
+    runtimeOnly 'org.springdoc:springdoc-openapi-starter-webmvc-ui'
+    compileOnly 'io.swagger.core.v3:swagger-annotations-jakarta'
 }
 
 description = 'UI Server Platform Chassis for Spring'

diff --git a/settings.gradle b/settings.gradle
@@ -15,18 +15,19 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        //id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+        id "io.freefair.aggregate-javadoc" version "6.6.3"
+        id "io.freefair.lombok" version "6.6.3"
+        // Checks for unnecessary dependencies
+        id("com.autonomousapps.dependency-analysis") version "1.19.0"
+        // helps resolve log implementation clashes
+        id 'dev.jacomet.logging-capabilities' version "0.11.0"
+        // This plugin helps resolve jakarta/javax dev.jacomet.logging-capabilities
+        id 'org.gradlex.java-ecosystem-capabilities' version "1.1"
+        // Docs don't recommend specifying a version for checkstyle
+        id 'checkstyle'
         id 'org.springframework.boot' version '2.7.9'
-        id 'gradle-aggregate-javadocs-plugin' version '3.0.1'
-        id 'org.siouan.frontend-jdk11' version '6.0.0'
         id 'com.github.johnrengelman.shadow' version '7.1.2'
         id 'com.github.psxpaul.execfork' version '0.2.2'
-        id 'org.gradlex.java-ecosystem-capabilities' version '1.0'
-
-
-        // For reference we use these, but they are internal so no version spec needed
-        //id 'java' version
-        //id 'maven-publish' version
     }
 }
 rootProject.name = 'egeria'