Skip to content
Snippets Groups Projects
Commit c6e92651 authored by Daniel Stonier's avatar Daniel Stonier
Browse files

maven deployment path -> maven deployment repository.

parent 562a8a5d
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ task wrapper(type: Wrapper) { ...@@ -20,7 +20,7 @@ task wrapper(type: Wrapper) {
project.ext { project.ext {
/* the ros plugin defines this, but since we're building the plugin... */ /* 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(':') rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':')
} }
...@@ -49,10 +49,10 @@ subprojects { ...@@ -49,10 +49,10 @@ subprojects {
url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master' url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master'
} }
} }
if ( project.rosMavenDeploymentPath != 'null' && project.rosMavenDeploymentPath != '' ) { if ( project.rosMavenDeploymentRepository != 'null' && project.rosMavenDeploymentRepository != '' ) {
uploadArchives { uploadArchives {
repositories.mavenDeployer { repositories.mavenDeployer {
repository(url: 'file://' + project.rosMavenDeploymentPath) repository(url: 'file://' + project.rosMavenDeploymentRepository)
} }
} }
} }
......
...@@ -8,7 +8,7 @@ import org.gradle.api.*; ...@@ -8,7 +8,7 @@ import org.gradle.api.*;
* Provides information about the ros workspace. * Provides information about the ros workspace.
* *
* - project.ros.mavenPath : location of local ros maven repositories (in your chained workspaces) * - 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 * It also performs the following actions
* *
...@@ -27,11 +27,11 @@ class RosPlugin implements Plugin<Project> { ...@@ -27,11 +27,11 @@ class RosPlugin implements Plugin<Project> {
/* Create project.ros.* property extensions */ /* Create project.ros.* property extensions */
project.extensions.create("ros", RosPluginExtension) project.extensions.create("ros", RosPluginExtension)
project.ros.mavenPath = "$System.env.ROS_MAVEN_PATH".split(':') project.ros.mavenPath = "$System.env.ROS_MAVEN_PATH".split(':')
project.ros.mavenDeploymentPath = "$System.env.ROS_MAVEN_DEPLOYMENT_PATH" project.ros.mavenDeploymentRepository = "$System.env.ROS_MAVEN_DEPLOYMENT_REPOSITORY"
if ( project.ros.mavenDeploymentPath != 'null' && project.ros.mavenDeploymentPath != '' ) { if ( project.ros.mavenDeploymentRepository != 'null' && project.ros.mavenDeploymentRepository != '' ) {
project.uploadArchives { project.uploadArchives {
repositories.mavenDeployer { repositories.mavenDeployer {
repository(url: 'file://' + project.ros.mavenDeploymentPath) repository(url: 'file://' + project.ros.mavenDeploymentRepository)
} }
} }
} }
...@@ -56,5 +56,5 @@ class RosPlugin implements Plugin<Project> { ...@@ -56,5 +56,5 @@ class RosPlugin implements Plugin<Project> {
class RosPluginExtension { class RosPluginExtension {
List<String> mavenPath List<String> mavenPath
String mavenDeploymentPath String mavenDeploymentRepository
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment