Skip to content

Commit 048d8d7

Browse files
greek1979Leonid Malikov
andauthored
Replace Gradle OSGi plugin for BND build tools (#730)
* Swap out JCenter for Maven Central and Gradle repos * Deprecate use of OSGi Gradle plugin Co-authored-by: Leonid Malikov <[email protected]>
1 parent 78a9420 commit 048d8d7

File tree

5 files changed

+23
-16
lines changed

5 files changed

+23
-16
lines changed

build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
buildscript {
22
repositories {
3-
jcenter()
3+
mavenCentral()
4+
maven {
5+
url "https://plugins.gradle.org/m2/"
6+
}
47
}
58
dependencies {
69
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.0'
7-
classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
10+
classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
11+
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0'
812
}
913
}
1014

@@ -47,7 +51,7 @@ allprojects {
4751
subprojects {
4852
apply plugin: 'java'
4953
apply plugin: 'signing'
50-
apply plugin: 'osgi'
54+
apply plugin: 'biz.aQute.bnd.builder'
5155

5256
sourceCompatibility = 1.8
5357
targetCompatibility = 1.8

gradle/binaryCompatibility.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ import groovy.text.markup.TemplateConfiguration
2121
buildscript {
2222
// this block should not be necessary, but for some reason it fails without!
2323
repositories {
24-
jcenter()
24+
mavenCentral()
25+
maven {
26+
url "https://plugins.gradle.org/m2/"
27+
}
2528
}
2629

2730
dependencies {

json-path-assert/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ description = "Assertions on Json using JsonPath"
44

55
jar {
66
baseName 'json-path-assert'
7-
manifest {
8-
attributes 'Implementation-Title': 'json-path-assert', 'Implementation-Version': version
9-
}
7+
bnd (
8+
'Implementation-Title': 'json-path-assert', 'Implementation-Version': version
9+
)
1010
}
1111

1212
dependencies {

json-path-web-test/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ task createBuildInfoFile {
1818
jar {
1919
dependsOn createBuildInfoFile
2020
baseName 'json-path-web-test'
21-
manifest {
22-
attributes 'Implementation-Title': 'json-path-web-test',
23-
'Implementation-Version': version,
24-
'Main-Class': mainClassName
25-
}
21+
bnd (
22+
'Implementation-Title': 'json-path-web-test',
23+
'Implementation-Version': version,
24+
'Main-Class': mainClassName
25+
)
2626
}
2727

2828

json-path/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ description = "Java port of Stefan Goessner JsonPath."
44

55
jar {
66
baseName 'json-path'
7-
manifest {
8-
attributes 'Implementation-Title': 'json-path', 'Implementation-Version': version
9-
instruction 'Import-Package', 'org.json.*;resolution:=optional', 'com.google.gson.*;resolution:=optional', 'com.fasterxml.jackson.*;resolution:=optional', 'org.apache.tapestry5.json.*;resolution:=optional', 'org.codehaus.jettison.*;resolution:=optional', '*'
10-
}
7+
bnd (
8+
'Implementation-Title': 'json-path', 'Implementation-Version': version,
9+
'Import-Package': 'org.json.*;resolution:=optional, com.google.gson.*;resolution:=optional, com.fasterxml.jackson.*;resolution:=optional, org.apache.tapestry5.json.*;resolution:=optional, org.codehaus.jettison.*;resolution:=optional, *'
10+
)
1111
}
1212

1313
dependencies {

0 commit comments

Comments
 (0)