Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,41 @@ abstract class GdkParentPlugin implements Plugin<Project> {
xml.asNode().append(dependencyManagement)

Node dependencies = childOf(dependencyManagement, "dependencies")
Node dependency = new Node(dependencies, "dependency", "")
new Node(dependency, "groupId", "cloud.graal.gdk")
new Node(dependency, "artifactId", "gdk-bom")
new Node(dependency, "version", project.version)
new Node(dependency, "type", "pom")
new Node(dependency, "scope", "import")
Node gdkBomDependency = new Node(dependencies, "dependency", "")
new Node(gdkBomDependency, "groupId", "cloud.graal.gdk")
new Node(gdkBomDependency, "artifactId", "gdk-bom")
new Node(gdkBomDependency, "version", project.version)
new Node(gdkBomDependency, "type", "pom")
new Node(gdkBomDependency, "scope", "import")

dependencyExclusion.exclusions.forEach {
String[] exclusionDependencyStrings = it.name.split(':')
it.from.forEach { parentDependency ->
def dependencyStrings = parentDependency.split(":")
def pomDep = dependencies.children()
.find {
n -> childOf(n as Node, "groupId").text() == dependencyStrings[0] && childOf(n as Node, "artifactId").text() == dependencyStrings[1]
}

Node dependency = pomDep as Node
if (dependency == null) {
dependency = new Node(dependencies, "dependency")
new Node(dependency, "groupId", dependencyStrings[0])
new Node(dependency, "artifactId", dependencyStrings[1])
}

def pomExc = dependency.children().find { n -> childOf(n as Node, "exclusions") }

def exclusions = pomExc as Node
if (exclusions == null) {
exclusions = new Node(dependency, "exclusions")
}
def exclusion = new Node(exclusions, "exclusion")
new Node(exclusion, "groupId", exclusionDependencyStrings[0])
new Node(exclusion, "artifactId", exclusionDependencyStrings[1])
}
}

}
})
})
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.parallel=true
org.gradle.caching=true
version=4.7.3.7
version=4.7.3.8
8 changes: 4 additions & 4 deletions gradle/templates.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ bouncycastle = "1.79"
ch-randelshofer-fastdoubleparser = '1.0.0-oracle-00001'
code-findbugs-jsr305 = '3.0.2-oracle-00001'
code-gson-gson = '2.10.1-oracle-00001'
com-nimbusds-nimbus-jose-jwt = '9.41.2-oracle-00001'
com-nimbusds-nimbus-jose-jwt = '9.37.4-oracle-00001'
com-zaxxer-HikariCP = '6.0.0-oracle-00001'
commons-codec-commons-codec = '1.16.0-oracle-00001'
commons-io-commons-io = '2.14.0-oracle-00002'
Expand Down Expand Up @@ -77,7 +77,7 @@ jakarta-validation-jakarta-validation-api = '3.1.0-oracle-00001'
javax-annotation-javax-annotation-api = '1.3.2-oracle-00001'
json-smart = "2.5.2"
kotlin = "1.8.22-oracle-00001"
logback = "1.5.15-oracle-00001"
logback = "1.5.19-oracle-00001"
logback-contrib = '0.1.5-oracle-00001'
micronaut-cache = "5.1.0-oracle-00001"
micronaut-core = "4.7.27-oracle-00001"
Expand All @@ -100,7 +100,7 @@ micronaut-oracle-cloud = "4.3.8-oracle-00002"
micronaut-picocli = "5.6.0-oracle-00001"
micronaut-platform = "4.7.3-oracle-00001"
micronaut-reactor = "3.6.0-oracle-00001"
micronaut-security = "4.11.2-oracle-00001"
micronaut-security = "4.11.2-oracle-00002"
micronaut-serde = "2.13.0-oracle-00001"
micronaut-servlet = "4.12.0-oracle-00001"
micronaut-session = "4.5.0-oracle-00001"
Expand All @@ -109,7 +109,7 @@ micronaut-tracing = "6.9.0-oracle-00001"
micronaut-validation = "4.8.0-oracle-00001"
micronaut-views = "5.6.0-oracle-00001"
micronaut-coherence = "5.0.5-oracle-00001"
netty = "4.1.127.Final-oracle-00001"
netty = "4.1.128.Final"
okhttp = "4.12.0-oracle-00001"
opentelemetry-instrumentation = '1.33.6-oracle-00001'
opentelemetry-instrumentation-opentelemetry-instrumentation-api-semconv = '1.33.5-alpha-oracle-00001'
Expand Down