Skip to content

Commit d568cc6

Browse files
authored
4.9.1.4 release (#61)
1 parent ebca678 commit d568cc6

File tree

4 files changed

+42
-13
lines changed

4 files changed

+42
-13
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.gradle.parallel=true
22
org.gradle.caching=true
33
projectGroup=cloud.graal.gdk
4-
version=4.9.1.3
5-
org.gradle.daemon=false
4+
version=4.9.1.4
5+
org.gradle.daemon=false

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616

1717
[versions]
1818
bouncycastle = '1.81'
19-
gcp = '26.10.0'
19+
gcp = '26.48.0'
2020
jansi = '2.4.2'
2121
jline = '3.30.4'
2222
jsch = '0.2.26'
23+
micronaut-guides = '0.1.0'
24+
micronaut-internal-build = '7.5.0'
2325
micronaut-plugins = '4.5.4'
2426
micronaut-starter = '4.9.1'
2527
reflections = '0.10.2'
@@ -28,8 +30,6 @@ shadow = '8.3.7'
2830
spotless = '6.25.0'
2931
test-logger = '4.0.0'
3032
tomlj = '1.1.1'
31-
micronaut-internal-build = '7.5.0'
32-
micronaut-guides = '0.1.0'
3333

3434
[libraries]
3535
bouncycastle-bcpkix = { module = 'org.bouncycastle:bcpkix-jdk18on', version.ref = 'bouncycastle' }

gradle/templates.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jakarta-transaction-jakarta-transaction-api = '2.0.1-oracle-00001'
5757
jakarta-validation-jakarta-validation-api = '3.1.1-oracle-00001'
5858
json-smart = "2.5.2"
5959
kotlin = "1.8.22-oracle-00001"
60-
logback = "1.5.18-oracle-00001"
60+
logback = "1.5.19-oracle-00001"
6161
logback-contrib = '0.1.5-oracle-00001'
6262
micronaut-cache = "5.3.0-oracle-00001"
6363
micronaut-core = "4.9.11-oracle-00001"
@@ -90,7 +90,7 @@ micronaut-tracing = "7.1.2-oracle-00001"
9090
micronaut-validation = "4.10.0-oracle-00001"
9191
micronaut-views = "5.8.0-oracle-00001"
9292
micronaut-coherence = "5.0.6-oracle-00001"
93-
netty = "4.2.5.Final-oracle-00001"
93+
netty = "4.2.7.Final"
9494
okhttp = "4.12.0-oracle-00001"
9595
opentelemetry-api-incubator = "2.16.0-alpha-oracle-00001"
9696
opentelemetry-instrumentation = '2.16.0-oracle-00001'

0 commit comments

Comments
 (0)