From c6e92651897730c0af580736b0459a1a42e06558 Mon Sep 17 00:00:00 2001
From: Daniel Stonier <d.stonier@gmail.com>
Date: Wed, 18 Sep 2013 22:11:33 +0900
Subject: [PATCH] maven deployment path -> maven deployment repository.
---
build.gradle | 6 +++---
.../groovy/org/ros/gradle_plugins/RosPlugin.groovy | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/build.gradle b/build.gradle
index bbb4d84..d314634 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ task wrapper(type: Wrapper) {
project.ext {
/* the ros plugin defines this, but since we're building the plugin... */
- rosMavenDeploymentPath = "$System.env.ROS_MAVEN_DEPLOYMENT_PATH"
+ rosMavenDeploymentRepository = "$System.env.ROS_MAVEN_DEPLOYMENT_REPOSITORY"
rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':')
}
@@ -49,10 +49,10 @@ subprojects {
url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master'
}
}
- if ( project.rosMavenDeploymentPath != 'null' && project.rosMavenDeploymentPath != '' ) {
+ if ( project.rosMavenDeploymentRepository != 'null' && project.rosMavenDeploymentRepository != '' ) {
uploadArchives {
repositories.mavenDeployer {
- repository(url: 'file://' + project.rosMavenDeploymentPath)
+ repository(url: 'file://' + 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 aa0e4d6..aa4afbd 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
@@ -8,7 +8,7 @@ import org.gradle.api.*;
* Provides information about the ros workspace.
*
* - project.ros.mavenPath : location of local ros maven repositories (in your chained workspaces)
- * - project.ros.mavenDeploymentPath : location of the ros maven repository you will publish to
+ * - project.ros.mavenDeploymentRepository : location of the ros maven repository you will publish to
*
* It also performs the following actions
*
@@ -27,11 +27,11 @@ class RosPlugin implements Plugin<Project> {
/* Create project.ros.* property extensions */
project.extensions.create("ros", RosPluginExtension)
project.ros.mavenPath = "$System.env.ROS_MAVEN_PATH".split(':')
- project.ros.mavenDeploymentPath = "$System.env.ROS_MAVEN_DEPLOYMENT_PATH"
- if ( project.ros.mavenDeploymentPath != 'null' && project.ros.mavenDeploymentPath != '' ) {
+ project.ros.mavenDeploymentRepository = "$System.env.ROS_MAVEN_DEPLOYMENT_REPOSITORY"
+ if ( project.ros.mavenDeploymentRepository != 'null' && project.ros.mavenDeploymentRepository != '' ) {
project.uploadArchives {
repositories.mavenDeployer {
- repository(url: 'file://' + project.ros.mavenDeploymentPath)
+ repository(url: 'file://' + project.ros.mavenDeploymentRepository)
}
}
}
@@ -56,5 +56,5 @@ class RosPlugin implements Plugin<Project> {
class RosPluginExtension {
List<String> mavenPath
- String mavenDeploymentPath
+ String mavenDeploymentRepository
}
--
GitLab