Skip to content

Commit e40834e

Browse files
Raymond Augémarcphilipp
authored andcommitted
Upgrade to bnd 5.0.0
fixes #2203 Signed-off-by: Raymond Augé <[email protected]> # Conflicts: # buildSrc/build.gradle.kts
1 parent b319475 commit e40834e

File tree

5 files changed

+2
-103
lines changed

5 files changed

+2
-103
lines changed

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ repositories {
1010
dependencies {
1111
implementation(kotlin("gradle-plugin"))
1212
implementation("de.marcphilipp.gradle:nexus-publish-plugin:0.4.0")
13-
implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.1")
13+
implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.0.0")
1414
}

buildSrc/src/main/kotlin/APIGuardianAnnotations.kt

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

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ object Versions {
3535
val jmh = "1.22"
3636
val ktlint = "0.35.0"
3737
val surefire = "2.22.2"
38-
var bnd = "4.3.1"
38+
var bnd = "5.0.0"
3939

4040
}

buildSrc/src/main/kotlin/osgi-conventions.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ tasks.withType<Jar>().matching {
4545
# See https://bnd.bndtools.org/instructions/removeheaders.html
4646
-removeheaders: Private-Package
4747
48-
# Add the custom buildSrc/src/main/kotlin/APIGuardianAnnotations.kt
49-
# plugin to bnd
50-
-plugin.apiguardian.annotations: ${APIGuardianAnnotations::class.qualifiedName}
51-
5248
# Instruct the APIGuardianAnnotations how to operate.
5349
# See https://bnd.bndtools.org/instructions/export-apiguardian.html
5450
-export-apiguardian: *;version=${project.version}

gradle.properties

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
1616
org.gradle.caching=true
1717
org.gradle.parallel=true
1818

19-
# Use this flag so that when compiling against project dependencies
20-
# the jar is created and used instead of using src/main/classes.
21-
#
22-
# See https://docs.gradle.org/current/userguide/java_library_plugin.html#sub:java_library_known_issues_windows_performance
23-
systemProp.org.gradle.java.compile-classpath-packaging=true
24-
2519
# Workaround for https://issues.sonatype.org/browse/NEXUS-21802
2620
# See https://github.com/gradle/gradle/issues/11308 for additional context.
2721
systemProp.org.gradle.internal.publish.checksums.insecure=true

0 commit comments

Comments
 (0)