From f5fac889a18c403df4aa2d430905e0282692db67 Mon Sep 17 00:00:00 2001
From: Daniel Stonier <d.stonier@gmail.com>
Date: Tue, 29 Oct 2013 21:46:19 +0900
Subject: [PATCH] use ROS_MAVEN_REPOSITORY
---
build.gradle | 3 ++-
.../src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index ee73112..c5bce27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,7 @@ project.ext {
/* the ros plugin defines this, but since we're building the plugin... */
rosMavenDeploymentRepository = "$System.env.ROS_MAVEN_DEPLOYMENT_REPOSITORY"
rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':')
+ rosMavenRepository = "$System.env.ROS_MAVEN_REPOSITORY"
}
allprojects {
@@ -47,7 +48,7 @@ subprojects {
}
mavenLocal()
maven {
- url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master'
+ url project.rosMavenRepository
}
}
if ( project.rosMavenDeploymentRepository != 'null' && project.rosMavenDeploymentRepository != '' ) {
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
index 8a6aba7..cd5366e 100644
--- a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy
+++ b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy
@@ -28,6 +28,7 @@ class RosPlugin implements Plugin<Project> {
project.extensions.create("ros", RosPluginExtension)
project.ros.mavenPath = "$System.env.ROS_MAVEN_PATH".split(':')
project.ros.mavenDeploymentRepository = "$System.env.ROS_MAVEN_DEPLOYMENT_REPOSITORY"
+ project.ros.mavenRepository = "$System.env.ROS_MAVEN_REPOSITORY"
/*
* Could use some better handling for when this is not defined as it sets
* file://null, but it doesn't seem to hurt the process any
@@ -41,7 +42,7 @@ class RosPlugin implements Plugin<Project> {
}
mavenLocal()
maven {
- url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master'
+ url project.ros.mavenRepository
}
mavenCentral()
}
--
GitLab