You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/06/18 23:38:46 UTC

svn commit: r786299 - in /felix/trunk/karaf/assembly/src/main/descriptors: unix-bin.xml windows-bin.xml

Author: gnodet
Date: Thu Jun 18 21:38:45 2009
New Revision: 786299

URL: http://svn.apache.org/viewvc?rev=786299&view=rev
Log:
Fix karaf assemblies

Modified:
    felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
    felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml

Modified: felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml?rev=786299&r1=786298&r2=786299&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml Thu Jun 18 21:38:45 2009
@@ -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>

Modified: felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml?rev=786299&r1=786298&r2=786299&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml Thu Jun 18 21:38:45 2009
@@ -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>