karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: Cleanup in Cellar dependencies
Date Mon, 23 Jun 2014 09:09:31 GMT
Repository: karaf-cellar
Updated Branches:
  refs/heads/master a7c3ce45a -> 91f8dea95


Cleanup in Cellar dependencies


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

Branch: refs/heads/master
Commit: 91f8dea95b32bd21202fbd597ce6e9dc5e603273
Parents: a7c3ce4
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon Jun 23 11:09:02 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Jun 23 11:09:02 2014 +0200

----------------------------------------------------------------------
 cloud/pom.xml      |  6 +++---
 features/pom.xml   |  4 ++--
 pom.xml            | 15 +++------------
 webconsole/pom.xml |  8 ++++----
 4 files changed, 12 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/91f8dea9/cloud/pom.xml
----------------------------------------------------------------------
diff --git a/cloud/pom.xml b/cloud/pom.xml
index ab74450..7d1aa6b 100644
--- a/cloud/pom.xml
+++ b/cloud/pom.xml
@@ -96,10 +96,10 @@
 
         <!-- Testing -->
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/91f8dea9/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index c3fba66..bd70805 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -100,8 +100,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/91f8dea9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8f97ad5..b2450a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,11 +43,9 @@
         <jclouds.version>1.4.0</jclouds.version>
         <joda-time.version>2.1</joda-time.version>
         <junit.version>4.11</junit.version>
-        <junit.bundle.version>4.11_1</junit.bundle.version>
         <karaf.version>3.0.1</karaf.version>
         <osgi.version>4.3.1</osgi.version>
         <osgi.compendium.version>4.3.1</osgi.compendium.version>
-        <servlet.api.version>2.5</servlet.api.version>
         <slf4j.version>1.7.7</slf4j.version>
     </properties>
 
@@ -251,16 +249,9 @@
 
             <!-- Servlet API -->
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>${servlet.api.version}</version>
-            </dependency>
-
-            <!-- ServiceMix Bundles -->
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.junit</artifactId>
-                <version>${junit.bundle.version}</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-servlet_3.0_spec</artifactId>
+                <version>1.0</version>
             </dependency>
 
             <!-- SLF4J -->

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/91f8dea9/webconsole/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index ecba450..87459da 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -76,13 +76,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>


Mime
View raw message