Skip to content

Commit 2cb966c

Browse files
acoburnacoburn
committed
Remove deprecated build configuration
1 parent b35cf5c commit 2cb966c

File tree

10 files changed

+75
-71
lines changed

10 files changed

+75
-71
lines changed

‎build.gradle

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
plugins {
2-
id 'com.github.hierynomus.license' version '0.15.0'
32
id 'com.github.ben-manes.versions' version '0.20.0'
4-
id 'net.researchgate.release' version '2.8.0'
3+
id 'com.github.hierynomus.license' version '0.15.0'
54
id 'com.github.kt3k.coveralls' version '2.8.2'
6-
id 'org.sonarqube' version '2.6.2'
5+
id 'net.researchgate.release' version '2.8.0'
76
id 'org.owasp.dependencycheck' version '4.0.2'
7+
id 'org.sonarqube' version '2.6.2'
8+
id 'biz.aQute.bnd.builder' version '4.1.0' apply false
89
}
910

1011
ext {
@@ -35,7 +36,7 @@ ext {
3536
karafVersion = '4.2.1'
3637
osgiVersion = '6.0.0'
3738
osgiCompendiumVersion = '5.0.0'
38-
paxExamVersion = '4.12.0'
39+
paxExamVersion = '4.13.1'
3940
projectOsgiVersion = project.version.replaceAll("-SNAPSHOT", ".SNAPSHOT")
4041

4142
jacocoTestProjects = [
@@ -347,12 +348,12 @@ configure(rootProject) {
347348
}
348349

349350
task jacocoRootReport(type: JacocoReport, dependsOn: jacocoMerge) {
350-
sourceDirectories = files(subprojects
351+
sourceDirectories.from(files(subprojects
351352
.findAll { it.name in jacocoTestProjects }
352-
.sourceSets.main.allSource.srcDirs)
353-
classDirectories = files(subprojects
353+
.sourceSets.main.allSource.srcDirs))
354+
classDirectories.from(files(subprojects
354355
.findAll { it.name in jacocoTestProjects }
355-
.sourceSets.main.output)
356+
.sourceSets.main.output))
356357
executionData jacocoMerge.destinationFile
357358
reports {
358359
html.enabled = true

‎elasticsearch/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-recipes, \
12+
connection=scm:git:https://github.com/trellis-ldp/camel-ldp-recipes.git, \
13+
developerConnection=scm:git:git@github.com:trellis-ldp/camel-ldp-recipes.git
14+

‎elasticsearch/build.gradle

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apply plugin: 'java-library'
2-
apply plugin: 'osgi'
2+
apply plugin: 'biz.aQute.bnd.builder'
33

44
description = 'LDP Elasticsearch integration'
55

@@ -22,19 +22,6 @@ dependencies {
2222
testImplementation("org.apache.camel:camel-test-blueprint:$camelVersion")
2323
}
2424

25-
jar {
26-
manifest {
27-
description project.description
28-
docURL project.docURL
29-
vendor project.vendor
30-
license project.license
31-
32-
instruction 'Automatic-Module-Name', moduleName
33-
instruction 'Import-Package', '*'
34-
instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
35-
}
36-
}
37-
3825
publishing.publications {
3926
maven(MavenPublication) {
4027
artifact ('build/cfg/main/org.trellisldp.ext.elasticsearch.cfg') {

‎ldpath/bnd.bnd

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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-recipes, \
12+
connection=scm:git:https://github.com/trellis-ldp/camel-ldp-recipes.git, \
13+
developerConnection=scm:git:git@github.com:trellis-ldp/camel-ldp-recipes.git
14+
15+
Import-Package: org.apache.marmotta.ldcache.backend.file, \
16+
org.apache.marmotta.ldcache.model, \
17+
org.apache.marmotta.ldcache.services, \
18+
org.apache.marmotta.ldpath.api, \
19+
org.apache.marmotta.ldpath.backend.linkeddata, \
20+
*

‎ldpath/build.gradle

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apply plugin: 'java-library'
2-
apply plugin: 'osgi'
2+
apply plugin: 'biz.aQute.bnd.builder'
33

44
description = 'Trellis LDPath service'
55

@@ -32,25 +32,6 @@ dependencies {
3232
testImplementation("ch.qos.logback:logback-classic:$logbackVersion")
3333
}
3434

35-
jar {
36-
manifest {
37-
description project.description
38-
docURL project.docURL
39-
vendor project.vendor
40-
license project.license
41-
42-
instruction 'Automatic-Module-Name', moduleName
43-
instruction 'Import-Package', '''\
44-
org.apache.marmotta.ldcache.backend.file,
45-
org.apache.marmotta.ldcache.model,
46-
org.apache.marmotta.ldcache.services,
47-
org.apache.marmotta.ldpath.api,
48-
org.apache.marmotta.ldpath.backend.linkeddata,
49-
*'''
50-
instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
51-
}
52-
}
53-
5435
publishing.publications {
5536
maven(MavenPublication) {
5637
artifact ('build/cfg/main/org.trellisldp.ext.ldpath.cfg') {

‎settings.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
enableFeaturePreview('STABLE_PUBLISHING')
21
rootProject.name = 'camel-ldp-recipes'
32
include ':camel-ldp-elasticsearch'
43
include ':camel-ldp-ldpath'

‎triplestore/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-recipes, \
12+
connection=scm:git:https://github.com/trellis-ldp/camel-ldp-recipes.git, \
13+
developerConnection=scm:git:git@github.com:trellis-ldp/camel-ldp-recipes.git
14+

‎triplestore/build.gradle

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apply plugin: 'java-library'
2-
apply plugin: 'osgi'
2+
apply plugin: 'biz.aQute.bnd.builder'
33

44
description = 'LDP Triplestore integration'
55

@@ -23,19 +23,6 @@ dependencies {
2323
testImplementation("org.apache.camel:camel-test-blueprint:$camelVersion")
2424
}
2525

26-
jar {
27-
manifest {
28-
description project.description
29-
docURL project.docURL
30-
vendor project.vendor
31-
license project.license
32-
33-
instruction 'Automatic-Module-Name', moduleName
34-
instruction 'Import-Package', '*'
35-
instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
36-
}
37-
}
38-
3926
publishing.publications {
4027
maven(MavenPublication) {
4128
artifact ('build/cfg/main/org.trellisldp.ext.triplestore.cfg') {

‎websub/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-recipes, \
12+
connection=scm:git:https://github.com/trellis-ldp/camel-ldp-recipes.git, \
13+
developerConnection=scm:git:git@github.com:trellis-ldp/camel-ldp-recipes.git
14+

‎websub/build.gradle

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apply plugin: 'java-library'
2-
apply plugin: 'osgi'
2+
apply plugin: 'biz.aQute.bnd.builder'
33

44
description = 'LDP WebSub integration'
55

@@ -22,19 +22,6 @@ dependencies {
2222
testImplementation("ch.qos.logback:logback-classic:$logbackVersion")
2323
}
2424

25-
jar {
26-
manifest {
27-
description project.description
28-
docURL project.docURL
29-
vendor project.vendor
30-
license project.license
31-
32-
instruction 'Automatic-Module-Name', moduleName
33-
instruction 'Import-Package', '*'
34-
instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
35-
}
36-
}
37-
3825
publishing.publications {
3926
maven(MavenPublication) {
4027
artifact ('build/cfg/main/org.trellisldp.ext.websub.cfg') {

0 commit comments

Comments
 (0)