You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/08/18 03:16:13 UTC
svn commit: r986546 - in /karaf/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/etc/
assembly/src/main/filtered-resources/minimal/ shell/config/
Author: gnodet
Date: Wed Aug 18 01:16:12 2010
New Revision: 986546
URL: http://svn.apache.org/viewvc?rev=986546&view=rev
Log:
KARAF-106: Provide a minimal distribution of Karaf
Patch provided by Ioannis Canellos
Added:
karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml
- copied, changed from r986279, karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml
- copied, changed from r986279, karaf/trunk/assembly/src/main/descriptors/windows-bin.xml
karaf/trunk/assembly/src/main/filtered-resources/minimal/
karaf/trunk/assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg
karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties
- copied, changed from r986279, karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Modified:
karaf/trunk/assembly/pom.xml
karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
karaf/trunk/assembly/src/main/descriptors/windows-bin.xml
karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
karaf/trunk/assembly/src/main/filtered-resources/features.xml
karaf/trunk/pom.xml
karaf/trunk/shell/config/pom.xml
Modified: karaf/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=986546&r1=986545&r2=986546&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Wed Aug 18 01:16:12 2010
@@ -1,3 +1,4 @@
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
@@ -138,7 +139,7 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.dev</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.boot</artifactId>
@@ -425,6 +426,20 @@
<phase>none</phase>
</execution>
<execution>
+ <id>unix-minimal-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/unix-minimal-bin.xml</descriptor>
+ </descriptors>
+ <finalName>${project.artifactId}-minimal-${project.version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
<id>unix-bin</id>
<phase>package</phase>
<goals>
@@ -439,6 +454,21 @@
</configuration>
</execution>
<execution>
+ <id>windows-minimal-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/windows-minimal-bin.xml</descriptor>
+ </descriptors>
+ <finalName>${project.artifactId}-minimal-${project.version}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <assemblyId />
+ </configuration>
+ </execution>
+ <execution>
<id>windows-bin</id>
<phase>package</phase>
<goals>
Modified: karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=986546&r1=986545&r2=986546&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Aug 18 01:16:12 2010
@@ -38,12 +38,12 @@
<directory>src/main/distribution/text</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>unix</lineEnding>
- </fileSet>
+ </fileSet>
<fileSet>
<directory>src/main/distribution/unix-text</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>unix</lineEnding>
- </fileSet>
+ </fileSet>
<fileSet>
<directory>target/classes/bin</directory>
<outputDirectory>/bin/</outputDirectory>
@@ -58,7 +58,6 @@
<outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
-
<!-- Copy over the examples -->
<fileSet>
<directory>target/classes/demos</directory>
@@ -164,24 +163,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.felix:org.apache.felix.metatype</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.felix:org.apache.felix.webconsole</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.ops4j.pax.logging:pax-logging-api</include>
@@ -211,18 +192,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/karaf/webconsole/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.admin</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.branding</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.features</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.gogo</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.karaf.features:org.apache.karaf.features.core</include>
Copied: karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml (from r986279, karaf/trunk/assembly/src/main/descriptors/unix-bin.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml?p2=karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml&p1=karaf/trunk/assembly/src/main/descriptors/unix-bin.xml&r1=986279&r2=986546&rev=986546&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml Wed Aug 18 01:16:12 2010
@@ -6,17 +6,19 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-<assembly>
- <id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+<assembly xmlns='http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xsi:schemaLocation='http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd'>
+ <id>minimal</id> <!-- Used as artifact discriminator -->
<formats>
<format>tar.gz</format>
</formats>
@@ -38,12 +40,12 @@
<directory>src/main/distribution/text</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>unix</lineEnding>
- </fileSet>
+ </fileSet>
<fileSet>
<directory>src/main/distribution/unix-text</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>unix</lineEnding>
- </fileSet>
+ </fileSet>
<fileSet>
<directory>target/classes/bin</directory>
<outputDirectory>/bin/</outputDirectory>
@@ -55,10 +57,21 @@
</fileSet>
<fileSet>
<directory>target/classes/etc</directory>
+ <excludes>
+ <exclude>org.apache.karaf.features.cfg</exclude>
+ <exclude>startup.properties</exclude>
+ </excludes>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes/minimal</directory>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
+
<!-- Copy over the examples -->
<fileSet>
<directory>target/classes/demos</directory>
@@ -86,7 +99,7 @@
<outputDirectory>/</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
-
+
<!-- Copy over the files that need unix line endings and also chmod to 755 -->
<fileSet>
<directory>src/main/distribution/unix-shell</directory>
@@ -100,10 +113,7 @@
<directory>target/dependencies</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
- <fileSet>
- <directory>target/features-repo</directory>
- <outputDirectory>system</outputDirectory>
- </fileSet>
+
</fileSets>
<files>
@@ -164,24 +174,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.felix:org.apache.felix.metatype</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.felix:org.apache.felix.webconsole</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.ops4j.pax.logging:pax-logging-api</include>
@@ -211,18 +203,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/karaf/webconsole/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.admin</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.branding</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.features</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.gogo</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.karaf.features:org.apache.karaf.features.core</include>
@@ -234,28 +214,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.karaf.admin:org.apache.karaf.admin.core</include>
- <include>org.apache.karaf.admin:org.apache.karaf.admin.command</include>
- <include>org.apache.karaf.admin:org.apache.karaf.admin.management</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.karaf.deployer:org.apache.karaf.deployer.spring</include>
- <include>org.apache.karaf.deployer:org.apache.karaf.deployer.blueprint</include>
- <include>org.apache.karaf.deployer:org.apache.karaf.deployer.features</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
@@ -264,7 +222,6 @@
<include>org.apache.karaf.shell:org.apache.karaf.shell.log</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.config</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.packages</include>
- <include>org.apache.karaf.shell:org.apache.karaf.shell.ssh</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.commands</include>
</includes>
</dependencySet>
@@ -282,24 +239,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.sshd:sshd-core</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/mina/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.mina:mina-core</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.eclipse:osgi</include>
@@ -324,7 +263,5 @@
<include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
</includes>
</dependencySet>
-
</dependencySets>
-
</assembly>
Modified: karaf/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=986546&r1=986545&r2=986546&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Aug 18 01:16:12 2010
@@ -21,44 +21,41 @@
<format>zip</format>
</formats>
<fileSets>
-
-
<!-- Copy license and other files from root -->
- <fileSet>
- <directory>..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README</include>
- <include>RELEASE*</include>
- </includes>
- <lineEnding>dos</lineEnding>
- </fileSet>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README</include>
+ <include>RELEASE*</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
<!-- Copy over everything that needs to get dos line endings -->
- <fileSet>
- <directory>src/main/distribution/text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/main/distribution/windows-text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
- <fileSet>
- <directory>target/classes/bin</directory>
- <outputDirectory>/bin/</outputDirectory>
- <lineEnding>dos</lineEnding>
- <includes>
- <include>admin.bat</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/classes/etc</directory>
- <outputDirectory>/etc/</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
-
+ <fileSet>
+ <directory>src/main/distribution/text</directory>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/distribution/windows-text</directory>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes/bin</directory>
+ <outputDirectory>/bin/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ <includes>
+ <include>admin.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
<!-- Copy over the examples -->
<fileSet>
<directory>target/classes/demos</directory>
@@ -76,22 +73,22 @@
</fileSet>
<!-- Copy over files that should not get the line endings converted -->
- <fileSet>
- <directory>src/main/distribution/binary</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
+ <fileSet>
+ <directory>src/main/distribution/binary</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
<!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
- <fileSet>
- <directory>src/main/distribution/windows-binary</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
+ <fileSet>
+ <directory>src/main/distribution/windows-binary</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
<!-- Copy over jar files -->
- <fileSet>
- <directory>target/dependencies</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
+ <fileSet>
+ <directory>target/dependencies</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
</fileSets>
@@ -153,24 +150,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.felix:org.apache.felix.metatype</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.felix:org.apache.felix.webconsole</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.ops4j.pax.logging:pax-logging-api</include>
@@ -200,18 +179,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/karaf/webconsole/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.admin</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.branding</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.features</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.gogo</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.karaf.features:org.apache.karaf.features.core</include>
Copied: karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml (from r986279, karaf/trunk/assembly/src/main/descriptors/windows-bin.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml?p2=karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml&p1=karaf/trunk/assembly/src/main/descriptors/windows-bin.xml&r1=986279&r2=986546&rev=986546&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml Wed Aug 18 01:16:12 2010
@@ -16,7 +16,7 @@
limitations under the License.
-->
<assembly>
- <id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+ <id>minimal</id> <!-- Used as artifact discriminator -->
<formats>
<format>zip</format>
</formats>
@@ -24,40 +24,49 @@
<!-- Copy license and other files from root -->
- <fileSet>
- <directory>..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README</include>
- <include>RELEASE*</include>
- </includes>
- <lineEnding>dos</lineEnding>
- </fileSet>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README</include>
+ <include>RELEASE*</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
<!-- Copy over everything that needs to get dos line endings -->
- <fileSet>
- <directory>src/main/distribution/text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/main/distribution/windows-text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
- <fileSet>
- <directory>target/classes/bin</directory>
- <outputDirectory>/bin/</outputDirectory>
- <lineEnding>dos</lineEnding>
- <includes>
- <include>admin.bat</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/classes/etc</directory>
- <outputDirectory>/etc/</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
+ <fileSet>
+ <directory>target/classes/text</directory>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/distribution/windows-text</directory>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes/bin</directory>
+ <outputDirectory>/bin/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ <includes>
+ <include>admin.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes/etc</directory>
+ <excludes>
+ <exclude>org.apache.karaf.features.cfg</exclude>
+ <exclude>startup.properties</exclude>
+ </excludes>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes/minimal</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
<!-- Copy over the examples -->
<fileSet>
@@ -76,22 +85,22 @@
</fileSet>
<!-- Copy over files that should not get the line endings converted -->
- <fileSet>
- <directory>src/main/distribution/binary</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
+ <fileSet>
+ <directory>src/main/distribution/binary</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
<!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
- <fileSet>
- <directory>src/main/distribution/windows-binary</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
+ <fileSet>
+ <directory>src/main/distribution/windows-binary</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
<!-- Copy over jar files -->
- <fileSet>
- <directory>target/dependencies</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
+ <fileSet>
+ <directory>target/dependencies</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
</fileSets>
@@ -153,24 +162,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.felix:org.apache.felix.metatype</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.felix:org.apache.felix.webconsole</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.ops4j.pax.logging:pax-logging-api</include>
@@ -200,18 +191,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/karaf/webconsole/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.admin</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.branding</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.features</include>
- <include>org.apache.karaf.webconsole:org.apache.karaf.webconsole.gogo</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.karaf.features:org.apache.karaf.features.core</include>
@@ -223,28 +202,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.karaf.admin:org.apache.karaf.admin.core</include>
- <include>org.apache.karaf.admin:org.apache.karaf.admin.command</include>
- <include>org.apache.karaf.admin:org.apache.karaf.admin.management</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.karaf.deployer:org.apache.karaf.deployer.spring</include>
- <include>org.apache.karaf.deployer:org.apache.karaf.deployer.blueprint</include>
- <include>org.apache.karaf.deployer:org.apache.karaf.deployer.features</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
@@ -271,24 +228,6 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.sshd:sshd-core</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/mina/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.mina:mina-core</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.eclipse:osgi</include>
Modified: karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=986546&r1=986545&r2=986546&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties Wed Aug 18 01:16:12 2010
@@ -37,9 +37,6 @@ org/apache/aries/blueprint/org.apache.ar
org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar=30
-org/apache/karaf/deployer/org.apache.karaf.deployer.spring/${project.version}/org.apache.karaf.deployer.spring-${project.version}.jar=30
-org/apache/karaf/deployer/org.apache.karaf.deployer.blueprint/${project.version}/org.apache.karaf.deployer.blueprint-${project.version}.jar=30
-org/apache/karaf/deployer/org.apache.karaf.deployer.features/${project.version}/org.apache.karaf.deployer.features-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.osgi/${project.version}/org.apache.karaf.shell.osgi-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.log/${project.version}/org.apache.karaf.shell.log-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.packages/${project.version}/org.apache.karaf.shell.packages-${project.version}.jar=30
@@ -47,9 +44,6 @@ org/apache/karaf/shell/org.apache.karaf.
org/apache/karaf/shell/org.apache.karaf.shell.dev/${project.version}/org.apache.karaf.shell.dev-${project.version}.jar=30
org/apache/karaf/jaas/org.apache.karaf.jaas.config/${project.version}/org.apache.karaf.jaas.config-${project.version}.jar=30
org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${project.version}/org.apache.karaf.jaas.modules-${project.version}.jar=30
-org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar=30
-org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar=30
-org/apache/karaf/admin/org.apache.karaf.admin.management/${project.version}/org.apache.karaf.admin.management-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.core/${project.version}/org.apache.karaf.features.core-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.command/${project.version}/org.apache.karaf.features.command-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.management/${project.version}/org.apache.karaf.features.management-${project.version}.jar=30
@@ -58,6 +52,14 @@ org/apache/karaf/org.apache.karaf.manage
org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
+org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar=30
+org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar=30
+org/apache/karaf/admin/org.apache.karaf.admin.management/${project.version}/org.apache.karaf.admin.management-${project.version}.jar=30
+
org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.ssh/${project.version}/org.apache.karaf.shell.ssh-${project.version}.jar=30
+
+org/apache/karaf/deployer/org.apache.karaf.deployer.spring/${project.version}/org.apache.karaf.deployer.spring-${project.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.blueprint/${project.version}/org.apache.karaf.deployer.blueprint-${project.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.features/${project.version}/org.apache.karaf.deployer.features-${project.version}.jar=30
Modified: karaf/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/features.xml?rev=986546&r1=986545&r2=986546&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/features.xml Wed Aug 18 01:16:12 2010
@@ -79,10 +79,11 @@
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${project.version}</bundle>
</feature>
<feature name="ssh" version="${project.version}">
- <config name="org.apache.karaf.shell.ssh">
+ <config name="org.apache.karaf.shell">
sshPort=8101
sshHost=0.0.0.0
sshRealm=karaf
+ hostKey=${karaf.base}/etc/host.key
</config>
<bundle>mvn:org.apache.mina/mina-core/${mina.version}</bundle>
<bundle>mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
Added: karaf/trunk/assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg?rev=986546&view=auto
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg (added)
+++ karaf/trunk/assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg Wed Aug 18 01:16:12 2010
@@ -0,0 +1,28 @@
+################################################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+#
+# Comma separated list of features repositories to register by default
+#
+featuresRepositories=mvn:org.apache.karaf/apache-karaf/${project.version}/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
+featuresBoot=management
Copied: karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties (from r986279, karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties)
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties?p2=karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties&p1=karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties&r1=986279&r2=986546&rev=986546&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties Wed Aug 18 01:16:12 2010
@@ -37,27 +37,18 @@ org/apache/aries/blueprint/org.apache.ar
org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar=30
-org/apache/karaf/deployer/org.apache.karaf.deployer.spring/${project.version}/org.apache.karaf.deployer.spring-${project.version}.jar=30
-org/apache/karaf/deployer/org.apache.karaf.deployer.blueprint/${project.version}/org.apache.karaf.deployer.blueprint-${project.version}.jar=30
-org/apache/karaf/deployer/org.apache.karaf.deployer.features/${project.version}/org.apache.karaf.deployer.features-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.osgi/${project.version}/org.apache.karaf.shell.osgi-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.log/${project.version}/org.apache.karaf.shell.log-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.config/${project.version}/org.apache.karaf.shell.config-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.packages/${project.version}/org.apache.karaf.shell.packages-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.commands/${project.version}/org.apache.karaf.shell.commands-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.dev/${project.version}/org.apache.karaf.shell.dev-${project.version}.jar=30
org/apache/karaf/jaas/org.apache.karaf.jaas.config/${project.version}/org.apache.karaf.jaas.config-${project.version}.jar=30
org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${project.version}/org.apache.karaf.jaas.modules-${project.version}.jar=30
-org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar=30
-org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar=30
-org/apache/karaf/admin/org.apache.karaf.admin.management/${project.version}/org.apache.karaf.admin.management-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.core/${project.version}/org.apache.karaf.features.core-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.command/${project.version}/org.apache.karaf.features.command-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.management/${project.version}/org.apache.karaf.features.management-${project.version}.jar=30
org/apache/karaf/org.apache.karaf.management/${project.version}/org.apache.karaf.management-${project.version}.jar=30
org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
-
-org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
-org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
-org/apache/karaf/shell/org.apache.karaf.shell.ssh/${project.version}/org.apache.karaf.shell.ssh-${project.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
\ No newline at end of file
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=986546&r1=986545&r2=986546&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Aug 18 01:16:12 2010
@@ -101,13 +101,6 @@
<aopalliance.version>1.0_3</aopalliance.version>
<cglib.version>2.1_3_4</cglib.version>
<commons.logging.version>1.1.1</commons.logging.version>
- <commons-configuration.version>1.4_1-SNAPSHOT</commons-configuration.version>
- <commons-beanutils.version>1.8.2_1-SNAPSHOT</commons-beanutils.version>
- <commons-codec.version>1.3_2</commons-codec.version>
- <commons-jxpath.version>1.2_4-SNAPSHOT</commons-jxpath.version>
- <commons-collections.version>3.2.1</commons-collections.version>
- <commons-digester.version>1.8_1-SNAPSHOT</commons-digester.version>
- <commons-lang.version>2.4_3</commons-lang.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<depends.maven.plugin.version>1.0</depends.maven.plugin.version>
<easymock.version>2.4</easymock.version>
@@ -115,14 +108,14 @@
<felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.configadmin.version>1.2.4</felix.configadmin.version>
- <felix.fileinstall.version>3.0.0</felix.fileinstall.version>
+ <felix.fileinstall.version>3.0.2</felix.fileinstall.version>
<felix.framework.version>3.0.1</felix.framework.version>
<felix.gogo.version>0.4.0</felix.gogo.version>
<felix.osgi.version>1.4.0</felix.osgi.version>
<felix.plugin.version>2.1.0</felix.plugin.version>
<felix.utils.version>1.0.0</felix.utils.version>
- <felix.webconsole.version>3.1.0</felix.webconsole.version>
- <felix.metatype.version>1.0.2</felix.metatype.version>
+ <felix.webconsole.version>3.1.2</felix.webconsole.version>
+ <felix.metatype.version>1.0.4</felix.metatype.version>
<aries.blueprint.version>0.1-r964701</aries.blueprint.version>
<aries.jmx.version>0.1-r964701</aries.jmx.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
@@ -133,7 +126,7 @@
<log4j.version>1.2.16</log4j.version>
<maven.version>2.0.9</maven.version>
<mina.version>2.0.0-RC1</mina.version>
- <pax.exam.version>1.2.0</pax.exam.version>
+ <pax.exam.version>1.2.1</pax.exam.version>
<pax.logging.version>1.5.2</pax.logging.version>
<pax.runner.version>1.4.0</pax.runner.version>
<pax.url.version>1.1.3</pax.url.version>
@@ -604,11 +597,6 @@
<version>${commons.logging.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
- <version>${commons-configuration.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.artifact</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.0-alpha-1</version>
Modified: karaf/trunk/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/pom.xml?rev=986546&r1=986545&r2=986546&view=diff
==============================================================================
--- karaf/trunk/shell/config/pom.xml (original)
+++ karaf/trunk/shell/config/pom.xml Wed Aug 18 01:16:12 2010
@@ -46,10 +46,6 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>