Skip to content

Commit 31a4480

Browse files
committed
Remove deprecated build configurations
1 parent 21daad0 commit 31a4480

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

bnd.bnd

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Automatic-Module-Name: ${project.ext.moduleName}
2+
Export-Package: ${project.ext.moduleName}
3+
4+
Bundle-Vendor: ${project.vendor}
5+
Bundle-Version: ${project.version}
6+
Bundle-License: ${project.license}
7+
Bundle-DocURL: ${project.docURL}
8+
Bundle-Description: ${project.description}
9+
Bundle-Name: ${project.name}
10+
Bundle-SymbolicName: ${project.group}.${project.name}
11+
Bundle-SCM: url=https://github.com/trellis-ldp/camel-ldp, \
12+
connection=scm:git:https://github.com/trellis-ldp/camel-ldp.git, \
13+
developerConnection=scm:git:[email protected]:trellis-ldp/camel-ldp.git
14+

build.gradle

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
plugins {
2-
id 'com.github.hierynomus.license' version '0.14.0'
2+
id 'biz.aQute.bnd.builder' version '4.1.0'
33
id 'com.github.ben-manes.versions' version '0.20.0'
4-
id 'net.researchgate.release' version '2.8.0'
4+
id 'com.github.hierynomus.license' version '0.14.0'
55
id 'com.github.kt3k.coveralls' version '2.8.2'
6+
id 'net.researchgate.release' version '2.8.0'
67
id 'org.sonarqube' version '2.6.2'
78
}
89

910
apply plugin: 'maven'
10-
apply plugin: 'osgi'
11+
apply plugin: 'biz.aQute.bnd.builder'
1112
apply plugin: 'java-library'
1213
apply plugin: 'maven-publish'
1314
apply plugin: 'signing'
@@ -25,7 +26,7 @@ ext {
2526
moduleName = 'org.trellisldp.camel'
2627
vendor = 'Trellis LDP'
2728
homepage = 'https://www.trellisldp.org'
28-
docURL = 'https://trellis-ldp.github.io/trellis/apidocs/'
29+
docURL = 'https://trellis-ldp.github.io/camel-ldp/'
2930
license = 'Apache 2'
3031

3132
/* Dependencies */
@@ -85,16 +86,6 @@ jar {
8586
from ("$rootDir/LICENSE") {
8687
into "META-INF"
8788
}
88-
manifest {
89-
description project.description
90-
docURL project.docURL
91-
vendor project.vendor
92-
license project.license
93-
94-
instruction 'Automatic-Module-Name', moduleName
95-
instruction 'Import-Package', '*'
96-
instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
97-
}
9889
}
9990

10091
task sourceJar(type: Jar) {
@@ -213,7 +204,7 @@ processResources {
213204
}
214205

215206
signing {
216-
required { !version.endsWith("SNAPSHOT") && gradle.taskGraph.hasTask("uploadArchives") }
207+
required { !version.endsWith("SNAPSHOT") && gradle.taskGraph.hasTask("publish") }
217208
sign publishing.publications
218209
}
219210

@@ -257,7 +248,7 @@ task docs(type: Javadoc) {
257248
outputs.upToDateWhen { false }
258249
source sourceSets.main.allJava
259250
classpath = files(sourceSets.main.compileClasspath)
260-
destinationDir = new File(projectDir, "docs/${version}")
251+
destinationDir = new File(projectDir, "docs")
261252
options {
262253
links "http://docs.oracle.com/javase/8/docs/api/"
263254
}

settings.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
enableFeaturePreview('STABLE_PUBLISHING')
21
rootProject.name = 'camel-ldp'

0 commit comments

Comments
 (0)