Author: jbonofre
Date: Wed Sep 19 19:26:59 2012
New Revision: 1387713
URL: http://svn.apache.org/viewvc?rev=1387713&view=rev
Log:
[KARAF-1798] Fix the exam options and remove Karaf client from itests in order
to avoid multiple slf4j impl
Modified:
karaf/branches/karaf-2.3.x/itests/pom.xml
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java
Modified: karaf/branches/karaf-2.3.x/itests/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/itests/pom.xml?rev=1387713&r1=1387712&r2=1387713&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/itests/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/itests/pom.xml Wed Sep 19 19:26:59 2012
@@ -49,6 +49,12 @@
<artifactId>apache-karaf</artifactId>
<version>${project.version}</version>
<type>tar.gz</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified:
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java?rev=1387713&r1=1387712&r2=1387713&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java
(original)
+++
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java
Wed Sep 19 19:26:59 2012
@@ -94,7 +94,7 @@ public final class KarafDistributionOpti
* @return the exam option.
*/
public static KarafDistributionBaseConfigurationOption
karafDistributionConfiguration(String frameworkUrl, String name, String
karafVersion) {
- return new KarafDistributionBaseConfigurationOption(frameworkUrl,
name, karafVersion);
+ return new KarafDistributionConfigurationOption(frameworkUrl, name,
karafVersion);
}
/**
@@ -104,7 +104,7 @@ public final class KarafDistributionOpti
* @return the exam option.
*/
public static KarafDistributionBaseConfigurationOption
karafDistributionConfiguration() {
- return new KarafDistributionBaseConfigurationOption();
+ return new KarafDistributionConfigurationOption();
}
/**
