From 5e5f779bcf1e0ddedcfef4b8ebab1e4bd8a8b332 Mon Sep 17 00:00:00 2001 From: Daniel Stonier Date: Sat, 21 Feb 2015 01:01:40 +0900 Subject: [PATCH] revert move to mavenCentral for apache artifacts, see #40. --- message_generation/build.gradle | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/message_generation/build.gradle b/message_generation/build.gradle index 1d6d37d4..d310b6a0 100644 --- a/message_generation/build.gradle +++ b/message_generation/build.gradle @@ -14,14 +14,26 @@ * the License. */ +/* Shift to mavenCentral apache artifacts (currently rosajva_mvn_repo) when ready + * Currently we have conflicts when dexing android executables since there is a + * mix of mavenCentral/springsource providers. + * + * https://github.com/rosjava/rosjava_bootstrap/issues/40#issuecomment-75043854 + */ +/* +compile 'org.apache.directory.studio:org.apache.commons.codec:1.8' +compile 'org.apache.directory.studio:org.apache.commons.io:2.4' +compile 'org.apache.directory.studio:org.apache.commons.lang:2.6' +*/ + //noinspection GroovyAssignabilityCheck dependencies { compile 'io.netty:netty:3.5.2.Final' compile 'com.google.guava:guava:12.0' - compile 'org.apache.directory.studio:org.apache.commons.codec:1.8' - compile 'org.apache.directory.studio:org.apache.commons.io:2.4' + compile 'org.apache.commons:com.springsource.org.apache.commons.codec:1.3.0' + compile 'org.apache.commons:com.springsource.org.apache.commons.io:1.4.0' compile 'commons-pool:commons-pool:1.6' - compile 'org.apache.directory.studio:org.apache.commons.lang:2.6' + compile 'org.apache.commons:com.springsource.org.apache.commons.lang:2.4.0' compile project(':gradle_plugins') testCompile 'junit:junit:4.8.2' }