Merge branch 'release/0.8.0'

.gitignore

@@ -52,7 +52,7 @@ com_crashlytics_export_strings.xml
 local.properties
 
 # Ignoring Version.java since its auto-generated
-#Version.java
+Version.java
 
 # Vagrant
 .vagrant

.travis.yml

@@ -1,7 +1,8 @@
+sudo: false
+
 language: java
 
 jdk:
- - openjdk6
  - openjdk7
  - oraclejdk7
  - oraclejdk8

CHANGELOG

@@ -1,3 +1,34 @@
+Java 0.8.0 (2015-09-14)
+-----------------------
+Moved Version.java into gitignored sub-package (#135)
+Added builder pattern for Tracker (#148)
+Decoupled Subject from Tracker (#144)
+Added builder pattern for Emitter (#149)
+Added builder pattern for Subject (#150)
+Added builder pattern for all Events (#147)
+Added Timing Event (#154)
+Made an abstract event class and add an event interface (#163)
+Fixed eid and dtm being incorrectly added to screen_view and timing context (#161)
+Added ability to set event ID when tracking (#133)
+Added SelfDescribingJson class (#151)
+Ensured only String values are added to the TrackerPayload (#127)
+Made event sending for GET & POST Asynchronous (#157)
+Made http client configurable, thanks @dstendardi! (#146)
+Added builder pattern for ClientAdapters (#158)
+Made AbstractEmitter abstract again with builder patterm (#159)
+Expanded Emitter interface to include getters and setters for all parameters (#162)
+Fixed NPE if Collector URI is invalid (#131)
+Added setNetworkUserId to Subject (#125)
+Added setDomainUserId to Subject (#124)
+Added setIpAddress to Subject (#88)
+Added setUseragent to Subject (#87)
+Updated contexts schema to 1-0-1 (#100)
+Updated payload_data to 1-0-3 (#89)
+Expanded Test Suite to cover the library properly (#160)
+Bumped Vagrant Java Version to 1.7 (#153)
+Fixed Vagrant Peru.yaml file (#152)
+Fixed badge link (#136)
+
 Java 0.7.0 (2015-01-24)
 -----------------------
 Consolidated Tracker Core module into Java Tracker, thanks @dstendardi! (#116)

README.md

@@ -6,7 +6,7 @@
 
 Add analytics to your Java software with the **[Snowplow] [snowplow]** event tracker for **[Java] [java]**. See also: **[Snowplow Android Tracker] [snowplow-android-tracker]**.
 
-With this tracker you can collect event data from your Java-based desktop and server apps, servlets and games. Supports JDK6+.
+With this tracker you can collect event data from your Java-based desktop and server apps, servlets and games. Supports JDK7+.
 
 ## Quickstart
 
@@ -43,7 +43,7 @@ limitations under the License.
 [travis]: https://travis-ci.org/snowplow/snowplow-java-tracker
 [travis-image]: https://travis-ci.org/snowplow/snowplow-java-tracker.svg?branch=master
 
-[release-image]: http://img.shields.io/badge/release-0.7.0-blue.svg?style=flat
+[release-image]: https://img.shields.io/github/release/snowplow/snowplow-java-tracker.svg?style=flat
 [releases]: https://github.com/snowplow/snowplow-java-tracker/releases
 
 [license-image]: http://img.shields.io/badge/license-Apache--2-blue.svg?style=flat
@@ -62,7 +62,7 @@ limitations under the License.
 [roadmap-image]: https://d3i6fms1cm1j0i.cloudfront.net/github/images/roadmap.png
 [contributing-image]: https://d3i6fms1cm1j0i.cloudfront.net/github/images/contributing.png
 
-[techdocs]: https://github.com/snowplow/snowplow/wiki/Android-and-Java-Tracker
+[techdocs]: https://github.com/snowplow/snowplow/wiki/Java-Tracker
 [setup]: https://github.com/snowplow/snowplow/wiki/Java-Tracker-Setup
 [roadmap]: https://github.com/snowplow/snowplow/wiki/Java-Tracker-Roadmap
 [contributing]: https://github.com/snowplow/snowplow/wiki/Java-Tracker-Contributing

build.gradle

@@ -11,48 +11,80 @@
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
 
+wrapper.gradleVersion = '2.6'
+
+buildscript {
+    repositories {
+        maven { url 'http://repo.spring.io/plugins-release' }
+    }
+    dependencies {
+        classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
+    }
+}
+
 apply plugin: 'java'
 apply plugin: 'maven-publish'
 apply plugin: 'idea'
-
+apply plugin: 'propdeps'
+apply plugin: 'propdeps-maven'
+apply plugin: 'propdeps-idea'
 
 group = 'com.snowplowanalytics'
-version = '0.7.0'
-sourceCompatibility = '1.6'
-targetCompatibility = '1.6'
+version = '0.8.0'
+sourceCompatibility = '1.7'
+targetCompatibility = '1.7'
+
 repositories {
     // Use 'maven central' for resolving our dependencies
     mavenCentral()
     // Use 'jcenter' for resolving testing dependencies
     jcenter()
 }
 
+configure([compileJava, compileTestJava]) {
+    options.encoding = 'UTF-8'
+}
+
+configurations {
+    provided
+}
+
+sourceSets {
+    main {
+        compileClasspath += configurations.provided
+    }
+}
+
 dependencies {
 
     // Apache Commons
     compile 'commons-codec:commons-codec:1.2'
     compile 'commons-net:commons-net:3.3'
 
     // Apache HTTP
-    compile 'org.apache.httpcomponents:httpclient:4.3.3'
-    compile 'org.apache.httpcomponents:httpasyncclient:4.0.1'
-
+    optional 'org.apache.httpcomponents:httpclient:4.3.3'
+    optional 'org.apache.httpcomponents:httpasyncclient:4.0.1'
+
+    // Square OK HTTP
+    optional 'com.squareup.okhttp:okhttp:2.2.0'
+
     // SLF4J logging API
     compile 'org.slf4j:slf4j-simple:1.7.7'
 
     // Jackson JSON processor
     compile 'com.fasterxml.jackson.core:jackson-databind:2.4.1.1'
 
     // Preconditions
-    compile 'com.google.guava:guava:17.0'
+    compile 'com.google.guava:guava:18.0'
 
     // Testing libraries
     testCompile 'junit:junit:4.11'
     testCompile 'com.github.tomakehurst:wiremock:1.53'
     testCompile 'org.skyscreamer:jsonassert:1.2.3'
+    testCompile 'org.mockito:mockito-core:1.9.5'
+    testCompile 'com.squareup.okhttp:mockwebserver:2.1.0'
 }
 
-
 task sourceJar(type: Jar, dependsOn: 'generateSources') {
     from sourceSets.main.allJava
 }
@@ -76,7 +108,6 @@ publishing {
     }
 }
 
-
 task generateSources {
     project.ext.set("outputDir", "$projectDir/src/main/java/com/snowplowanalytics/snowplow/tracker")
     doFirst {
@@ -85,7 +116,7 @@ task generateSources {
         srcFile.parentFile.mkdirs()
         srcFile.write(
                 """/*
- * Copyright (c) 2014 Snowplow Analytics Ltd. All rights reserved.
+ * Copyright (c) 2014-2015 Snowplow Analytics Ltd. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip