Improve publishing process and update Apache license headers (#50)

Author: Vignesh Raja

.travis.yml

@@ -5,7 +5,12 @@ jdk:
  - oraclejdk8
 install: true
 script:
- - "./gradlew clean build check"
+ - "./gradlew clean"
+ - "if [[ -n $TRAVIS_TAG ]]; then
+ ./gradlew ship;
+ else
+ ./gradlew build;
+ fi"
 cache:
  gradle: true
  directories:

README.md

@@ -17,10 +17,7 @@ following in your `build.gradle` and substitute `VERSION` for the latest SDK ver
 
 ```
 repositories {
- maven {
- mavenCentral()
- url "http://optimizely.bintray.com/optimizely"
- }
+ jcenter()
 }
 
 dependencies {
@@ -92,7 +89,7 @@ Please see [CONTRIBUTING](CONTRIBUTING.md).
 
 ## License
 ```
- Copyright 2016, Optimizely
+ Copyright 2017, Optimizely
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

build.gradle

@@ -7,14 +7,14 @@ buildscript {
  }
 
  dependencies {
+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
  classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:latest.release'
  }
 }
 
 plugins {
- id 'net.researchgate.release' version '2.2.1'
  id 'nebula.optional-base' version '3.0.3'
- id "me.champeau.gradle.jmh" version "0.3.1"
+ id 'me.champeau.gradle.jmh' version '0.3.1'
 }
 
 allprojects {
@@ -24,13 +24,22 @@ allprojects {
 apply from: 'gradle/license.gradle'
 apply from: 'gradle/publish.gradle'
 
+allprojects {
+ def travis_defined_version = System.getenv('TRAVIS_TAG')
+ if (travis_defined_version != null) {
+ version = travis_defined_version
+ }
+}
+
 subprojects {
+ apply plugin: 'com.jfrog.bintray'
  apply plugin: 'findbugs'
  apply plugin: 'java'
  apply plugin: 'jacoco'
+ apply plugin: 'maven-publish'
+ apply plugin: 'me.champeau.gradle.jmh'
  apply plugin: 'nebula.provided-base'
  apply plugin: 'nebula.optional-base'
- apply plugin: 'me.champeau.gradle.jmh'
 
  sourceCompatibility = 1.6
  targetCompatibility = 1.6
@@ -102,10 +111,66 @@ subprojects {
  testCompile group: 'ch.qos.logback', name: 'logback-core', version: logbackVersion
  }
 
- // for commits performed by the release plugin, skip the travis build (as it would attempt to bump the version)
- release {
- preCommitText = '[ci skip]'
+ publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ from components.java
+ artifact sourcesJar
+ artifact javadocJar
+ pom.withXml {
+ asNode().children().last() + {
+ resolveStrategy = Closure.DELEGATE_FIRST
+ url 'https://github.com/optimizely/java-sdk'
+ licenses {
+ license {
+ name 'The Apache Software License, Version 2.0'
+ url 'http://www.apache.org/license/LICENSE-2.0.txt'
+ distribution 'repo'
+ }
+ }
+ developers {
+ developer {
+ id 'optimizely'
+ name 'Optimizely'
+ email 'developers@optimizely.com'
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ def bintrayName = 'core-api';
+ if (name.equals('core-httpclient-impl')) {
+ bintrayName = 'httpclient'
  }
+
+ bintray {
+ user = System.getenv('BINTRAY_USER')
+ key = System.getenv('BINTRAY_KEY')
+ pkg {
+ repo = 'optimizely'
+ name = "optimizely-sdk-${bintrayName}"
+ userOrg = 'optimizely'
+ version {
+ name = rootProject.version
+ }
+ publications = ['mavenJava']
+ }
+ }
+
+ build.dependsOn('generatePomFileForMavenJavaPublication')
+
+ bintrayUpload.dependsOn 'build'
+
+ task ship() {
+ dependsOn('bintrayUpload')
+ }
+}
+
+task ship() {
+ dependsOn(':core-api:ship', ':core-httpclient-impl:ship')
 }
 
 // todo: remove this wrapper version once we're publishing to jcenter/maven central

core-api/build.gradle

@@ -1,3 +1,23 @@
+/*
+ * Copyright 2017, Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+ id 'de.fuerstenau.buildconfig' version '1.1.7'
+}
+
 dependencies {
  compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
  compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion
@@ -12,66 +32,16 @@ dependencies {
  provided group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion, optional
 }
 
-task build << {
- // add the build version information into a file that'll go into the distribution
- ext.buildVersion = new File(projectDir, "src/main/resources/optimizely-build-version")
- buildVersion.text = version
-}
-
-buildscript {
- repositories {
- jcenter()
- }
- dependencies {
- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
- }
-}
-
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'de.fuerstenau.buildconfig'
 apply plugin: 'maven-publish'
 
-publishing {
- publications {
- mavenJava(MavenPublication) {
- from components.java
- artifact sourcesJar
- artifact javadocJar
- pom.withXml {
- asNode().children().last() + {
- resolveStrategy = Closure.DELEGATE_FIRST
- url 'https://github.com/optimizely/java-sdk'
- licenses {
- license {
- name 'The Apache Software License, Version 2.0'
- url 'http://www.apache.org/license/LICENSE-2.0.txt'
- distribution 'repo'
- }
- }
- developers {
- developer {
- id 'optimizely'
- name 'Optimizely'
- email 'developers@optimizely.com'
- }
- }
- }
- }
- }
- }
+buildConfig {
+ appName = 'core-api'
+ version = rootProject.version
 }
 
-bintray {
- user = System.getenv('BINTRAY_USER')
- key = System.getenv('BINTRAY_KEY')
- pkg {
- repo = 'optimizely'
- name = 'optimizely-sdk-core-api'
- userOrg = 'optimizely'
- version {
- name = getVersion()
- }
- publications = ['mavenJava']
+sourceSets {
+ main {
+ java.srcDir "${buildDir}/gen/buildconfig/src/main/"
  }
-}
-
-publishArtifacts()
+}

core-api/src/jmh/java/com/optimizely/ab/BenchmarkUtils.java

@@ -1,6 +1,5 @@
-/**
- *
- * Copyright 2016, Optimizely
+/*
+ * Copyright 2017, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

core-api/src/jmh/java/com/optimizely/ab/OptimizelyBenchmark.java

@@ -1,6 +1,5 @@
-/**
- *
- * Copyright 2016, Optimizely
+/*
+ * Copyright 2017, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

core-api/src/jmh/java/com/optimizely/ab/OptimizelyBuilderBenchmark.java

@@ -1,6 +1,5 @@
-/**
- *
- * Copyright 2016, Optimizely
+/*
+ * Copyright 2017, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

core-api/src/jmh/resources/benchmark.properties

@@ -1,3 +1,19 @@
+#
+# Copyright 2017, Optimizely
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 datafilePathTemplate=config/profiling-test-data-%d-experiments.json
 activateGroupExperimentUserIdPropTemplate=activateGroupExperiment%dExperimentsUserId
 activateGroupExperiment10ExperimentsUserId=no

core-api/src/jmh/resources/logback.xml

@@ -1,3 +1,19 @@
+<!--
+ ~ Copyright 2017, Optimizely
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
 <configuration>
  <root level="warn"/>
 </configuration>

core-api/src/main/java/com/optimizely/ab/Optimizely.java

@@ -1,6 +1,5 @@
-/**
- *
- * Copyright 2016, Optimizely
+/*
+ * Copyright 2017, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +32,6 @@
 import com.optimizely.ab.error.RaiseExceptionErrorHandler;
 import com.optimizely.ab.event.EventHandler;
 import com.optimizely.ab.event.LogEvent;
-import com.optimizely.ab.event.internal.BuildVersionInfo;
 import com.optimizely.ab.event.internal.EventBuilder;
 import com.optimizely.ab.event.internal.EventBuilderV1;
 import com.optimizely.ab.event.internal.EventBuilderV2;
@@ -693,7 +691,7 @@ public Optimizely build() throws ConfigParseException {
  }
 
  if (clientVersion == null) {
- clientVersion = BuildVersionInfo.VERSION;
+ clientVersion = BuildConfig.VERSION;
  }
 
  if (eventBuilder == null) {