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 2011/12/03 07:47:11 UTC
svn commit: r1209838 - in /karaf/trunk: assemblies/features/framework/pom.xml
assemblies/features/framework/src/main/feature/feature.xml pom.xml
Author: jbonofre
Date: Sat Dec 3 06:47:11 2011
New Revision: 1209838
URL: http://svn.apache.org/viewvc?rev=1209838&view=rev
Log:
[KARAF-988] Add the commons-jexl dependency required by blueprint-jexl-evaluator
Modified:
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1209838&r1=1209837&r2=1209838&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Sat Dec 3 06:47:11 2011
@@ -235,6 +235,16 @@
<artifactId>org.apache.servicemix.bundles.asm</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>region</artifactId>
<version>1.0.0.v20110506</version>
Modified: karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml?rev=1209838&r1=1209837&r2=1209838&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Sat Dec 3 06:47:11 2011
@@ -27,7 +27,9 @@
<bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
<bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/${pax.logging.version}</bundle>
<bundle start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
+ <bundle start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
<bundle start="true" start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
+ <bundle start="true" start-level="20">mvn:org.apache.commons/commons-jexl/${commons-jexl.version}</bundle>
<bundle start="true" start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
<bundle start="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start="true" start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}</bundle>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1209838&r1=1209837&r2=1209838&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sat Dec 3 06:47:11 2011
@@ -116,6 +116,7 @@
<commons-fileupload.version>1.1.1</commons-fileupload.version>
<commons-compress.version>1.3</commons-compress.version>
<commons-io.version>1.3.2</commons-io.version>
+ <commons-jexl.version>2.0</commons-jexl.version>
<commons-lang.bundle.version>2.4_5</commons-lang.bundle.version>
<jasypt.bundle.version>1.7_3</jasypt.bundle.version>
<jetty.version>7.5.4.v20111024</jetty.version>
@@ -1386,6 +1387,11 @@
<artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
<version>${jasypt.bundle.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>${commons-jexl.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>