Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#7424 remove additional healthcheck exclusions #7541

Merged
merged 3 commits into from
Mar 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions bom/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
}

Expand Down Expand Up @@ -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}")
Expand Down
17 changes: 6 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down Expand Up @@ -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"
)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -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'
Expand All @@ -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")) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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'
Expand Down
19 changes: 10 additions & 9 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down