Skip to content

Commit 7febce6

Browse files
andreacaliaandreacalia
committed
bintray deployment
1 parent 384e4bd commit 7febce6

9 files changed

+171
-249
lines changed

‎.travis.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@ addons:
66
apt:
77
packages:
88
- oracle-java8-installer
9-
env:
10-
global:
11-
- GH_REF: github.com/tensorics/tensorics-core.git
12-
- secure: 0UbgpdALG1DKxB/UgyimwADcWliOt52iWCkahUFv2v2u9R8B/Vn8f9d4HOiKrVxuu1q38Hwimkse/+r5a2IFroJCFQk+R0D8gc61GeKFlwN+dkNJ/CSVF17LehnA0vPkFSTvfAjqkhiOZUcTxdEKz97aAaFN5Wr2n8GpXzhIK59LC2hL8uF87NbTS2UXzrIErEUfqfX/dul0AnSKD9ZmTUDEmQDEvnutMhcqLFw1ED9N8wcSEfqu05/GGQeC1SjYwK+PT6nHSGSiEulPI4odsFGObmC8GeyAn6F+lg8AiUwJ8zWzWGXKsIO8ngohWpRC0TUu164IeB9fm2zXDHH9Rg2cK1d7P3xUu5ohRY5tH7YCJg33Ixv7FD3E/oH592TarKD42dsk19f/5sZtqVCJ0/A0NzFoLdLzaZNJpWEI6wnF7B9j8mIYWcsKpWUcxzvgSw/ZvVvcQYBiroD4UGeHs+LNJsYwN3+fzfMa1LUxDik/qe/+mzJfHRl2jBA06WlCqNgDSQ62MLNvHdLQvLOblkYxDyzrZv3VNIQ65ec9MmhCd5nD6QPiTP/TWl2eXYlZACWMIkJaRAEFbX6kZsym7f180NQjSeS2fPPG2rmYXL7z6Ygg2NPAbLt/pOVjpKwKSe4g3B1o396y+TfZfDhH/RBeugu9BWDh9OAe649sQQY=
13-
- secure: v8X4M0kGy5EF0m3fwEkJzscWYZyW7tMEHpSkPVff7WRkiu9AR/koKWnKQZnK9CNOFNbHUVTQXCOwZ2dS31erbH6u0J6XuSyJWgGr+abvDFsHfNNrmJH3WMSSYe8qnG/x8zVuQtcZQVd0DA2+bfX+wl5zxYb3qBKwulrTL3z+cGC0N/ik/exucMeU5IpwhMa24MUhnVKzeX3Qyzy2u4k79qS9nV/spkqFNeTJ0IPxtkBWru1JcbAUobERjv9FrV/ZjKRByAAskgFBogms0UvwYCwKSWY7L/LACywfMAzAQLJSY+k6JP6V/xdR+sK5gntgp19To0bhC2jDKlEHDJR4RksvLVYg8f7vtq1Uqsrvy7mFScQuRmMSIBzRxDhj3ajK+csnprMvoEltC9GVlN+CH7IfNJTK3rD3dYshkxCKDFWGf21IrCMNhMnXyeZwSDbjA0/u6/zva/33xCP2KxWiKvR9c/X9DYyevPO/ZDkhvvaYePZOQsRjGLbjodpjWHkZxElsTstPAmTLDEPRgaW/ThOOdFqiEi0JMMhGSl0Xusg0EciT0P3l9bPUCEGIe0/XbBZwkDu5zjKHHhW9JHZn4bo9y5+38Fq3LYCBL7dCIyLkRgSsMzKmqLz69apKKI2krC33NxaWtvP4MuEXJKPVh/Yf5pCXxmNa5k9y01MW8tA=
9+
before_install:
10+
- chmod +x ./gradlew
1411
deploy:
1512
provider: script
1613
skip_cleanup: true
17-
script: /bin/sh ./scripts/deploy-jars.sh
14+
script: ./gradlew bintrayUpload -Ddeployment=true
1815
on:
1916
tags: true
20-
17+
script:
18+
- ./gradlew check
19+
- ./gradlew jacocoTestReport
2120
after_success:
22-
- ./gradlew cobertura
2321
- bash <(curl -s https://codecov.io/bash)

‎build.gradle

+84-49
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,88 @@
1-
apply plugin: 'java'
2-
apply plugin: 'maven'
3-
apply plugin: 'signing'
4-
5-
if (System.getenv('BUILD_SERVER')) {
6-
apply from : './scripts/cern-configuration.gradle'
7-
}
8-
91
buildscript {
2+
project.ext.CERN_VM = System.getProperty('CERN_TECHNET_VM') ?: System.getenv('CERN_TECHNET_VM') ?: false
3+
project.ext.TRAVIS_CI = System.getProperty('TRAVIS') ?: System.getenv('TRAVIS') ?: false
4+
project.ext.DEPLOYMENT = System.getProperty('deployment') ?: false
5+
project.ext.VCS_TAG = System.getProperty('TRAVIS_TAG') ?: System.getenv('TRAVIS_TAG')
6+
project.ext.POM = [
7+
groupId : 'org.tensorics',
8+
artifactId : 'tensorics-core',
9+
description: 'Tensorics is a java framework which uses a tensor as a central object. A tensor represents a set of values placed in an N-dimensional space. Wherever you are tempted to use maps of maps, a tensor might be a good choice ;-) Tensorics provides methods to create, transform and performing calculations with those tensors.',
10+
developers : [
11+
[
12+
id : 'kaifox',
13+
name : 'Kajetan Fuchsberger',
14+
email: '[email protected]'
15+
],
16+
[
17+
id : 'agorzawski',
18+
name : 'Arek Gorzawski',
19+
email: '[email protected]'
20+
],
21+
[
22+
id : 'michi42',
23+
name : 'Michi Hostettler',
24+
email: '[email protected]'
25+
],
26+
[
27+
id : 'andreacalia',
28+
name : 'Andrea Calia',
29+
email: '[email protected]'
30+
]
31+
]]
32+
project.ext.INFO = [
33+
repo : 'https://github.com/tensorics/tensorics-core.git',
34+
url : 'http://tensorics.org/',
35+
github : 'https://github.com/tensorics/tensorics-core',
36+
githubIssues: 'https://github.com/tensorics/tensorics-core/issues'
37+
]
38+
project.ext.BINTRAY = [
39+
repo : 'tensorics-repo',
40+
name : 'org.tensorics:tensorics-core',
41+
organization: 'tensorics',
42+
userName : 'tensorics-dev',
43+
apiToken : System.getenv('BINTRAY_API_TOKEN')
44+
]
45+
1046
repositories {
11-
if (System.getenv('BUILD_SERVER') || System.getProperty('CERN_TECHNET_VM')) {
12-
maven {
13-
url 'http://artifactory.cern.ch/repo'
14-
}
15-
maven {
16-
url 'http://artifactory.cern.ch/jcenter'
17-
}
47+
if (CERN_VM) {
48+
maven { url 'http://artifactory.cern.ch/repo' }
49+
maven { url 'http://artifactory.cern.ch/jcenter' }
1850
} else {
1951
mavenCentral()
2052
jcenter()
2153
}
2254
}
23-
2455
dependencies {
25-
classpath 'net.saliman:gradle-cobertura-plugin:2.4.0'
26-
classpath 'org.ow2.asm:asm:5.0.3'
27-
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3"
56+
classpath 'com.netflix.nebula:nebula-publishing-plugin:5.1.0'
57+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
2858
}
2959
}
3060

61+
apply plugin: 'java'
62+
apply plugin: 'jacoco'
63+
apply plugin: 'maven'
64+
apply plugin: 'maven-publish'
65+
apply plugin: 'nebula.maven-publish'
66+
apply plugin: 'com.jfrog.bintray'
67+
3168
repositories {
32-
if (System.getenv('BUILD_SERVER') || System.getProperty('CERN_TECHNET_VM')) {
33-
maven {
34-
url 'http://artifactory.cern.ch/repo'
35-
}
36-
maven {
37-
url 'http://artifactory.cern.ch/jcenter'
38-
}
69+
if (CERN_VM) {
70+
maven { url 'http://artifactory.cern.ch/repo' }
71+
maven { url 'http://artifactory.cern.ch/jcenter' }
3972
} else {
4073
mavenCentral()
4174
jcenter()
4275
}
4376
}
4477

45-
if(System.getenv('TRAVIS')){
46-
apply plugin: 'cobertura'
47-
48-
apply plugin: 'io.codearte.nexus-staging'
49-
apply from : './scripts/deploy.gradle'
50-
51-
cobertura.coverageFormats = ['html', 'xml']
52-
cobertura.coverageSourceDirs = sourceSets.main.java.srcDirs
78+
if (DEPLOYMENT) {
79+
println 'Applying deployment scripts'
80+
apply from: './scripts/bintray-deploy.gradle'
5381
}
5482

83+
group 'org.streamingpool'
5584

56-
sourceSets {
57-
main { java { srcDir 'src/java' } }
58-
test {
59-
java {
60-
srcDir 'src/examples'
61-
srcDir 'src/test'
62-
}
63-
}
64-
}
85+
sourceCompatibility = 1.8
6586

6687
dependencies {
6788
compile 'org.jscience:jscience:4.3.1'
@@ -76,17 +97,22 @@ dependencies {
7697
testCompile 'org.assertj:assertj-core:3.6.1'
7798
}
7899

79-
if (JavaVersion.current().isJava8Compatible()) {
80-
allprojects {
81-
tasks.withType(Javadoc) {
82-
options.addStringOption('Xdoclint:none', '-quiet')
100+
sourceSets {
101+
main {
102+
java {
103+
srcDir 'src/java'
104+
}
105+
}
106+
test {
107+
java {
108+
srcDir 'src/test'
83109
}
84110
}
85111
}
86112

87-
javadoc { options.encoding = "UTF-8" }
113+
javadoc { options.encoding = "UTF-8" }
88114

89-
task wrapper(type: Wrapper) { gradleVersion = '2.14.1' }
115+
task wrapper(type: Wrapper) { gradleVersion = '4.0' }
90116

91117
task javadocJar(type: Jar) {
92118
classifier = 'javadoc'
@@ -99,3 +125,12 @@ task sourcesJar(type: Jar) {
99125
}
100126

101127
artifacts { archives javadocJar, sourcesJar }
128+
129+
jacocoTestReport {
130+
reports {
131+
xml.enabled true
132+
xml.destination new File("${buildDir}/reports/jacoco/report.xml")
133+
html.enabled true
134+
csv.enabled false
135+
}
136+
}

‎deployment.key.enc

-2.58 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.jar

-232 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Fri Jul 29 14:11:01 CEST 2016
1+
#Sat Jul 01 09:28:40 CEST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME

‎scripts/bintray-deploy.gradle

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
project.ext.getDeploymentVersion = {
2+
String tmpDeploymentVersion = VCS_TAG.replaceFirst("v", "");
3+
if (!tmpDeploymentVersion.matches("\\d+\\.\\d+\\.\\d+")) {
4+
throw new RuntimeException("Version is not valid. Correct format is like 1.0.2 but was " + tmpDeploymentVersion)
5+
}
6+
return tmpDeploymentVersion;
7+
}
8+
9+
bintrayUpload.doFirst {
10+
println "Deploying version ${getDeploymentVersion()} from vscTag ${VCS_TAG}"
11+
}
12+
13+
bintray {
14+
user = "${BINTRAY.userName}"
15+
key = "${BINTRAY.apiToken}"
16+
17+
publications = ['nebula']
18+
// When uploading Maven-based publication files. Nebula is because we're using the netflix plugins and they use nebula as default name for a publication
19+
dryRun = !DEPLOYMENT // Whether to run this as dry-run, without deploying
20+
publish = DEPLOYMENT // Whether version should be auto published after an upload
21+
override = false // Whether to override version artifacts already published
22+
23+
pkg {
24+
repo = "${BINTRAY.repo}"
25+
name = "${BINTRAY.name}"
26+
userOrg = "${BINTRAY.organization}"
27+
websiteUrl = "${INFO.github}"
28+
issueTrackerUrl = "${INFO.githubIssues}"
29+
vcsUrl = "${INFO.repo}"
30+
licenses = ['Apache-2.0']
31+
32+
version {
33+
name = getDeploymentVersion()
34+
released = new Date()
35+
vcsTag = VCS_TAG
36+
gpg { sign = true }
37+
}
38+
}
39+
}
40+
41+
def pomExtraInfo = {
42+
url INFO.url
43+
scm {
44+
connection "scm:git:${INFO.repo}"
45+
developerConnection "scm:git:${INFO.repo}"
46+
url "${INFO.repo}"
47+
}
48+
licenses {
49+
license {
50+
name 'The Apache License, Version 2.0'
51+
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
52+
}
53+
}
54+
developers {
55+
POM.developers.each { dev ->
56+
developer {
57+
id dev.id
58+
name dev.name
59+
email dev.email
60+
}
61+
}
62+
}
63+
}
64+
65+
publishing {
66+
publications {
67+
nebula(MavenPublication) {
68+
groupId POM.groupId
69+
artifactId POM.artifactId
70+
version getDeploymentVersion()
71+
72+
description POM.description
73+
74+
artifact sourcesJar
75+
artifact javadocJar
76+
77+
pom.withXml { asNode().children().last() + pomExtraInfo }
78+
}
79+
}
80+
}

‎scripts/cern-configuration.gradle

-67
This file was deleted.

‎scripts/deploy-jars.sh

-11
This file was deleted.

0 commit comments

Comments
 (0)