update gradle build

Author: tomerc

build-info-api/build.gradle

@@ -16,5 +16,5 @@
 
 dependencies {
   compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.3.1'
-  compile group: 'com.google.collections', name: 'google-collections', version: '1.0'
+  compile group: 'com.google.guava', name: 'guava', version: 'r06'
 }

build-info-client/build.gradle

@@ -20,5 +20,5 @@ dependencies {
   compile group: 'org.codehaus.jackson', name: 'jackson-core-asl', version: '1.5.1'
   compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0.1'
   compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.0.1'
-  compile group: 'com.google.collections', name: 'google-collections', version: '1.0'
+  compile group: 'com.google.guava', name: 'guava', version: 'r06'
 }

build-info-extractor-gradle/build.gradle

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-version = '1.0.x-SNAPSHOT'
+version = '1.0-SNAPSHOT'
 dependencies {
   compile "org.codehaus.groovy:groovy-all:1.7.1",
-          "com.google.collections:google-collections:1.0",
+          "com.google.guava:guava:r06",
           "commons-lang:commons-lang:2.4",
           "com.google.code.findbugs:jsr305:1.3.7",
           "javax.annotation:jsr250-api:1.0",

build-info-extractor-gradle/src/examples/multiproject/build.gradle

@@ -26,7 +26,7 @@
  */
 
 /*apply {
-  apply from: 'http://gradle.artifactoryonline.com/gradle/repo/artifactoryinitplugin/artifactoryinitplugin/1.0/artifactoryinitplugin-1.0.0.gradle'
+  apply from: 'http://gradle.artifactoryonline.com/gradle/repo/artifactoryinitplugin/artifactoryinitplugin/1.0/artifactoryinitplugin-1.0-SNAPSHOT.gradle'
 }*/
 
 allprojects {

build-info-extractor-gradle/src/examples/multiproject/init.gradle

@@ -16,7 +16,7 @@
 
 initscript {
   apply {
-    apply from: 'http://localhost:8081/artifactory/plugins-releases/org/jfrog/buildinfo/build-info-extractor-gradle/1.0.0/artifactoryinitplugin-1.0.0.gradle'
+    apply from: 'http://localhost:8081/artifactory/plugins-releases/org/jfrog/buildinfo/build-info-extractor-gradle/1.0.0/artifactoryinitplugin-1.0-SNAPSHOT.gradle'
   }
 }
 addListener(new PropertyListener())

build-info-extractor-gradle/src/main/gradle/artifactoryinitplugin-1.0.0.gradle build-info-extractor-gradle/src/main/gradle/artifactoryinitplugin-1.0-SNAPSHOT.gradle

@@ -42,7 +42,7 @@ buildscript {
     mavenRepo urls: [artifactoryDownloadUrl]
   }
   dependencies {
-    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:1.0-SNAPSHOT'
+    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:1.0.1'
   }
 
 }

build-info-extractor-gradle/src/main/gradle/artifactoryplugin-1.0.0.gradle build-info-extractor-gradle/src/main/gradle/artifactoryplugin-1.0-SNAPSHOT.gradle

@@ -57,7 +57,7 @@ buildscript {
     mavenRepo urls: [artifactoryDownloadUrl]
   }
   dependencies {
-    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:1.0-SNAPSHOT'
+    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:1.0.1'
   }
 }
 

build-info-extractor-ivy/build.gradle

@@ -13,14 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-version = '1.0.x-SNAPSHOT'
+version = '1.0-SNAPSHOT'
 
 dependencies {
   compile 'org.apache.ant:ant:1.8.1',
           'org.apache.ivy:ivy:2.1.0',
           'org.slf4j:slf4j-api:1.5.8',
-          'com.google.code.findbugs:jsr305:1.3',
+          'com.google.code.findbugs:jsr305:1.3.9',
           'org.testng:testng:5.11:jdk15',
+          'org.aspectj:aspectjweaver:1.6.9',
           project(':build-info-api'),
-          project(':build-info-client')
+          project(':build-info-client'),
+          project(':build-info-extractor')
+
 }

build-info-extractor/build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'maven'
 dependencies {
   compile "org.slf4j:slf4j-api:1.5.10",
           "org.codehaus.groovy:groovy-all:1.7.1",
-          "com.google.collections:google-collections:1.0",
+          "com.google.guava:guava:r06",
           "commons-lang:commons-lang:2.4",
           "com.google.code.findbugs:jsr305:1.3.7",
           "javax.annotation:jsr250-api:1.0",

build.gradle

@@ -17,22 +17,14 @@
 def artifactId = 'buildinfo'
 
 buildscript {
-  /*
-    apply {
-      apply from: 'http://repo.jfrog.org/artifactory/repo/org/jfrog/buildinfo/build-info-extractor-gradle/1.0.0/artifactoryinitplugin-1.0.0.gradle'
-    }
-  */
+  apply {
+    apply from: 'http://repo.jfrog.org/artifactory/repo/org/jfrog/buildinfo/build-info-extractor-gradle/1.0.0/artifactoryplugin-1.0.0.gradle'
+  }
   repositories {
     mavenRepo urls: 'http://gradle.artifactoryonline.com/gradle/plugins'
   }
-
-  dependencies {
-    classpath "org.gradle.plugins:gradle-idea-plugin:0.3.1"
-  }
 }
 
-apply plugin: 'org.gradle.idea'
-
 allprojects {
   group = 'org.jfrog.buildinfo'
   version = '1.4.x-SNAPSHOT'

settings.gradle

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-include 'build-info-api', 'build-info-client', 'build-info-extractor-gradle', 'build-info-extractor'
+include 'build-info-api', 'build-info-client', 'build-info-extractor-gradle', 'build-info-extractor', 'build-info-extractor-ivy'