From fda597ed2bcf8ea8ba554b18ffe3909f5315a5bf Mon Sep 17 00:00:00 2001
From: Seth Goings <seth.goings@readytalk.com>
Date: Wed, 23 Jul 2014 18:04:19 -0600
Subject: [PATCH] Add artifactoryPublish into travis ci build

---
 .travis.yml  |  8 ++++++--
 build.gradle | 51 +++++++++++++++++++++++++++------------------------
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 132e7ef2d7..86233e157d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,11 @@ language: cpp
 env:
   global:
   - secure: Pe7OLUvdk3DeTAShyaYsdAXBcnjdNOrtfTPt1mCP5+JKBUw3z0n7BpTgATVRBmkn866pDqxL0N3+jBgjKUpEpqOj23bTB2AeDdIzlYkFGvTd3GQQV1lMFn16I9LOgWJhkfICTJ1rIYiNf8xSkJoeKGB7eGUM0KGsTvelFfsaGVc=
-script: ./test/ci.sh
+  - secure: OWgsHP9ijb7oLpZVJqlovccT+OO3uAWEZxVdT/rNFS1riGoTSwi1ptlHUw/lEZY1Lw1dEaSW6kfc2rqpTgsHOFQpcdJeK8E29TLn1x25kYaGzo6JY2wWi5q4I3IMRRcFEharXlucJUO6yZWqhDXZTD4J8yf+wXt4blSRrAXil50=
+  - secure: T19BYOl5UB5vTDD3Q2np0iHroPm1elHhCW7AOkUPnjXE+mwMTWQlRm1LxbZ+tv1dykUSlhBwdLP7dNWRzWa1JbAY6Y2SbMmwfdryZTBaELcXWsTcGOP80pKx1ruY30mQfyguVukfIZj8qvRSIMwXCYm+Do+XffC8fmqXSTBRulA=
+
+install: ./gradlew artifactoryPublish
+script: "./test/ci.sh"
 after_success:
 - make javadoc
-- .utility/push-javadoc-to-gh-pages.sh
+- ".utility/push-javadoc-to-gh-pages.sh"
diff --git a/build.gradle b/build.gradle
index 989277a0bc..f26469e800 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,36 +4,14 @@ buildscript {
   }
 
   dependencies {
-    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.0'
+    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.4'
   }
 }
 
 apply plugin: 'native-component'
 apply plugin: 'ivy-publish'
-apply plugin: 'com.jfrog.artifactory'
 apply plugin: 'java'
-
-artifactory {
-  contextUrl = "http://oss.jfrog.org"
-
-  resolve {
-    repository {
-      repoKey = 'libs-releases'
-    }
-  }
-
-  publish {
-    repository {
-      repoKey = 'oss-snapshot-local'
-      username = System.env.BINTRAY_USER
-      password = System.env.BINTRAY_API_KEY
-    }
-
-    defaults {
-      //publications('linux-x86_64')
-    }
-  }
-}
+apply plugin: 'artifactory-publish'
 
 model {
   platforms {
@@ -108,6 +86,31 @@ publishing {
   }
 }
 
+artifactory {
+  contextUrl = "http://oss.jfrog.org"
+
+  resolve {
+    repository {
+      repoKey = 'libs-releases'
+    }
+  }
+
+  publish {
+    repository {
+      repoKey = 'oss-snapshot-local'
+      username = System.env.BINTRAY_USER
+      password = System.env.BINTRAY_API_KEY
+      ivy {
+        ivyLayout = "[organisation]/[module]/[revision]/ivy-[revision].xml"
+      }
+    }
+
+    defaults {
+      publications 'linux-x86_64'
+    }
+  }
+}
+
 task wrapper(type: Wrapper) {
   gradleVersion = '2.0'
 }
\ No newline at end of file