You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2011/07/28 16:51:29 UTC
svn commit: r1151880 - in /karaf/branches/karaf-2.2.x/deployer/kar: pom.xml
src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
Author: pieber
Date: Thu Jul 28 14:51:29 2011
New Revision: 1151880
URL: http://svn.apache.org/viewvc?rev=1151880&view=rev
Log:
[KARAF-795] Unify easymock version
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/branches/karaf-2.2.x/deployer/kar/pom.xml
karaf/branches/karaf-2.2.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
Modified: karaf/branches/karaf-2.2.x/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/kar/pom.xml?rev=1151880&r1=1151879&r2=1151880&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/kar/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/kar/pom.xml Thu Jul 28 14:51:29 2011
@@ -23,8 +23,8 @@
<parent>
<groupId>org.apache.karaf.deployer</groupId>
- <artifactId>deployer</artifactId>
- <version>2.2.3-SNAPSHOT</version>
+ <artifactId>deployer</artifactId>
+ <version>2.2.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.karaf.deployer.kar</artifactId>
@@ -72,19 +72,6 @@
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: karaf/branches/karaf-2.2.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java?rev=1151880&r1=1151879&r2=1151880&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java (original)
+++ karaf/branches/karaf-2.2.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java Thu Jul 28 14:51:29 2011
@@ -112,7 +112,7 @@ public class KarArtifactInstallerTest {
@Test
public void shouldExtractAndRegisterFeaturesFromKar() throws Exception {
// Setup expectations on the features service
- featuresService.addRepository(EasyMock.anyObject(URI.class));
+ featuresService.addRepository((URI)EasyMock.anyObject());
EasyMock.replay(featuresService);
// Test
@@ -128,7 +128,7 @@ public class KarArtifactInstallerTest {
@Test
public void shouldLogAndNotThrowExceptionIfCannotAddToFeaturesRepository() throws Exception {
// Setup expectations on the features service
- featuresService.addRepository(EasyMock.anyObject(URI.class));
+ featuresService.addRepository((URI)EasyMock.anyObject());
EasyMock.expectLastCall().andThrow(new Exception("Unable to add to repository."));
EasyMock.replay(featuresService);
@@ -147,7 +147,7 @@ public class KarArtifactInstallerTest {
// Setup expectations on the features service: the addRepository
// should only be added once, as the update command should be ignored!
//
- featuresService.addRepository(EasyMock.anyObject(URI.class));
+ featuresService.addRepository((URI)EasyMock.anyObject());
EasyMock.replay(featuresService);
// Test
@@ -164,7 +164,7 @@ public class KarArtifactInstallerTest {
@Test
public void shouldExtractAndRegisterFeaturesFromZip() throws Exception {
// Setup expectations on the features service
- featuresService.addRepository(EasyMock.anyObject(URI.class));
+ featuresService.addRepository((URI)EasyMock.anyObject());
EasyMock.replay(featuresService);
// Test