karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [1/2] karaf git commit: [KARAF-3910] Cleanup mina references
Date Sun, 09 Aug 2015 05:26:56 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 458912ccd -> 77b1751f0


[KARAF-3910] Cleanup mina references


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

Branch: refs/heads/master
Commit: 54987bb7f377efb84fe41b625048c8de80a3e88a
Parents: 458912c
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Sun Aug 9 07:24:44 2015 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Sun Aug 9 07:24:44 2015 +0200

----------------------------------------------------------------------
 .../filtered-resources/resources/bin/client     |  1 -
 assemblies/features/standard/pom.xml            |  5 -----
 pom.xml                                         | 20 --------------------
 3 files changed, 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/54987bb7/assemblies/features/base/src/main/filtered-resources/resources/bin/client
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/client b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
index 8086cc0..17b9b13 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/client
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
@@ -256,7 +256,6 @@ setupDefaults() {
     # Add the jars in the lib dir
     CLASSPATH="$KARAF_HOME/system/org/apache/karaf/org.apache.karaf.client/${project.version}/org.apache.karaf.client-${project.version}.jar"
     CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar"
-    CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar"
     CLASSPATH="$CLASSPATH:$KARAF_HOME/system/jline/jline/${jline.version}/jline-${jline.version}.jar"
     CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/54987bb7/assemblies/features/standard/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index 7eb4089..7e47ec3 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -307,11 +307,6 @@
 
         <!-- ssh deps -->
         <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
             <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/karaf/blob/54987bb7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ce7d933..eb1436a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,7 +229,6 @@
         <jsw.version>3.2.3</jsw.version>
         <log4j.version>1.2.17</log4j.version>
         <maven.version>2.0.9</maven.version>
-        <mina.version>2.0.7</mina.version>
         <osgi.version>6.0.0</osgi.version>
         <osgi.compendium.version>5.0.0</osgi.compendium.version>
         <org.json.version>20140107</org.json.version>
@@ -1154,25 +1153,6 @@
                 <version>3.0-alpha-1</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.mina</groupId>
-                <artifactId>mina-core</artifactId>
-                <version>${mina.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.easymock</groupId>
-                        <artifactId>easymock</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.easymock</groupId>
-                        <artifactId>easymockclassextension</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>


Mime
View raw message