Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Gradle OSGi plugin for BND build tools #730

Merged
merged 2 commits into from Jun 2, 2021
Merged

Replace Gradle OSGi plugin for BND build tools #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f563a6
Swap out JCenter for Maven Central and Gradle repos
Jun 2, 2021
7bdda29
Deprecate use of OSGi Gradle plugin
Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions build.gradle
View file
Open in desktop
@@ -1,10 +1,14 @@
buildscript {
repositories {
jcenter()
mavenCentral()
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.0'
classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0'
}
}

Expand Down Expand Up @@ -47,7 +51,7 @@ allprojects {
subprojects {
apply plugin: 'java'
apply plugin: 'signing'
apply plugin: 'osgi'
apply plugin: 'biz.aQute.bnd.builder'

sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand Down
5 changes: 4 additions & 1 deletion gradle/binaryCompatibility.gradle
View file
Open in desktop
Expand Up @@ -21,7 +21,10 @@ import groovy.text.markup.TemplateConfiguration
buildscript {
// this block should not be necessary, but for some reason it fails without!
repositories {
jcenter()
mavenCentral()
maven {
url "https://plugins.gradle.org/m2/"
}
}

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions json-path-assert/build.gradle
View file
Open in desktop
Expand Up @@ -4,9 +4,9 @@ description = "Assertions on Json using JsonPath"

jar {
baseName 'json-path-assert'
manifest {
attributes 'Implementation-Title': 'json-path-assert', 'Implementation-Version': version
}
bnd (
'Implementation-Title': 'json-path-assert', 'Implementation-Version': version
)
}

dependencies {
Expand Down
10 changes: 5 additions & 5 deletions json-path-web-test/build.gradle
View file
Open in desktop
Expand Up @@ -18,11 +18,11 @@ task createBuildInfoFile {
jar {
dependsOn createBuildInfoFile
baseName 'json-path-web-test'
manifest {
attributes 'Implementation-Title': 'json-path-web-test',
'Implementation-Version': version,
'Main-Class': mainClassName
}
bnd (
'Implementation-Title': 'json-path-web-test',
'Implementation-Version': version,
'Main-Class': mainClassName
)
}


Expand Down
8 changes: 4 additions & 4 deletions json-path/build.gradle
View file
Open in desktop
Expand Up @@ -4,10 +4,10 @@ description = "Java port of Stefan Goessner JsonPath."

jar {
baseName 'json-path'
manifest {
attributes 'Implementation-Title': 'json-path', 'Implementation-Version': version
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', '*'
}
bnd (
'Implementation-Title': 'json-path', 'Implementation-Version': version,
'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, *'
)
}

dependencies {
Expand Down