karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: [KARAF-3559] Upgrade to easymock 3.3.1
Date Mon, 18 May 2015 18:44:35 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 6978a4629 -> 96d1fa1fe


[KARAF-3559] Upgrade to easymock 3.3.1


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/96d1fa1f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/96d1fa1f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/96d1fa1f

Branch: refs/heads/karaf-3.0.x
Commit: 96d1fa1fe771af91bca5d8bfceccf34bbfe2ca83
Parents: 6978a46
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon May 18 20:44:04 2015 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon May 18 20:44:04 2015 +0200

----------------------------------------------------------------------
 instance/command/pom.xml                                      | 7 -------
 jaas/jasypt/pom.xml                                           | 5 +++++
 .../jasypt/handler/EncryptablePropertyPlaceholderTest.java    | 1 +
 management/server/pom.xml                                     | 7 -------
 pom.xml                                                       | 2 +-
 5 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/96d1fa1f/instance/command/pom.xml
----------------------------------------------------------------------
diff --git a/instance/command/pom.xml b/instance/command/pom.xml
index 51db6f6..299ab8c 100644
--- a/instance/command/pom.xml
+++ b/instance/command/pom.xml
@@ -82,13 +82,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>${easymock.version}</version>
-            <scope>test</scope>
-        </dependency>
-
      </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/karaf/blob/96d1fa1f/jaas/jasypt/pom.xml
----------------------------------------------------------------------
diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml
index 104ce59..26ca162 100644
--- a/jaas/jasypt/pom.xml
+++ b/jaas/jasypt/pom.xml
@@ -113,6 +113,11 @@
             <artifactId>org.apache.aries.util</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-all</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/karaf/blob/96d1fa1f/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptablePropertyPlaceholderTest.java
----------------------------------------------------------------------
diff --git a/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptablePropertyPlaceholderTest.java
b/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptablePropertyPlaceholderTest.java
index 5c80048..700f3db 100644
--- a/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptablePropertyPlaceholderTest.java
+++ b/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptablePropertyPlaceholderTest.java
@@ -40,6 +40,7 @@ import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
 import org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.ops4j.pax.tinybundles.core.TinyBundle;
 import org.osgi.framework.Bundle;

http://git-wip-us.apache.org/repos/asf/karaf/blob/96d1fa1f/management/server/pom.xml
----------------------------------------------------------------------
diff --git a/management/server/pom.xml b/management/server/pom.xml
index 9dbc0bd..8150785 100644
--- a/management/server/pom.xml
+++ b/management/server/pom.xml
@@ -64,13 +64,6 @@
             <artifactId>org.apache.karaf.service.guard</artifactId>
             <scope>provided</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>${easymock.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

http://git-wip-us.apache.org/repos/asf/karaf/blob/96d1fa1f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6dfac11..7baa745 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
         <geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
         <geronimo.annotation-spec.version>1.0.1</geronimo.annotation-spec.version>
         <geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version>
-        <easymock.version>3.2</easymock.version>
+        <easymock.version>3.3.1</easymock.version>
         <equinox.version>3.8.2.v20130124-134944</equinox.version>
         <bndlib.version>2.4.0</bndlib.version>
         <equinox.region.version>1.0.0.v20110506</equinox.region.version>


Mime
View raw message