Merge branch 'master' into pending-transaction-datasource

ethereumj-core/build.gradle

@@ -136,6 +136,7 @@ jacocoTestReport {
 def bintrayUsername = project.hasProperty('bintrayUser') ? project.bintrayUser : ''
 def bintrayPassword = project.hasProperty('bintrayKey') ? project.bintrayKey : ''
 def pullRequest = System.getenv('TRAVIS_PULL_REQUEST')
+def branchName = System.getenv('TRAVIS_BRANCH')
 
 artifactory {
     contextUrl = 'http://oss.jfrog.org/artifactory'
@@ -155,7 +156,11 @@ artifactory {
 }
 
 artifactoryPublish.onlyIf {
-    (!pullRequest || pullRequest == 'false') && project.version.endsWith('-SNAPSHOT')
+//    (!pullRequest || pullRequest == 'false') &&
+//            project.version.endsWith('-SNAPSHOT') &&
+
+    
+    branchName.startsWith('master')
 }
 
 bintray {
@@ -184,6 +189,8 @@ install {
 }
 
 task publish {
+
+    println "publishing if master current branch: " + branchName
     description = "Publishes snapshots to oss.jfrog.org and releases to Bintray/JCenter"
     dependsOn artifactoryPublish, bintrayUpload
 }

ethereumj-core/src/main/resources/system.properties

@@ -12,6 +12,7 @@ peer.active.port = 30303
 
 # Peer for server to listen for incoming
 # connections
+
 peer.listen.port = 10101
 #peer.listen.port = 40304