Author: ieugen
Date: Thu Feb 7 11:24:21 2013
New Revision: 1443419
URL: http://svn.apache.org/viewvc?rev=1443419&view=rev
Log:
Fixed merge issue
Modified:
james/server/trunk/karaf/features/src/main/resources/features.xml
Modified: james/server/trunk/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/features/src/main/resources/features.xml?rev=1443419&r1=1443418&r2=1443419&view=diff
==============================================================================
--- james/server/trunk/karaf/features/src/main/resources/features.xml (original)
+++ james/server/trunk/karaf/features/src/main/resources/features.xml Thu Feb
7 11:24:21 2013
@@ -10,14 +10,8 @@
<!-- james 3.0-beta5 features -->
<feature name="james-server-lifecycle-api" version="${project.version}">
-<<<<<<< HEAD
-
<bundle>mvn:org.apache.james/james-server-lifecycle-api/${project.version}</bundle>
- <feature
version="${commons-configuration-osgi.version}">commons-configuration</feature>
- <bundle>mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle>
-=======
<bundle
dependency="true">mvn:org.apache.james/james-server-lifecycle-api/${project.version}</bundle>
<feature
version="${commons-configuration-osgi.version}">commons-configuration</feature>
->>>>>>> karafs
</feature>
<feature name="james-server-filesystem-api" version="${project.version}">
@@ -97,13 +91,9 @@
</feature>
<feature name="james-server-dnsservice-dnsjava"
version="${project.version}">
-<<<<<<< HEAD
- <feature
version="${commons-configuration-osgi.version}">commons-configuration</feature>
-=======
<feature>commons-configuration</feature>
<feature>dnsjava-2.1.1</feature>
<feature>james-server-dnsservice-library</feature>
->>>>>>> karafs
<bundle
dependency="true">mvn:org.apache.james/james-server-dnsservice-api/${project.version}</bundle>
<bundle
dependency="true">mvn:org.apache.james/james-server-dnsservice-dnsjava/${project.version}</bundle>
<bundle
dependency="true">mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
@@ -114,17 +104,10 @@
</feature>
<feature name="james-server-dnsservice-library"
version="${project.version}">
-<<<<<<< HEAD
- <bundle
dependency="true">mvn:org.apache.james/james-server-dnsservice-library/${project.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.james/james-server-dnsservice-api/${project.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
- <bundle
dependency="true">mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle>
-=======
<feature>dnsjava-2.1.1</feature>
<bundle
dependency="true">mvn:org.apache.james/james-server-dnsservice-library/${project.version}</bundle>
<bundle
dependency="true">mvn:org.apache.james/james-server-dnsservice-api/${project.version}</bundle>
<bundle
dependency="true">mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
->>>>>>> karafs
<bundle dependency="true">
mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}
</bundle>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
