Merge pull request #57 from adamantivm/tooling-updates

adamantivm · web-flow · commit dc00502cd561 · 2016-12-27T11:57:08.000-03:00
Gradle 2.2.1 to 2.14.1 and mavenCentral to jcenter
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ subprojects {
 
   // These external repositories are copied from bootstrap.gradle.
   repositories {
-    mavenCentral()
+    jcenter()
     maven {
       url "http://repository.springsource.com/maven/bundles/release"
     }
diff --git a/buildscript.gradle b/buildscript.gradle
@@ -41,7 +41,7 @@ rootProject.buildscript {
         maven {
             url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
         }
-        mavenCentral()
+        jcenter()
     }
     dependencies {
         classpath "org.ros.rosjava_bootstrap:gradle_plugins:[0.3,0.4)"
diff --git a/experiments/ros-java.gradle b/experiments/ros-java.gradle
@@ -94,7 +94,7 @@ repositories {
   maven {
     url "http://repository.springsource.com/maven/bundles/external"
   }
-  mavenCentral()
+  jcenter()
 }
 
 /***********************
diff --git a/gradle.gradle b/gradle.gradle
@@ -1,5 +1,3 @@
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.2.1'
+    gradleVersion = '2.14.1'
 }
-
-
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy
@@ -55,7 +55,7 @@ class RosPlugin implements Plugin<Project> {
       maven {
         url "http://repository.springsource.com/maven/bundles/external"
       }
-      mavenCentral()
+      jcenter()
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ subprojects {`
`33`	`33`
`34`	`34`	`// These external repositories are copied from bootstrap.gradle.`
`35`	`35`	`repositories {`
`36`		`- mavenCentral()`
	`36`	`+ jcenter()`
`37`	`37`	`maven {`
`38`	`38`	`url "http://repository.springsource.com/maven/bundles/release"`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ rootProject.buildscript {`
`41`	`41`	`maven {`
`42`	`42`	`url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"`
`43`	`43`	`}`
`44`		`- mavenCentral()`
	`44`	`+ jcenter()`
`45`	`45`	`}`
`46`	`46`	`dependencies {`
`47`	`47`	`classpath "org.ros.rosjava_bootstrap:gradle_plugins:[0.3,0.4)"`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ repositories {`
`94`	`94`	`maven {`
`95`	`95`	`url "http://repository.springsource.com/maven/bundles/external"`
`96`	`96`	`}`
`97`		`- mavenCentral()`
	`97`	`+ jcenter()`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/***********************`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`	`1`	`task wrapper(type: Wrapper) {`
`2`		`- gradleVersion = '2.2.1'`
	`2`	`+ gradleVersion = '2.14.1'`
`3`	`3`	`}`
`4`		`-`
`5`		`-`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class RosPlugin implements Plugin<Project> {`
`55`	`55`	`maven {`
`56`	`56`	`url "http://repository.springsource.com/maven/bundles/external"`
`57`	`57`	`}`
`58`		`- mavenCentral()`
	`58`	`+ jcenter()`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`