karaf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Guillaume Nodet <gno...@gmail.com>
Subject Re: svn commit: r964414 - in /karaf/trunk: assembly/pom.xml assembly/src/main/descriptors/unix-bin.xml assembly/src/main/descriptors/windows-bin.xml pom.xml
Date Thu, 15 Jul 2010 18:40:11 GMT
I'm not really sure we should include those jars bt default.  They are
dowlaloded when installing the features and those features are
optional.

On Thursday, July 15, 2010,  <cmoulliard@apache.org> wrote:
> Author: cmoulliard
> Date: Thu Jul 15 13:15:12 2010
> New Revision: 964414
>
> URL: http://svn.apache.org/viewvc?rev=964414&view=rev
> Log:
> KARAF-120 : Add missing jars (used by karaf) in the system local repository
>
> 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/pom.xml
>
> Modified: karaf/trunk/assembly/pom.xml
> URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=964414&r1=964413&r2=964414&view=diff
> ==============================================================================
> --- karaf/trunk/assembly/pom.xml (original)
> +++ karaf/trunk/assembly/pom.xml Thu Jul 15 13:15:12 2010
> @@ -156,6 +156,22 @@
>              <artifactId>org.apache.karaf.management</artifactId>
>          </dependency>
>          <dependency>
> +            <groupId>org.apache.karaf.webconsole</groupId>
> +            <artifactId>org.apache.karaf.webconsole.admin</artifactId>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.karaf.webconsole</groupId>
> +            <artifactId>org.apache.karaf.webconsole.branding</artifactId>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.karaf.webconsole</groupId>
> +            <artifactId>org.apache.karaf.webconsole.features</artifactId>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.karaf.webconsole</groupId>
> +            <artifactId>org.apache.karaf.webconsole.gogo</artifactId>
> +        </dependency>
> +        <dependency>
>              <groupId>org.springframework.osgi</groupId>
>              <artifactId>spring-osgi-extender</artifactId>
>          </dependency>
> @@ -216,6 +232,10 @@
>              <artifactId>org.apache.felix.metatype</artifactId>
>          </dependency>
>          <dependency>
> +            <groupId>org.apache.felix</groupId>
> +            <artifactId>org.apache.felix.webconsole</artifactId>
> +        </dependency>
> +        <dependency>
>              <groupId>org.ops4j.pax.logging</groupId>
>              <artifactId>pax-logging-api</artifactId>
>          </dependency>
>
> 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=964414&r1=964413&r2=964414&view=diff
> ==============================================================================
> --- karaf/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
> +++ karaf/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Jul 15 13:15:12 2010
> @@ -161,6 +161,24 @@
>              <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>
> @@ -190,6 +208,18 @@
>              <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>
>
> 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=964414&r1=964413&r2=964414&view=diff
> ==============================================================================
> --- karaf/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
> +++ karaf/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Jul 15 13:15:12 2010
> @@ -153,6 +153,24 @@
>              <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>
> @@ -182,6 +200,18 @@
>              <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>
>
> Modified: karaf/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=964414&r1=964413&r2=964414&view=diff
> ==============================================================================
> --- karaf/trunk/pom.xml (original)
> +++ karaf/trunk/pom.xml Thu Jul 15 13:15:12 2010
> @@ -128,7 +128,7 @@
>          <pax.exam.version>1.2.0</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>
> +        <pax.url.version>1.1.2</pax.url.version>
>          <pax.web.version>0.7.2</pax.web.version>
>          <servlet.api.version>2.5</servlet.api.version>
>          <spring.osgi.version>1.2.0</spring.osgi.version>
> @@ -340,6 +340,26 @@
>                  <version>${project.version}</version>
>              </dependency>
>              <dependency>
> +                <groupId>org.apache.karaf.webconsole</groupId>
> +                <artifactId>org.apache.karaf.webconsole.admin</artifactId>
> +                <version>${project.version}</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.karaf.webconsole</groupId>
> +                <artifactId>org.apache.karaf.webconsole.branding</artifactId>
> +                <version>${project.version}</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.karaf.webconsole</groupId>
> +                <artifactId>org.apache.karaf.webconsole.features</artifactId>
> +                <version>${project.version}</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.karaf.webconsole</groupId>
> +                <artifactId>org.apache.karaf.webconsole.gogo</artifactId>
> +                <version>${project.version}</version>
> +            </dependency>
> +            <dependency>
>                  <groupId>org.apache.karaf.demos</groupId>
>                  <artifactId>web</artifactId>
>                  <version>${project.version}</version>
>
>
>

-- 
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com

Mime
View raw message