Author: zoe
Date: Tue Feb 8 14:56:20 2011
New Revision: 1068431
URL: http://svn.apache.org/viewvc?rev=1068431&view=rev
Log:
ARIES-571 Change in default parent pom
Modified:
aries/trunk/parent/default-parent/pom.xml
Modified: aries/trunk/parent/default-parent/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/parent/default-parent/pom.xml?rev=1068431&r1=1068430&r2=1068431&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/pom.xml Tue Feb 8 14:56:20 2011
@@ -568,34 +568,12 @@
<properties>
<!-- OSGi bundles properties -->
-
<aries.osgi.import.aries.version>version="[$(version;==;${aries.osgi.version.clean}),$(version;=+;${aries.osgi.version.clean}))"</aries.osgi.import.aries.version>
-
<aries.osgi.import.strict.version>version="[$(version;===;${aries.osgi.version.clean}),$(version;==+;${aries.osgi.version.clean}))"</aries.osgi.import.strict.version>
<aries.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</aries.osgi.import.default.version>
- <aries.osgi.import.defaults>
- <!--
- org.springframework.*;version="[2.5,4)",
- org.apache.commons.logging.*;version="[1.1,2)",
- org.apache.cxf.*;version="[2.2.5,3)",
- org.apache.qpid.*;version="[0.5,0.6)",
- org.apache.abdera.*;version="[0.4,0.5)",
- org.apache.commons.httpclient.*;version="[3.1,4.0)",
- org.apache.mina.*;version="[1.1.7,2.0)",
- org.apache.velocity.*;version="[1.6.2,2)",
- org.apache.xmlbeans.*;version="[2.4,3)",
- com.thoughtworks.xstream.*;version="[1.3,2)",
- org.antlr.stringtemplate.*;version="[3.0,4)",
- org.jivesoftware.smack.*;version="[3.0,4)",
- org.ccil.cowan.tagsoup.*;version="[1.2,2)",
- org.mortbay.cometd.*;version="[6.1,7)",
- net.sf.flatpack.*;version="[3.1.1,4)",
- freemarker.*;version="[2.3.15,3)",
- javax.persistence.*;version="[1.1,2)",
- -->
- </aries.osgi.import.defaults>
+ <aries.osgi.import.defaults />
<aries.osgi.import.before.defaults />
<aries.osgi.import.additional />
<aries.osgi.import.pkg>
- org.apache.aries.*;${aries.osgi.import.aries.version},
+ org.apache.aries.*,
${aries.osgi.import.before.defaults},
${aries.osgi.import.defaults},
${aries.osgi.import.additional},
