diff --git a/README.md b/README.md index aacd376575a4f..e0e23d0da9e29 100644 --- a/README.md +++ b/README.md @@ -157,13 +157,20 @@ to avoid known issues with this configuration. ./gradlew releaseTarGzAll ### Publishing the jar for all version of Scala and for all projects to maven ### - ./gradlew uploadArchivesAll + ./gradlew -Pversion= uploadArchivesAll -Please note for this to work you should create/update `${GRADLE_USER_HOME}/gradle.properties` (typically, `~/.gradle/gradle.properties`) and assign the following variables +By default, this command will publish artifacts to a Bintray repository named "kafka" under an account specified by the BINTRAY_USER environment variable. The BINTRAY_KEY +environment variable is used for the password for that account. + +If you want to override this to use a different maven repository, you should create/update `${GRADLE_USER_HOME}/gradle.properties` (typically, `~/.gradle/gradle.properties`) +and assign the following variables mavenUrl= mavenUsername= mavenPassword= + +Signing is disabled by default. If you need signing, please set the following variables in `gradle.properties` as well: + signing.keyId= signing.password= signing.secretKeyRingFile= diff --git a/build.gradle b/build.gradle index 3e8558d4739c8..55106aab24f94 100644 --- a/build.gradle +++ b/build.gradle @@ -94,10 +94,15 @@ ext { skipSigning = project.hasProperty('skipSigning') && skipSigning.toBoolean() shouldSign = !skipSigning && !version.endsWith("SNAPSHOT") && project.gradle.startParameter.taskNames.any { it.contains("upload") } - mavenUrl = project.hasProperty('mavenUrl') ? project.mavenUrl : '' - mavenUsername = project.hasProperty('mavenUsername') ? project.mavenUsername : '' - mavenPassword = project.hasProperty('mavenPassword') ? project.mavenPassword : '' - + bintrayUsername = System.getenv('BINTRAY_USER') + bintrayKey=System.getenv('BINTRAY_KEY') + bintrayUrl = bintrayApiBaseUrl + '/maven/' + bintrayUsername + '/' + bintrayRepo + '/' + bintrayPackage + '/;publish=1' + + // By default, publish to Bintray. + mavenUrl = project.hasProperty('mavenUrl') ? project.mavenUrl : bintrayUrl + mavenUsername = project.hasProperty('mavenUsername') ? project.mavenUsername : bintrayUsername + mavenPassword = project.hasProperty('mavenPassword') ? project.mavenPassword : bintrayKey + userShowStandardStreams = project.hasProperty("showStandardStreams") ? showStandardStreams : null userTestLoggingEvents = project.hasProperty("testLoggingEvents") ? Arrays.asList(testLoggingEvents.split(",")) : null @@ -177,9 +182,9 @@ subprojects { afterEvaluate { pom.artifactId = "${archivesBaseName}" pom.project { - name 'Apache Kafka' + name 'LinkedIn fork of Apache Kafka' packaging 'jar' - url 'http://kafka.apache.org' + url 'http://github.com/linkedin/kafka' licenses { license { name 'The Apache Software License, Version 2.0' @@ -517,7 +522,7 @@ for ( sv in availableScalaVersions ) { } def connectPkgs = ['connect:api', 'connect:runtime', 'connect:transforms', 'connect:json', 'connect:file', 'connect:basic-auth-extension'] -def pkgs = ['clients', 'examples', 'log4j-appender', 'tools', 'streams', 'streams:streams-scala', 'streams:test-utils', 'streams:examples'] + connectPkgs +def pkgs = ['clients', 'examples', 'log4j-appender', 'tools', 'streams', 'streams:test-utils', 'streams:examples'] + connectPkgs /** Create one task per default Scala version */ def withDefScalaVersions(taskName) { diff --git a/gradle.properties b/gradle.properties index 1853cf3234e18..23f030ab6ffac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,13 +13,22 @@ # See the License for the specific language governing permissions and # limitations under the License. -group=org.apache.kafka -# NOTE: When you change this version number, you should also make sure to update -# the version numbers in +group=com.linkedin.kafka + +# NOTE: publishing artifacts requires a property named "version" to be set explicitly. For example, +# ./gradlew -Pversion= uploadArchivesAll +# +# You should also make sure to update the version numbers in # - tests/kafkatest/__init__.py, # - tests/kafkatest/version.py (variable DEV_VERSION) -# - kafka-merge-pr.py. -version=2.1.0-SNAPSHOT +# - kafka-merge-pr.py +# +# as necessary. + scalaVersion=2.11.12 task=build org.gradle.jvmargs=-Xmx1024m -Xss2m +bintrayApiBaseUrl=https://api.bintray.com +bintrayRepo=kafka +bintrayPackage=kafka +skipSigning=true