Skip to content

Commit 64453be

Browse files
committed
Aligned dependencies with CERN internals
1 parent 758680b commit 64453be

File tree

1 file changed

+36
-15
lines changed

1 file changed

+36
-15
lines changed

build.gradle

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ buildscript {
6161

6262
apply plugin: 'java'
6363
apply plugin: 'jacoco'
64-
apply plugin: 'maven'
65-
apply plugin: 'maven-publish'
66-
apply plugin: 'nebula.maven-publish'
67-
apply plugin: 'com.jfrog.bintray'
64+
apply plugin: 'idea'
65+
apply plugin: 'eclipse'
6866

6967
repositories {
7068
if (CERN_VM) {
@@ -77,18 +75,23 @@ repositories {
7775
}
7876

7977
if (DEPLOYMENT) {
78+
apply plugin: 'maven'
79+
apply plugin: 'maven-publish'
80+
apply plugin: 'nebula.maven-publish'
81+
apply plugin: 'com.jfrog.bintray'
82+
8083
println 'Applying deployment scripts'
8184
apply from: './scripts/bintray-deploy.gradle'
8285
}
8386

84-
group 'org.streamingpool'
87+
group 'org.tensorics'
8588

86-
sourceCompatibility = 1.8
89+
sourceCompatibility = JavaVersion.VERSION_1_8
8790

8891
dependencies {
8992
compile 'org.tensorics:tensorics-core:0.+'
90-
compile (group: 'org.springframework.boot', name: 'spring-boot-starter', version: '1.5.2.RELEASE') { exclude module: "spring-boot-starter-logging" }
91-
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.2.RELEASE'
93+
compile (group: 'org.springframework.boot', name: 'spring-boot-starter', version: '1.5.9.RELEASE') { exclude module: "spring-boot-starter-logging" }
94+
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.9.RELEASE'
9295
}
9396

9497
sourceSets {
@@ -100,16 +103,20 @@ sourceSets {
100103

101104
javadoc { options.encoding = "UTF-8" }
102105

103-
task wrapper(type: Wrapper) { gradleVersion = '4.0' }
106+
task wrapper(type: Wrapper) { gradleVersion = '4.8.1' }
104107

105-
task javadocJar(type: Jar) {
106-
classifier = 'javadoc'
107-
from javadoc
108+
if(!project.tasks.findByName("javadocJar")) {
109+
task javadocJar(type: Jar) {
110+
classifier = 'javadoc'
111+
from javadoc
112+
}
108113
}
109114

110-
task sourcesJar(type: Jar) {
111-
classifier = 'sources'
112-
from sourceSets.main.allSource
115+
if(!project.tasks.findByName("sourcesJar")) {
116+
task sourcesJar(type: Jar) {
117+
classifier = 'sources'
118+
from sourceSets.main.allSource
119+
}
113120
}
114121

115122
artifacts { archives javadocJar, sourcesJar }
@@ -122,3 +129,17 @@ jacocoTestReport {
122129
csv.enabled false
123130
}
124131
}
132+
133+
eclipse {
134+
classpath {
135+
downloadJavadoc = true
136+
downloadSources = true
137+
}
138+
}
139+
140+
idea {
141+
module {
142+
downloadJavadoc = true
143+
downloadSources = true
144+
}
145+
}

0 commit comments

Comments
 (0)