Skip to content

Commit a46b760

Browse files
authored
4.7.3.8 release (#60)
1 parent 5d779b1 commit a46b760

File tree

3 files changed

+40
-11
lines changed

3 files changed

+40
-11
lines changed

buildSrc/src/main/groovy/cloud/graal/gdk/pom/GdkParentPlugin.groovy

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,41 @@ abstract class GdkParentPlugin implements Plugin<Project> {
141141
xml.asNode().append(dependencyManagement)
142142

143143
Node dependencies = childOf(dependencyManagement, "dependencies")
144-
Node dependency = new Node(dependencies, "dependency", "")
145-
new Node(dependency, "groupId", "cloud.graal.gdk")
146-
new Node(dependency, "artifactId", "gdk-bom")
147-
new Node(dependency, "version", project.version)
148-
new Node(dependency, "type", "pom")
149-
new Node(dependency, "scope", "import")
144+
Node gdkBomDependency = new Node(dependencies, "dependency", "")
145+
new Node(gdkBomDependency, "groupId", "cloud.graal.gdk")
146+
new Node(gdkBomDependency, "artifactId", "gdk-bom")
147+
new Node(gdkBomDependency, "version", project.version)
148+
new Node(gdkBomDependency, "type", "pom")
149+
new Node(gdkBomDependency, "scope", "import")
150+
151+
dependencyExclusion.exclusions.forEach {
152+
String[] exclusionDependencyStrings = it.name.split(':')
153+
it.from.forEach { parentDependency ->
154+
def dependencyStrings = parentDependency.split(":")
155+
def pomDep = dependencies.children()
156+
.find {
157+
n -> childOf(n as Node, "groupId").text() == dependencyStrings[0] && childOf(n as Node, "artifactId").text() == dependencyStrings[1]
158+
}
159+
160+
Node dependency = pomDep as Node
161+
if (dependency == null) {
162+
dependency = new Node(dependencies, "dependency")
163+
new Node(dependency, "groupId", dependencyStrings[0])
164+
new Node(dependency, "artifactId", dependencyStrings[1])
165+
}
166+
167+
def pomExc = dependency.children().find { n -> childOf(n as Node, "exclusions") }
168+
169+
def exclusions = pomExc as Node
170+
if (exclusions == null) {
171+
exclusions = new Node(dependency, "exclusions")
172+
}
173+
def exclusion = new Node(exclusions, "exclusion")
174+
new Node(exclusion, "groupId", exclusionDependencyStrings[0])
175+
new Node(exclusion, "artifactId", exclusionDependencyStrings[1])
176+
}
177+
}
178+
150179
}
151180
})
152181
})

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
org.gradle.parallel=true
22
org.gradle.caching=true
3-
version=4.7.3.7
3+
version=4.7.3.8

gradle/templates.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bouncycastle = "1.79"
2727
ch-randelshofer-fastdoubleparser = '1.0.0-oracle-00001'
2828
code-findbugs-jsr305 = '3.0.2-oracle-00001'
2929
code-gson-gson = '2.10.1-oracle-00001'
30-
com-nimbusds-nimbus-jose-jwt = '9.41.2-oracle-00001'
30+
com-nimbusds-nimbus-jose-jwt = '9.37.4-oracle-00001'
3131
com-zaxxer-HikariCP = '6.0.0-oracle-00001'
3232
commons-codec-commons-codec = '1.16.0-oracle-00001'
3333
commons-io-commons-io = '2.14.0-oracle-00002'
@@ -77,7 +77,7 @@ jakarta-validation-jakarta-validation-api = '3.1.0-oracle-00001'
7777
javax-annotation-javax-annotation-api = '1.3.2-oracle-00001'
7878
json-smart = "2.5.2"
7979
kotlin = "1.8.22-oracle-00001"
80-
logback = "1.5.15-oracle-00001"
80+
logback = "1.5.19-oracle-00001"
8181
logback-contrib = '0.1.5-oracle-00001'
8282
micronaut-cache = "5.1.0-oracle-00001"
8383
micronaut-core = "4.7.27-oracle-00001"
@@ -100,7 +100,7 @@ micronaut-oracle-cloud = "4.3.8-oracle-00002"
100100
micronaut-picocli = "5.6.0-oracle-00001"
101101
micronaut-platform = "4.7.3-oracle-00001"
102102
micronaut-reactor = "3.6.0-oracle-00001"
103-
micronaut-security = "4.11.2-oracle-00001"
103+
micronaut-security = "4.11.2-oracle-00002"
104104
micronaut-serde = "2.13.0-oracle-00001"
105105
micronaut-servlet = "4.12.0-oracle-00001"
106106
micronaut-session = "4.5.0-oracle-00001"
@@ -109,7 +109,7 @@ micronaut-tracing = "6.9.0-oracle-00001"
109109
micronaut-validation = "4.8.0-oracle-00001"
110110
micronaut-views = "5.6.0-oracle-00001"
111111
micronaut-coherence = "5.0.5-oracle-00001"
112-
netty = "4.1.127.Final-oracle-00001"
112+
netty = "4.1.128.Final"
113113
okhttp = "4.12.0-oracle-00001"
114114
opentelemetry-instrumentation = '1.33.6-oracle-00001'
115115
opentelemetry-instrumentation-opentelemetry-instrumentation-api-semconv = '1.33.5-alpha-oracle-00001'

0 commit comments

Comments
 (0)