Skip to content

Commit bad7652

Browse files
authored
fix invalid POM file and optional dependencies (#1524)
1 parent 63f616b commit bad7652

File tree

7 files changed

+83
-144
lines changed

7 files changed

+83
-144
lines changed

aws-advanced-jdbc-wrapper-bundle/build.gradle.kts

Lines changed: 0 additions & 72 deletions
This file was deleted.

aws-advanced-jdbc-wrapper-bundle/gradle.properties

Lines changed: 0 additions & 16 deletions
This file was deleted.

build.gradle.kts

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.github.vlsi.gradle.dsl.configureEach
1818
import com.github.vlsi.gradle.properties.dsl.props
1919
import software.amazon.jdbc.buildtools.JavaCommentPreprocessorTask
20-
import com.github.vlsi.gradle.publishing.dsl.simplifyXml
2120

2221
plugins {
2322
java
@@ -88,6 +87,16 @@ allprojects {
8887
)
8988
}
9089

90+
java {
91+
registerFeature("optional") {
92+
usingSourceSet(sourceSets.getByName("main"))
93+
}
94+
registerFeature("federatedAuthBundle") {
95+
usingSourceSet(sourceSets.getByName("main"))
96+
disablePublication()
97+
}
98+
}
99+
91100
publishing {
92101
publications {
93102
if (project.props.bool("nexus.publish", default = false)) {
@@ -100,7 +109,6 @@ allprojects {
100109
suppressAllPomMetadataWarnings()
101110

102111
pom {
103-
simplifyXml()
104112
name.set("AWS Advanced JDBC Wrapper")
105113
description.set(
106114
project.description ?: "Amazon Web Services (AWS) Advanced JDBC Wrapper"
@@ -129,22 +137,6 @@ allprojects {
129137
system.set("GitHub issues")
130138
url.set("https://github.com/aws/aws-advanced-jdbc-wrapper/issues")
131139
}
132-
133-
// Remove dependencies
134-
withXml {
135-
val sb = asString()
136-
var s = sb.toString()
137-
s = s.replace(
138-
Regex(
139-
"<dependency>.*?</dependency>",
140-
RegexOption.DOT_MATCHES_ALL
141-
),
142-
""
143-
)
144-
sb.setLength(0)
145-
sb.append(s)
146-
asNode()
147-
}
148140
}
149141
}
150142

0 commit comments

Comments
 (0)