commit 748228891ddad9964bab09798d53eecb976a6b09
author Guillaume Nodet <gnodet@apache.org> Thu Jun 18 21:38:45 2009 +0000
committer Guillaume Nodet <gnodet@apache.org> Thu Jun 18 21:38:45 2009 +0000
tree 2caade5a1986c77f79e60ce2d458baf7301d7eff
parent c5a41a7c3bc727ab4db0d1e9e2d9a5f57d3b2250

Fix karaf assemblies

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@786299 13f79535-47bb-0310-9956-ffa450edef68

karaf/assembly/src/main/descriptors/unix-bin.xml

diff --git a/karaf/assembly/src/main/descriptors/unix-bin.xml b/karaf/assembly/src/main/descriptors/unix-bin.xml
index 606b739..6c5c91c 100644
--- a/karaf/assembly/src/main/descriptors/unix-bin.xml
+++ b/karaf/assembly/src/main/descriptors/unix-bin.xml
@@ -174,18 +174,18 @@
             </includes>
         </dependencySet>
         -->
+        <!--
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
             <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <!--
                 <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-                -->
             </includes>
         </dependencySet>
+        -->
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>

karaf/assembly/src/main/descriptors/windows-bin.xml

diff --git a/karaf/assembly/src/main/descriptors/windows-bin.xml b/karaf/assembly/src/main/descriptors/windows-bin.xml
index 250d2eb..2df7e2e 100644
--- a/karaf/assembly/src/main/descriptors/windows-bin.xml
+++ b/karaf/assembly/src/main/descriptors/windows-bin.xml
@@ -166,18 +166,18 @@
             </includes>
         </dependencySet>
         -->
+        <!--
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
             <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <!--
                 <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-                -->
             </includes>
         </dependencySet>
+        -->
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>