Skip to content

Commit 32b56ba

Browse files
committed
build: use nexus sonatype for release process
1 parent 63facc5 commit 32b56ba

File tree

5 files changed

+52
-172
lines changed

5 files changed

+52
-172
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,6 @@ docs/build
4848
**/.classpath
4949
**/.project
5050
**/.settings
51-
**/bin
51+
**/bin
52+
53+
web3j.asc

.travis.yml

+15-11
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@ jobs:
1717
script: "./gradlew spotlessCheck check jacocoTestReport"
1818
if: type = pull_request
1919
- stage: build master
20-
script: "./gradlew spotlessCheck check jacocoTestReport release -PossrhRepoUrl=${SNAPSHOT_OSSRH_REPO_URL}"
20+
script: "./gradlew spotlessCheck check jacocoTestReport release"
2121
if: branch = master AND NOT type = pull_request
22-
- stage: build release
22+
- stage: build and stage release
2323
if: branch =~ /release/
24-
script: "./gradlew check release -Pversion=${TRAVIS_BRANCH#'release/'} -PossrhRepoUrl=${RELEASE_OSSRH_REPO_URL}"
24+
script: "./gradlew check uploadArchives -Pversion=${TRAVIS_BRANCH#'release/'}"
25+
- stage: build and stage release
26+
if: branch =~ /release/
27+
script: "./gradlew closeAndReleaseRepository"
2528
- stage: github release
2629
if: branch =~ /release/
2730
script: "./gradlew check -Pversion=${TRAVIS_BRANCH#'release/'} && ./scripts/github-release.sh"
@@ -35,11 +38,12 @@ after_success:
3538
- bash <(curl -s https://codecov.io/bash)
3639
env:
3740
global:
38-
- SNAPSHOT_OSSRH_REPO_URL: https://oss.sonatype.org/content/repositories/snapshots/
39-
- RELEASE_OSSRH_REPO_URL: https://oss.sonatype.org/service/local/staging/deploy/maven2
40-
- secure: NWZv4VVCSjiSG44p8GkHKEzLlHbE7xyy9zOeJGkWxY2ODFsDUFsjCyK4gyE45ULAkYJ1jRybcfjqjsAnnfmkyDJuNr1R/h5pmFC2J0tgF0efmZwRsvOA2wv5MLuf2Qk0xvjHdtUGjamhlndoSVc9I4PB08+YcQXM7xPhOzUa7Usvw4ADObe3bdCZ1Bj4QvthyxmH561d4h4R5cYdIvMxQ8M+K3aCqc2LcLsPWPe26KV64V2C7f3twI6OV/+gsTI1Tw//gx7+Knl6u3iEnV7PDicSYpsV51allkzfBwH7xkMXxSCamHOYzlPoqrRRs92mO/spaOn5qDLMXP2pK6njOgM+XFtMUydf0NJ3wsyVq6HjAQEbK2NYKnkMvp8kpukrvx3l8hBxx2HcomVN/XFb54dLOXQzi3x9JpcID/OO9gKjD/gDjhRdM9LXhxqasZUhHChGxvyB0REWYxv8z94P4lx8pYIcpWJ43t5T1gCNF8SeZefKgFX6LyQAoKOxnuiANSEvBxeGyAFQK1xsyurpnV5m1CDiSMy2y2sKOhL1KP7/0YPgv4n05wNjJMdU11ly8SXK3Y+iyL1uve/aheo/BZIKonleIYWrgjLwMg7y0phT0X5DgL/tclyFRpgoTfz3byN7wMbRf54JpFi3YGi1uq3B6hP5qwquc7UqPTO3jkE=
41-
- secure: CAOvGz1TWCeL91sYO0fyyn6/tRff7+HbcVB09iqnONRJaKB7Xn/ZKd3vfMtAB24Cic5fZ84jO06Uq9L9cnbY0kPU1PRkdH5LwAn2qhd/qQg0qN3c6UR3fc2Ba44+aER9rwZs2iXlDtBoDsaSBAnmhPRbuRXZoH92KYgO9ZFs3mxiMJFCHu1PUnHoqbP/Av8AApY81wMVMY/f5eZNTvPKFgjw/D7DdvD1Rgmo6VmT0Dpt+mwFaLpmDj/hRg7VGEELT1pC6WcyfoI3+d7ioto8IBzoWbWlugZNfWB63NJVJB/DlkAkRLxRpBlExlCUB8j0f333Y3PbvqVNxRr9EgwM8QQXHLVc0S8lLCI6BWtZAVlglEM9pEYC2Iz+5pdAnTajIm5C5m3t3xwKhlEkkpetaOXqa6d6sRLLzKMDr9J+YP41K3rv3EDhm2wuOJDmggcFUAg8IFKxF8CxPabn4t8YODniaueAnMY0XAPZOSj7r87Jdwiwp/AZ28rxvnpaA3q1QbVaOFANZlJjbl+GyilAMb54McRvGJvyUiWtSu3jQwTK4CfJ6LKBGK9yLDrqFL1cc4YJZLeGo/E1BPVqTKYBo8/0cE04fSlr/OsNgXfjsVhhcRdeg/XYoxZ1tK9/Woy+telBCSWJjkI3RvWs+ItikiDWoB66GvPTvKEMUfYxyOc=
42-
- secure: a9nHfsDUbh4VJsA/wi8cSTL6X3DxUHRjbfN0spY/ks4PQZaGcRKCtXHn+Plpt1AEFCuDwVlWIzSAPzy+xijax/3VWGp1ebUZXEMfOkgoYKjNgZ4HCCEsSRzC0m3fuREzRrPZGFLvsCrJorHnpkr9xgu7Tab5BKhNNzPpxWNJIplgPcMG4f9y+STy5VhhQRdeIkGdwvA8e7/cSiD+asrZu/+aB55ODKiEKpfc0DFb0cfNl/XrfjXXjst9T66zbLN4W0ruNvy70M2UCN9YaooLG5+Ow53CHgz9ZJIQpawiNim7wJfuqbH/X+4b3sxAK0SEG8alx1qYIeogAOUuy2qi/6I+HEIvapHadslvd3UhhogsOr9eAOzlSQe/N/e913vO9vJsqetJQPcMpuMLCpnpfc1GJAtctuesTjQQAAbs/DgUd0MvfVpeN6+j7QETrF1rgVT4eMH2wMEiEGP1CLZDB5WPgauluScS/iU6XQUFty25Pi0+ZC1W6Jg050ffMXnYqFVZSLCSSjobsJ76xsTJ3vcgVPVXVGi/Y/bH+a+/Ui/qXkTdVGlP1DdZFahyhHUsFh+Nne+F/E6VJeiIz+6EdmWyN3+63jo0ODHf9lB1M5HFbyMkCxQFfiUaDGV+f/0rOaxhg8zxTzur+AnxXWZrRlOZiWwaksfmJ9FzoQdwE4I=
43-
- secure: T2wrf+LQ70XJb/vhdmlzY1kEMHeJubtjWTtNSkPx+8ro+BoJscQHGN+ZvuaC1Xcek35QwWSbabpz1l2FRj8HEXJlh113wn3s5xKbu5AiuZ4IOzlp/EZxsY4OW1BbAM4QUSDQCdTJBHtA3rTyQTkHyBiqK6Y9PidFUk5OL5uREJWSTxhJBJWAIeth7kA+wVAG/Umt6V9ivj/lRNIpKxbKloaPq1QJVARBp4nKb0+FqpIr6Pg3m1Ci4n13iL8GIlm6mAvoixpeEi7wu+fz9dStuN2nuJBRhAfwfIoxdP4prpgse6WdYfyG6gxjKKtA/foFgOCIVIl8BHUbeQ9kJoR/A+X+7kMKqDU3a3rVOQlXQ6Ioj9AiWVwA5L+5/IIAyiR4K/SDhoLpeFyDOGID31hnUaiJc0DFZ6P6Pm+kaomiqzxlB/FkzpEWh4y75YZf55i/b+gqW4RrnyY1G9bOVwzyZyQhlgUYqB/sXW/FErGnaCduB2o9mI9WNPgaUPd7m4tGibBZ7pK6c8z9iRwcLVZFWRZ1V5de37NfCgSqeFRE0SeVQk04DhPfQeWq4Jqf2uk1RmsA8tOiDCBZNj/fI8FBI2KcKWRARvrGPX5/9/i9EcE+c+mnBr4gHeAVzyvX9akIeG5TRq9Sz3+/naCf1n0WoWafO0SaZXN9z+XHHF+QjA0=
44-
- secure: WmPT6pe5oSfSq9atK9/wUFGdjTZZcaxqVBvxIx5Q2GVxwLDDxEcn2YFozmZN0f9auVDFaDfEjXIjJL+JeaK0b6KmG1vGBxoOtU4LoGb005fO47UefHD2SAtZ+uy0z8IkPeAC+oIyPL9NpVMdC3wYLuiJ+lhQ+cfyK/2nYbdxxL6sHyi5m6gMseZ2QSu5D17dN9YW3y/mUl7n6+2SC5BsLJl1fKab4UAMDn2kojDX59tVBwQYrYfMh365vNuva2nSowN6xA0XIXIvimTZLXVlX7zWc2mMVeZlWQh4niaVw8zNkOwRY3c0Ay4fcxjUbslCSZ6wshPfz1AU+IgfviEgF4gb4Ll8WJJknFJhimVIGJ93SmKT6vL0d9tH0gBcuOb1DldA6BqfzUHmL1Exli00Adcjb6b9HSMaEpVHkIy5+vXPWKpwUyRGOD6xeceddEhIyk9jhqMwxBsCXGuXdG2C2JdRdJ6Znf3cfdlIbDZ2LgXkxlv8bT4MjiR/7jh7ofy4TQzI3cWDJkIuafMQKF60zFEc3zHjdOnbj5R/+Bsh5KucYCXPF7J5Z836mw5WnLL1n29ahjogss5IR68tpSXY+Z5t/PwSKm09O8l0UaAyf/Piy/2jPvbnefseOLqpiwvzEY0FFAkJGme9aCZamDIshzEutP9H+1oxzzgooH7PBW0=
45-
- secure: SKzoOtYWHNjvax5yW45gel+H275yuHzv7EbrUw0gJlUUa5dSlqiRZDZHswazNxGXpMhDoa22a5WVYNZ33M0KadDV67lgnbp+SwwnOVAkHRPTxuUUTW+w0GsEcTmB+Qh9ah/RR8pfw9sasW6oknP2ZIMmZ8qnzFIirGgpYo+QtR1bYEBtv8+yUc+si0UtldixyUcoVnth+zUeV+DH0IXaMX5P7COGEJ7yQiW9zzZq+vaHCRwdXcpJB7Gz4Eu3l4EjVez99gLUbOLsBs/rL013HsA+YlkXFdUcGWst2Csn4hkwCLhX4WTPjGJGeIDPUuuBMtJew3xuqHGv5cof23fvm0GxEBBo7knMG+A3AHtm6gIU7EibzvbpnNsfkLMWIIByQiKRUIx6ZtcnCNzqptCIY10huXdqQYIMkRGnNkkreQYzu4BTtaA+1KIRbdsJrmm7wZpov30iVcekCZXKtRuob/M6RhLSMcgvEm++JxQ0hdv1QG6X3c3gQXgIcQ4Yr7sRa8YDZ/r41E6q1ase+k3lgbTaOjAx/BTXUuP7qfOl72zH57VS2k7TAlRouBGGRMRFXvrV5PKIPxtdDglsNA63L8YJvHhige6t/hh3/P9Chu1l6rfhNhP6kHsINTqW5ERYQQiLua/f55z31E9J2NSXE5Qb3blQMiSrd+4+7HpGQBI=
41+
- secure: bDdxx2/4NbmV/we/GeFkV7SSmy/18cYpegU8MFaxmizrcSjsXQaadAooMVd0eGAcf15m3pOmJ6n7pqv0I8hs5SWN2L5hb1StJVqR0f+SeoEdf5vprxoGRF1Q6VgKWSNP9FQoABWhQHzXF2NMY3bZcEN5+6kOeZ11qSPHXMWKRg3Utc5tS5Ck7XazGrNe1b99zWt0FPJaKnNYnQ6ClL2YYZ1Jlm7243aWLhnBzA2hX+v7c8EiK/lawTNDdPmN9qbYrtopTbGso0Elc4aD8dk2yROK1WKETzctkvn/cW/OZ0ipN3TTEp72VAKhbc+1M4DvY4QyhHZUc34bwd/1evlgUD6D1gf61z9kkmFiyEDyEmOdhvHoYppMkJlmu3h4sYp8r2R1GMPoQOVFGlbjtXrKY/SZcDzxqz6/hwK0BFJL7oDgcemmBzfFVdnhPYuwrje15LhTtdBQ0n5soEaje3cKtjE2GGb59gCKepqwbShn7ne2rcUuqiub+8Qa1T/yDgfa6YBOVp1R5Dfp/r9Z3m3s3frH/C01ACul/We4iZQsWFCViD6+MGag/op7Zs1B6Ueb4RyzlSQ819VMxWDdFZQag5mQD9jz2+4huCRC4KAvl4aRJZcVc6RjuUkQeBn9z6skW6Db3jMctud5CSYbdvIPxtdDKNlkcRWF+S83Hos/r28=
42+
- secure: sIn3Li0ug1SgXe8ZMdSkZASlT8lL029+k6YNUsLLBFSy8/2yWsVewGu+uDQSgzhIk6oK4m6sndD6E4UCCAOVaA0ObTLbSsbXISooeBGdX4zXt146ZKRfjKPcZLLpW8kedXfzK2WZmjjD7A31WqcHnC+4xEhQSodYveh3Ovl3JA2u00qLde74hwc+AV8Hrvk4OoqWhjqOJv9RRC9KUUHi5f1ta39Tz4ioSbHsdkNph343niGMecYERsdqj9DTRe30ZfqFSWtzCcciVaLvZih7JpxaZz/FJINcfeZTdCbaA89I8w5HoqU44A6L0ukok8sflHiRYnXpue1Q57KB+TzxIVNbNCdlgdT/9UzXKtjjKmiTdHl/r6EsliNW/c6iLkc08hXJvdLlLS19Dka5AXjAY5GYTyFY0u0I4S4qM3jnAKYWlWV9WLhAfmIXPfL7Yy6W6Cgh5lYVlStHoLHTsZNdNSOyvqKXBcQErgDhYuYqaJN9zlahc+fM1AXieXX/QPbzphx4jIKL+rnPJASP5jzBVIgf7PEanCBtoDHfkVbWtIcx4mA3UZwDrIUsMuUq34JMNNTbkUirdS2GElkq86Ap9mn5ng5uKuyCdgmidjPj7wJ11ovDDWj1gOahINpzle1gu8x8iJV0cxiB+aobqt/wTbzq90XWnFd9U4N5vs1xl84=
43+
- secure: L9H5TuvCjRldkMYELMc3XcU9okgCBLYJWzdB6oxWLUEhdcAkFGRIVGXKP70WQSuJrPOFegantYsr7QDMErUHfNcg+MnKwQ/Rsq4OBE817KompEQLTuK4i8lkl7rE4TQUfPJN5Xq39W9uYS0VHWG2VX6oRDjefqylDV2lbWk5dtUfvH22nbYJ5yor2lxyqI0VOXf3WXoVb0VJ/YuQkRp91e8nzaYGheMnhEIR+MXSFG1qgoXv3swSzb4wPu9Xpq/idub+qf/DJ2K/S16+EBbZVmwMfYEBM26vJbVgxdb7giC1de9xFTAK/Qs05L74uRpd/gJJqYXPwgQ36LevSGLkBuRlxoceaeGCsvPfb576rsLQaAZWSWiTL/ziE9HiBXoXNJn0CqS93DbobX3YzaR8QlC1Ya04FR5LJl2yyxDD74/xrdG00EduUUL3arR4p2q7FhuVUoJ7UHPonYfOjNazV1+jmDpBg68J7HQo8K5guq0HXwt1PGdpQGcL9Ieq9GYyXNZHypy/cJlE95Fo3RdhjtiIADQ3qIcOhLAOHeHqW3lmS494tTbzP1VDqQUy8kKWAVqCSjV/AmcrwRNCWocVpW5yHUsYsApeeY429UrDVFK1cXKgpkGnXP52fXesqG3bvzP/tvOgPnNpvl0YU6DZGWe+iIVOgqA1d/EQRu9ZgJw=
44+
- secure: B79RAZpaRpzYibc442tEkr4YTPFTh10zpepNaYf5NI684TfdcO+hrK9wfXHJdGGIWZAn/4IdzjW3ShLR3aZhzXSJ1BrfTTQRvxfUbU6P3UxZyvOzu4tmYOuwwDsqVbJ+FuZ3zh20pSj0qXddOZWwFH2X55sW/KK7L7h62JnofP44V/0MGGl53UBUy4/DFJBjYWSKrDyvbxR2JiE6gwLKB4yBEP5+ykKYGrjwnR88e66el0HNVCoa0Glhm53nYQGVKYSefewvAIC3IwKbtdwxq1bbJxCCvkSsUYPjhT0JVj8oH0WF1ykRSGt/77Hb5h4X7RFlnhtloBCiKUkare0PhXJ1UMePoCHOaDdreX+WjPcUngvZ7qkG7jDoi4LyTjpZf2MJgDgEcV/UUe7wZG/e2r+mNBwKQq7GTpZI44k4yi9BT1JMqOJ/29FdOIYZKYQCDoaBbPHFB1mj6DbfzUqnXohuRHYGoG1WxkTTbyQgeJcpqOtgFTx2bkx4HZbyIM/bAsOz1poJRkc4cNpXT1PSUK9tapQAklSnbGP++q+sZKI4L5x6jU4GwI9O0Sg58lk5VCQolaCKT2KmUedqt8UFnaij/4T535QF/jrRncGPmrHz8ohmhkSUQos8L0Kz6t6j0KSNFRH2mrC71ne7ndi4+lhYJ3s6fVgwjPjm6hA710E=
45+
before_install:
46+
- |
47+
if [[ "$TRAVIS_PULL_REQUEST" = "false" ]]; then
48+
openssl aes-256-cbc -K $encrypted_661235106ac6_key -iv $encrypted_661235106ac6_iv -in web3j.asc.enc -out web3j.asc -d
49+
fi

build.gradle

+33-159
Original file line numberDiff line numberDiff line change
@@ -11,53 +11,35 @@ buildscript {
1111

1212
// test dependencies
1313
ext.equalsverifierVersion = '3.1.10'
14-
ext.junitVersion = '5.+'
14+
ext.junitVersion = '5.5.2'
1515
ext.junitBenchmarkVersion = '0.7.2'
1616
ext.logbackVersion = '1.2.3'
17-
ext.mockitoVersion = '3.1.0'
1817
ext.mockitoJunitVersion = "3.1.0"
1918

2019
repositories { mavenCentral() }
21-
22-
dependencies {
23-
classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3'
24-
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
25-
}
2620
}
2721

2822
plugins {
29-
id "com.jfrog.bintray" version "1.8.4"
30-
id 'com.diffplug.gradle.spotless' version '3.23.1'
31-
32-
// Required for JFrog Artifactory repository
33-
id 'jacoco'
34-
id 'maven-publish'
35-
36-
// Required for Maven Nexus repository
37-
id 'maven'
38-
id 'signing'
23+
id 'java'
3924
id 'idea'
25+
id 'jacoco'
26+
id "com.diffplug.gradle.spotless" version "3.25.0"
27+
id 'io.codearte.nexus-staging' version '0.21.1'
4028
}
4129

42-
apply plugin: 'java'
43-
apply plugin: 'idea'
44-
// should only be applied to the root project, see
45-
// https://github.com/Codearte/gradle-nexus-staging-plugin#multi-project-build
46-
apply plugin: 'io.codearte.nexus-staging'
47-
apply plugin: 'jacoco'
48-
apply plugin: 'maven-publish'
4930

5031
description 'web3j base project'
5132

5233
allprojects {
34+
apply plugin: 'java'
35+
apply plugin: 'idea'
36+
apply plugin: 'jacoco'
37+
apply plugin: 'com.diffplug.gradle.spotless'
5338

5439
sourceCompatibility = 1.8
5540
targetCompatibility = 1.8
5641

57-
apply plugin: 'java'
58-
apply plugin: 'jacoco'
5942

60-
apply plugin: 'com.diffplug.gradle.spotless'
6143
spotless {
6244
java {
6345
// This path needs to be relative to each project
@@ -84,17 +66,15 @@ allprojects {
8466

8567
repositories { mavenCentral() }
8668

87-
// We don't want any compiler warnings
8869
compileJava {
8970
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
9071
}
9172
compileTestJava {
9273
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
9374
}
9475

95-
javadoc { options.encoding = 'UTF-8' }
96-
97-
jacoco { toolVersion = '0.8.4' // See http://www.eclemma.org/jacoco/.
76+
jacoco {
77+
toolVersion = '0.8.4' // See http://www.eclemma.org/jacoco/.
9878
}
9979

10080
jacocoTestReport {
@@ -104,10 +84,6 @@ allprojects {
10484
tasks.withType(Test) {
10585
reports.html.destination = file("${reporting.baseDir}/${name}")
10686
}
107-
}
108-
109-
subprojects {
110-
apply plugin: 'java'
11187

11288
dependencies {
11389
testCompile "org.junit.jupiter:junit-jupiter:$junitVersion"
@@ -116,96 +92,55 @@ subprojects {
11692
}
11793

11894
configure(subprojects.findAll { it.name != 'integration-tests' }) {
119-
// Required for Maven Nexus repository
12095
apply plugin: 'maven'
12196
apply plugin: 'signing'
12297

123-
// Required for JFrog Artifactory repository
124-
apply plugin: 'maven-publish'
125-
apply plugin: 'com.jfrog.bintray'
98+
ext {
99+
ossrhUsername = project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : System.getenv('OSSRH_USERNAME')
100+
ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : System.getenv('OSSRH_PASSWORD')
101+
signingKey = project.hasProperty('signingKey') ? project.property('signingKey') : new File("$rootDir/web3j.asc").getText('UTF-8')
102+
signingPassword = project.hasProperty('signingPassword') ? project.property('signingPassword') : System.getenv('GPG_PASSPHRASE')
103+
}
126104

127105
task javadocJar(type: Jar) {
128-
classifier = 'javadoc'
106+
archiveClassifier = 'javadoc'
129107
from javadoc
130108
}
131109

132110
task sourcesJar(type: Jar) {
133-
classifier = 'sources'
111+
archiveClassifier = 'sources'
134112
from sourceSets.main.allSource
135113
}
136114

137115
task testJar(type: Jar) {
138-
classifier = 'tests'
116+
archiveClassifier = 'tests'
139117
from sourceSets.test.output
140118
}
141119

120+
javadoc { options.encoding = 'UTF-8' }
121+
142122
artifacts { archives sourcesJar, javadocJar, testJar }
143123

144-
ext {
145-
ossrhUsername = project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : System.getenv('OSSRH_USERNAME')
146-
ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : System.getenv('OSSRH_PASSWORD')
147-
ossrhRepoUrl = project.hasProperty('ossrhRepoUrl') ? project.property('ossrhRepoUrl') : System.getenv('OSSRH_REPO_URL')
148-
bintrayUser = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
149-
bintrayKey = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
150-
bintrayGpgPassphrase = project.hasProperty('bintrayGpgPassphrase') ? project.property('bintrayGpgPassphrase') : System.getenv('BINTRAY_GPG_PASSPHRASE')
151-
isSnapshotVersion = project.version.endsWith("-SNAPSHOT")
152-
manualRelease = project.hasProperty('manualRelease') ? project.property('manualRelease').toBoolean() : false
124+
signing {
125+
sign configurations.archives
126+
def signingKey = findProperty("signingKey")
127+
def signingPassword = findProperty("signingPassword")
128+
useInMemoryPgpKeys(signingKey, signingPassword)
153129
}
154130

155-
publishing {
156-
publications {
157-
mavenJava(MavenPublication) {
158-
from components.java
159-
160-
artifact sourcesJar { classifier 'sources' }
161-
162-
artifact testJar { classifier 'tests' }
163-
164-
artifact javadocJar { classifier 'javadoc' }
165-
166-
pom {
167-
name = project.name
168-
description = project.description
169-
url = "https://github.com/web3j/web3j"
170-
licenses {
171-
license {
172-
name = "The Apache License, Version 2.0"
173-
url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
174-
distribution = "repo"
175-
}
176-
}
177-
developers {
178-
developer {
179-
id = "conor10"
180-
name = "Conor Svensson"
181-
182-
}
183-
}
184-
scm {
185-
connection = "scm:git:https://github.com/web3j/web3j.git"
186-
developerConnection = "scm:git://github.com/web3j/web3j.git"
187-
url = "https://github.com/web3j/web3j.git"
188-
}
189-
}
190-
}
191-
}
192-
}
131+
archivesBaseName = project.name
193132

194133
uploadArchives {
195134
repositories {
196135
mavenDeployer {
136+
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
197137

198-
onlyIf {
199-
// Only run if this is a manual release triggered by a user, or an automated release for snapshots.
200-
// We don't need to run this for automated releases.
201-
isSnapshotVersion && ossrhUsername != '' && ossrhPassword != '' && ossrhRepoUrl != ''
138+
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
139+
authentication(userName: ossrhUsername, password: ossrhPassword)
202140
}
203141

204-
repository(url: ossrhRepoUrl) {
205-
authentication(
206-
userName: ossrhUsername,
207-
password: ossrhPassword
208-
)
142+
snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
143+
authentication(userName: ossrhUsername, password: ossrhPassword)
209144
}
210145

211146
pom.project {
@@ -224,7 +159,6 @@ configure(subprojects.findAll { it.name != 'integration-tests' }) {
224159
license {
225160
name 'The Apache License, Version 2.0'
226161
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
227-
distribution 'repo'
228162
}
229163
}
230164

@@ -240,64 +174,6 @@ configure(subprojects.findAll { it.name != 'integration-tests' }) {
240174
}
241175
}
242176

243-
bintray {
244-
user = bintrayUser
245-
key = bintrayKey
246-
publications = ['mavenJava']
247-
publish = true
248-
pkg {
249-
repo = 'maven'
250-
name = 'org.web3j'
251-
desc = project.description
252-
userOrg = 'web3j'
253-
licenses = ['Apache-2.0']
254-
issueTrackerUrl = 'https://github.com/web3j/web3j/issues'
255-
vcsUrl = 'https://github.com/web3j/web3j.git'
256-
websiteUrl = 'https://web3j.io'
257-
publicDownloadNumbers = true
258-
259-
version {
260-
gpg {
261-
sign = true
262-
passphrase = bintrayGpgPassphrase
263-
}
264-
mavenCentralSync {
265-
sync = true
266-
user = ossrhUsername
267-
password = ossrhPassword
268-
close = '1'
269-
}
270-
}
271-
}
272-
}
273-
274-
task release {
275-
dependsOn 'build'
276-
277-
if (isSnapshotVersion) {
278-
logger.info(" - ossrhUsername={}", ossrhUsername)
279-
logger.info(" - ossrhPassword={}", ossrhPassword ? "provided" : "not_provided")
280-
logger.info(" - ossrhRepoUrl={}", ossrhRepoUrl)
281-
} else {
282-
logger.info("About to perform {} full release ...", manualRelease ? "a manual" : "an automated")
283-
logger.info(" - ossrhUsername={}", ossrhUsername)
284-
logger.info(" - ossrhPassword={}", ossrhPassword ? "provided" : "not_provided")
285-
logger.info(" - ossrhRepoUrl={}", ossrhRepoUrl)
286-
logger.info(" - bintrayUser={}", bintrayUser)
287-
logger.info(" - bintrayKey={}", bintrayKey ? "provided" : "not_provided")
288-
logger.info(" - bintrayGpgPassphrase={}", bintrayGpgPassphrase ? "provided" : "not_provided")
289-
}
290-
291-
// Snapshots go to nexus, non-snapshots go to bintray.
292-
if (isSnapshotVersion) {
293-
dependsOn 'uploadArchives'
294-
tasks.findByName('uploadArchives').mustRunAfter 'build'
295-
} else {
296-
dependsOn 'bintrayUpload'
297-
tasks.findByName('bintrayUpload').mustRunAfter 'build'
298-
}
299-
}
300-
301177
task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
302178
dependsOn = subprojects.test
303179
getSourceDirectories().from(subprojects.sourceSets.main.allSource.srcDirs)
@@ -306,8 +182,6 @@ configure(subprojects.findAll { it.name != 'integration-tests' }) {
306182
getExecutionData().from(subprojects.jacocoTestReport.executionData)
307183
reports { xml.enabled = true }
308184

309-
onlyIf = { true }
310-
311185
doFirst {
312186
executionData = files(executionData.findAll { it.exists() })
313187
}

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Thu Nov 07 10:20:52 GMT 2019
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
33
distributionBase=GRADLE_USER_HOME
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists

web3j.asc.enc

5.09 KB
Binary file not shown.

0 commit comments

Comments
 (0)