Author: oheger
Date: Tue May 22 20:20:14 2012
New Revision: 1341612
URL: http://svn.apache.org/viewvc?rev=1341612&view=rev
Log:
[CONFIGURATION-482] Optional dependencies are now marked with
resolution:=optional in the Import-Package section of the OSGi manifest. Thanks
to Chris Seieroe for the proposal.
Modified:
commons/proper/configuration/trunk/pom.xml
commons/proper/configuration/trunk/src/changes/changes.xml
Modified: commons/proper/configuration/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/pom.xml?rev=1341612&r1=1341611&r2=1341612&view=diff
==============================================================================
--- commons/proper/configuration/trunk/pom.xml (original)
+++ commons/proper/configuration/trunk/pom.xml Tue May 22 20:20:14 2012
@@ -435,6 +435,20 @@
<commons.jira.pid>12310467</commons.jira.pid>
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
+
+ <!-- Explicitly declare optional dependencies for the OSGi manifest. -->
+ <commons.osgi.import>
+ org.apache.commons.beanutils.*;resolution:=optional,
+ org.apache.commons.digester.*;resolution:=optional,
+ org.apache.commons.collections.*;resolution:=optional,
+ org.apache.commons.codec.*;resolution:=optional,
+ org.apache.commons.jxpath.*;resolution:=optional,
+ org.apache.xml.resolver.*;resolution:=optional,
+ javax.servlet.*;resolution:=optional,
+ org.apache.commons.jexl2.*;resolution:=optional,
+ org.apache.commons.vfs2.*;resolution:=optional,
+ *
+ </commons.osgi.import>
</properties>
<build>
Modified: commons/proper/configuration/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/changes/changes.xml?rev=1341612&r1=1341611&r2=1341612&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/changes/changes.xml (original)
+++ commons/proper/configuration/trunk/src/changes/changes.xml Tue May 22
20:20:14 2012
@@ -35,6 +35,10 @@
DataConfiguration.get() now also works with String properties and if no
data type conversion is required.
</action>
+ <action dev="oheger" type="update" issue="CONFIGURATION-482"
due-to="Chris Seieroe">
+ The Import-Package section in the OSGi manifest now uses the
+ resolution:=optional directive for optional dependencies.
+ </action>
<action dev="oheger" type="fix" issue="CONFIGURATION-481">
Variable substitution in configuration sources declared in a definition
file for DefaultConfigurationBuilder now works across multiple sources.
