You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/08/09 07:26:57 UTC
[2/2] karaf git commit: [KARAF-3910] Cleanup mina references
[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/77b1751f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/77b1751f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/77b1751f
Branch: refs/heads/master
Commit: 77b1751f0324c0c92f51fc0112de672cdb0975b6
Parents: 54987bb
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sun Aug 9 07:26:47 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sun Aug 9 07:26:47 2015 +0200
----------------------------------------------------------------------
.../filtered-resources/resources/bin/client.bat | 1 -
assemblies/features/framework/pom.xml | 1 -
assemblies/features/static/pom.xml | 1 -
etc/appended-resources/supplemental-models.xml | 34 --------------------
4 files changed, 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/77b1751f/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
index fd3497a..e613bbe 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
@@ -117,7 +117,6 @@ if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END
set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\org.apache.karaf.client\${project.version}\org.apache.karaf.client-${project.version}.jar
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\sshd\sshd-core\${sshd.version}\sshd-core-${sshd.version}.jar
-set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\mina\mina-core\${mina.version}\mina-core-${mina.version}.jar
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\jline\jline\${jline.version}\jline-${jline.version}.jar
set 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/77b1751f/assemblies/features/framework/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml
index df8e9fd..a654123 100644
--- a/assemblies/features/framework/pom.xml
+++ b/assemblies/features/framework/pom.xml
@@ -270,7 +270,6 @@
<configuration>
<excludedArtifactIds>
<excludedArtifactId>slf4j-api</excludedArtifactId>
- <excludedArtifactId>mina-core</excludedArtifactId>
<excludedArtifactId>sshd-core</excludedArtifactId>
<excludedArtifactId>jline</excludedArtifactId>
<excludedArtifactId>core</excludedArtifactId>
http://git-wip-us.apache.org/repos/asf/karaf/blob/77b1751f/assemblies/features/static/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/static/pom.xml b/assemblies/features/static/pom.xml
index 2a7c236..47b1369 100644
--- a/assemblies/features/static/pom.xml
+++ b/assemblies/features/static/pom.xml
@@ -156,7 +156,6 @@
<configuration>
<excludedArtifactIds>
<excludedArtifactId>slf4j-api</excludedArtifactId>
- <excludedArtifactId>mina-core</excludedArtifactId>
<excludedArtifactId>sshd-core</excludedArtifactId>
<excludedArtifactId>jline</excludedArtifactId>
<excludedArtifactId>core</excludedArtifactId>
http://git-wip-us.apache.org/repos/asf/karaf/blob/77b1751f/etc/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/etc/appended-resources/supplemental-models.xml b/etc/appended-resources/supplemental-models.xml
index 64b84ed..d1ee598 100644
--- a/etc/appended-resources/supplemental-models.xml
+++ b/etc/appended-resources/supplemental-models.xml
@@ -298,40 +298,6 @@
</supplement>
<supplement>
<project>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <name>Apache MINA Core API</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-ssl</artifactId>
- <name>Apache MINA SSL Filter</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<name>Apache Commons Codec</name>