You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2010/06/19 04:23:15 UTC
svn commit: r956175 - in /velocity/engine/trunk: build/build.properties
src/changes/changes.xml
Author: nbubna
Date: Sat Jun 19 02:23:14 2010
New Revision: 956175
URL: http://svn.apache.org/viewvc?rev=956175&view=rev
Log:
VELOCITY-768 mark optional depencies in OSGi bundle manifest (thanks to Matt Ryall)
Modified:
velocity/engine/trunk/build/build.properties
velocity/engine/trunk/src/changes/changes.xml
Modified: velocity/engine/trunk/build/build.properties
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/build/build.properties?rev=956175&r1=956174&r2=956175&view=diff
==============================================================================
--- velocity/engine/trunk/build/build.properties (original)
+++ velocity/engine/trunk/build/build.properties Sat Jun 19 02:23:14 2010
@@ -166,7 +166,260 @@ javac.source=1.4
########################################################################
# OSGi stuff
-import =com.werken.xpath,javax.naming,javax.servlet,javax.servlet.http,javax.sql,org.apache.commons.collections,org.apache.commons.collections.map,org.apache.commons.lang,org.apache.commons.lang.builder,org.apache.commons.lang.text,org.apache.commons.logging,org.apache.log,org.apache.log.format,org.apache.log.output.io,org.apache.log4j,org.apache.oro.text.perl,org.apache.tools.ant,org.apache.tools.ant.taskdefs,org.jdom,org.jdom.input,org.jdom.output,org.xml.sax
-dep.import=com.werken.xpath,javax.naming,javax.servlet,javax.servlet.http,javax.sql,org.apache.commons.logging,org.apache.log,org.apache.log.format,org.apache.log.output.io,org.apache.log4j,org.apache.tools.ant,org.apache.tools.ant.taskdefs,org.jdom,org.jdom.input,org.jdom.output,org.xml.sax
-export =org.apache.velocity;uses:="org.apache.velocity.context,org.apache.velocity.exception,org.apache.velocity.runtime.resource",org.apache.velocity.anakia;uses:="com.werken.xpath,org.apache.tools.ant,org.apache.tools.ant.taskdefs,org.jdom,org.jdom.output",org.apache.velocity.app;uses:="org.apache.commons.collections,org.apache.velocity,org.apache.velocity.context,org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.log",org.apache.velocity.app.event;uses:="org.apache.velocity.context,org.apache.velocity.runtime,org.apache.velocity.util.introspection",org.apache.velocity.app.event.implement;uses:="org.apache.velocity.app.event,org.apache.velocity.context,org.apache.velocity.runtime,org.apache.velocity.util,org.apache.velocity.util.introspection",org.apache.velocity.app.tools;uses:="org.apache.velocity.context",org.apache.velocity.context;uses:="org.apache.velocity.app.event,org.apache.velocity.exception,org.apache.velocity.runtime,org.ap
ache.velocity.runtime.parser.node,org.apache.velocity.runtime.resource,org.apache.velocity.util.introspection",org.apache.velocity.convert,org.apache.velocity.exception;uses:="org.apache.velocity.runtime.parser,org.apache.velocity.util.introspection",org.apache.velocity.io,org.apache.velocity.runtime;uses:="org.apache.commons.collections,org.apache.velocity,org.apache.velocity.app.event,org.apache.velocity.context,org.apache.velocity.exception,org.apache.velocity.runtime.directive,org.apache.velocity.runtime.log,org.apache.velocity.runtime.parser,org.apache.velocity.runtime.parser.node,org.apache.velocity.runtime.resource,org.apache.velocity.util.introspection",org.apache.velocity.runtime.defaults,org.apache.velocity.runtime.directive;uses:="org.apache.velocity.context,org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.parser,org.apache.velocity.runtime.parser.node",org.apache.velocity.runtime.log;uses:="org.apache.log.format,org.apache.vel
ocity.runtime,org.apache.velocity.runtime.directive,org.apache.velocity.runtime.parser.node,org.apache.velocity.util.introspection",org.apache.velocity.runtime.parser;uses:="org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.directive,org.apache.velocity.runtime.parser.node",org.apache.velocity.runtime.parser.node;uses:="org.apache.commons.lang.text,org.apache.velocity.context,org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.log,org.apache.velocity.runtime.parser,org.apache.velocity.util.introspection",org.apache.velocity.runtime.resource;uses:="org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.resource.loader",org.apache.velocity.runtime.resource.loader;uses:="javax.sql,org.apache.commons.collections,org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.resource,org.apache.velocity.runtime.resource.util",org.apache.velocity.runtime.reso
urce.util,org.apache.velocity.runtime.visitor;uses:="org.apache.velocity.context,org.apache.velocity.runtime.parser.node",org.apache.velocity.servlet;uses:="javax.servlet,javax.servlet.http,org.apache.velocity,org.apache.velocity.context,org.apache.velocity.exception",org.apache.velocity.texen;uses:="org.apache.velocity,org.apache.velocity.app,org.apache.velocity.context",org.apache.velocity.texen.ant;uses:="org.apache.commons.collections,org.apache.tools.ant,org.apache.velocity.context",org.apache.velocity.texen.defaults,org.apache.velocity.texen.util,org.apache.velocity.util;uses:="org.apache.velocity.context,org.apache.velocity.runtime,org.apache.velocity.runtime.parser.node,org.apache.velocity.util.introspection",org.apache.velocity.util.introspection;uses:="org.apache.velocity.runtime,org.apache.velocity.runtime.log,org.apache.velocity.runtime.parser.node,org.apache.velocity.util"
-dep.export=org.apache.commons.collections,org.apache.commons.collections.iterators;uses:="org.apache.commons.collections",org.apache.commons.collections.map;uses:="org.apache.commons.collections",org.apache.commons.lang;uses:="org.apache.commons.lang.exception",org.apache.commons.lang.builder,org.apache.commons.lang.enum,org.apache.commons.lang.enums,org.apache.commons.lang.exception,org.apache.commons.lang.math,org.apache.commons.lang.mutable,org.apache.commons.lang.text,org.apache.commons.lang.time,org.apache.oro.io;uses:="org.apache.oro.text,org.apache.oro.text.regex",org.apache.oro.text;uses:="org.apache.oro.text.regex,org.apache.oro.util",org.apache.oro.text.awk;uses:="org.apache.oro.text.regex",org.apache.oro.text.perl;uses:="org.apache.oro.text,org.apache.oro.text.regex",org.apache.oro.text.regex,org.apache.oro.util,org.apache.velocity;uses:="org.apache.velocity.context,org.apache.velocity.exception,org.apache.velocity.runtime.resource",org.apache.velocity.anakia;uses
:="com.werken.xpath,org.apache.tools.ant,org.apache.tools.ant.taskdefs,org.jdom,org.jdom.output",org.apache.velocity.app;uses:="org.apache.commons.collections,org.apache.velocity,org.apache.velocity.context,org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.log",org.apache.velocity.app.event;uses:="org.apache.velocity.context,org.apache.velocity.runtime,org.apache.velocity.util.introspection",org.apache.velocity.app.event.implement;uses:="org.apache.velocity.app.event,org.apache.velocity.context,org.apache.velocity.runtime,org.apache.velocity.util,org.apache.velocity.util.introspection",org.apache.velocity.app.tools;uses:="org.apache.velocity.context",org.apache.velocity.context;uses:="org.apache.velocity.app.event,org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.parser.node,org.apache.velocity.runtime.resource,org.apache.velocity.util.introspection",org.apache.velocity.convert,org.apache.velocity.except
ion;uses:="org.apache.velocity.runtime.parser,org.apache.velocity.util.introspection",org.apache.velocity.io,org.apache.velocity.runtime;uses:="org.apache.commons.collections,org.apache.velocity,org.apache.velocity.app.event,org.apache.velocity.context,org.apache.velocity.exception,org.apache.velocity.runtime.directive,org.apache.velocity.runtime.log,org.apache.velocity.runtime.parser,org.apache.velocity.runtime.parser.node,org.apache.velocity.runtime.resource,org.apache.velocity.util.introspection",org.apache.velocity.runtime.defaults,org.apache.velocity.runtime.directive;uses:="org.apache.velocity.context,org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.parser,org.apache.velocity.runtime.parser.node",org.apache.velocity.runtime.log;uses:="org.apache.log.format,org.apache.velocity.runtime,org.apache.velocity.runtime.directive,org.apache.velocity.runtime.parser.node,org.apache.velocity.util.introspection",org.apache.velocity.runtime.parse
r;uses:="org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.directive,org.apache.velocity.runtime.parser.node",org.apache.velocity.runtime.parser.node;uses:="org.apache.commons.lang.text,org.apache.velocity.context,org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.log,org.apache.velocity.runtime.parser,org.apache.velocity.util.introspection",org.apache.velocity.runtime.resource;uses:="org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.resource.loader",org.apache.velocity.runtime.resource.loader;uses:="javax.sql,org.apache.commons.collections,org.apache.velocity.exception,org.apache.velocity.runtime,org.apache.velocity.runtime.resource,org.apache.velocity.runtime.resource.util",org.apache.velocity.runtime.resource.util,org.apache.velocity.runtime.visitor;uses:="org.apache.velocity.context,org.apache.velocity.runtime.parser.node",org.apache.velocity.servlet;uses:="javax.se
rvlet,javax.servlet.http,org.apache.velocity,org.apache.velocity.context,org.apache.velocity.exception",org.apache.velocity.texen;uses:="org.apache.velocity,org.apache.velocity.app,org.apache.velocity.context",org.apache.velocity.texen.ant;uses:="org.apache.commons.collections,org.apache.tools.ant,org.apache.velocity.context",org.apache.velocity.texen.defaults,org.apache.velocity.texen.util,org.apache.velocity.util;uses:="org.apache.velocity.context,org.apache.velocity.runtime,org.apache.velocity.runtime.parser.node,org.apache.velocity.util.introspection",org.apache.velocity.util.introspection;uses:="org.apache.velocity.runtime,org.apache.velocity.runtime.log,org.apache.velocity.runtime.parser.node,org.apache.velocity.util"
\ No newline at end of file
+import=com.werken.xpath;resolution:=optional,\
+ javax.naming,\
+ javax.servlet;resolution:=optional,\
+ javax.servlet.http;resolution:=optional,\
+ javax.sql,\
+ org.apache.commons.collections,\
+ org.apache.commons.collections.map,\
+ org.apache.commons.lang,\
+ org.apache.commons.lang.builder,\
+ org.apache.commons.lang.text,\
+ org.apache.commons.logging;resolution:=optional,\
+ org.apache.log;resolution:=optional,\
+ org.apache.log.format;resolution:=optional,\
+ org.apache.log.output.io;resolution:=optional,\
+ org.apache.log4j;resolution:=optional,\
+ org.apache.oro.text.perl;resolution:=optional,\
+ org.apache.tools.ant;resolution:=optional,\
+ org.apache.tools.ant.taskdefs;resolution:=optional,\
+ org.jdom;resolution:=optional,\
+ org.jdom.input;resolution:=optional,\
+ org.jdom.output;resolution:=optional,\
+ org.xml.sax
+dep.import=com.werken.xpath;resolution:=optional,\
+ javax.naming,\
+ javax.servlet;resolution:=optional,\
+ javax.servlet.http;resolution:=optional,\
+ javax.sql,\
+ org.apache.commons.logging;resolution:=optional,\
+ org.apache.log;resolution:=optional,\
+ org.apache.log.format;resolution:=optional,\
+ org.apache.log.output.io;resolution:=optional,\
+ org.apache.log4j;resolution:=optional,\
+ org.apache.tools.ant;resolution:=optional,\
+ org.apache.tools.ant.taskdefs;resolution:=optional,\
+ org.jdom;resolution:=optional,\
+ org.jdom.input;resolution:=optional,\
+ org.jdom.output;resolution:=optional,\
+ org.xml.sax
+export=org.apache.velocity;uses:="org.apache.velocity.context,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime.resource",\
+ org.apache.velocity.anakia;uses:="com.werken.xpath,\
+ org.apache.tools.ant,\
+ org.apache.tools.ant.taskdefs,\
+ org.jdom,\
+ org.jdom.output",\
+ org.apache.velocity.app;uses:="org.apache.commons.collections,\
+ org.apache.velocity,\
+ org.apache.velocity.context,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.log",\
+ org.apache.velocity.app.event;uses:="org.apache.velocity.context,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.app.event.implement;uses:="org.apache.velocity.app.event,\
+ org.apache.velocity.context,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.util,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.app.tools;uses:="org.apache.velocity.context",\
+ org.apache.velocity.context;uses:="org.apache.velocity.app.event,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.parser.node,\
+ org.apache.velocity.runtime.resource,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.convert,\
+ org.apache.velocity.exception;uses:="org.apache.velocity.runtime.parser,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.io,\
+ org.apache.velocity.runtime;uses:="org.apache.commons.collections,\
+ org.apache.velocity,\
+ org.apache.velocity.app.event,\
+ org.apache.velocity.context,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime.directive,\
+ org.apache.velocity.runtime.log,\
+ org.apache.velocity.runtime.parser,\
+ org.apache.velocity.runtime.parser.node,\
+ org.apache.velocity.runtime.resource,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.runtime.defaults,\
+ org.apache.velocity.runtime.directive;uses:="org.apache.velocity.context,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.parser,\
+ org.apache.velocity.runtime.parser.node",\
+ org.apache.velocity.runtime.log;uses:="org.apache.log.format,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.directive,\
+ org.apache.velocity.runtime.parser.node,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.runtime.parser;uses:="org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.directive,\
+ org.apache.velocity.runtime.parser.node",\
+ org.apache.velocity.runtime.parser.node;uses:="org.apache.commons.lang.text,\
+ org.apache.velocity.context,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.log,\
+ org.apache.velocity.runtime.parser,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.runtime.resource;uses:="org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.resource.loader",\
+ org.apache.velocity.runtime.resource.loader;uses:="javax.sql,\
+ org.apache.commons.collections,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.resource,\
+ org.apache.velocity.runtime.resource.util",\
+ org.apache.velocity.runtime.resource.util,\
+ org.apache.velocity.runtime.visitor;uses:="org.apache.velocity.context,\
+ org.apache.velocity.runtime.parser.node",\
+ org.apache.velocity.servlet;uses:="javax.servlet,\
+ javax.servlet.http,\
+ org.apache.velocity,\
+ org.apache.velocity.context,\
+ org.apache.velocity.exception",\
+ org.apache.velocity.texen;uses:="org.apache.velocity,\
+ org.apache.velocity.app,\
+ org.apache.velocity.context",\
+ org.apache.velocity.texen.ant;uses:="org.apache.commons.collections,\
+ org.apache.tools.ant,\
+ org.apache.velocity.context",\
+ org.apache.velocity.texen.defaults,\
+ org.apache.velocity.texen.util,\
+ org.apache.velocity.util;uses:="org.apache.velocity.context,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.parser.node,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.util.introspection;uses:="org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.log,\
+ org.apache.velocity.runtime.parser.node,\
+ org.apache.velocity.util"
+dep.export=org.apache.commons.collections,\
+ org.apache.commons.collections.iterators;uses:="org.apache.commons.collections",\
+ org.apache.commons.collections.map;uses:="org.apache.commons.collections",\
+ org.apache.commons.lang;uses:="org.apache.commons.lang.exception",\
+ org.apache.commons.lang.builder,\
+ org.apache.commons.lang.enum,\
+ org.apache.commons.lang.enums,\
+ org.apache.commons.lang.exception,\
+ org.apache.commons.lang.math,\
+ org.apache.commons.lang.mutable,\
+ org.apache.commons.lang.text,\
+ org.apache.commons.lang.time,\
+ org.apache.oro.io;uses:="org.apache.oro.text,\
+ org.apache.oro.text.regex",\
+ org.apache.oro.text;uses:="org.apache.oro.text.regex,\
+ org.apache.oro.util",\
+ org.apache.oro.text.awk;uses:="org.apache.oro.text.regex",\
+ org.apache.oro.text.perl;uses:="org.apache.oro.text,\
+ org.apache.oro.text.regex",\
+ org.apache.oro.text.regex,\
+ org.apache.oro.util,\
+ org.apache.velocity;uses:="org.apache.velocity.context,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime.resource",\
+ org.apache.velocity.anakia;uses:="com.werken.xpath,\
+ org.apache.tools.ant,\
+ org.apache.tools.ant.taskdefs,\
+ org.jdom,\
+ org.jdom.output",\
+ org.apache.velocity.app;uses:="org.apache.commons.collections,\
+ org.apache.velocity,\
+ org.apache.velocity.context,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.log",\
+ org.apache.velocity.app.event;uses:="org.apache.velocity.context,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.app.event.implement;uses:="org.apache.velocity.app.event,\
+ org.apache.velocity.context,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.util,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.app.tools;uses:="org.apache.velocity.context",\
+ org.apache.velocity.context;uses:="org.apache.velocity.app.event,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.parser.node,\
+ org.apache.velocity.runtime.resource,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.convert,\
+ org.apache.velocity.exception;uses:="org.apache.velocity.runtime.parser,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.io,\
+ org.apache.velocity.runtime;uses:="org.apache.commons.collections,\
+ org.apache.velocity,\
+ org.apache.velocity.app.event,\
+ org.apache.velocity.context,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime.directive,\
+ org.apache.velocity.runtime.log,\
+ org.apache.velocity.runtime.parser,\
+ org.apache.velocity.runtime.parser.node,\
+ org.apache.velocity.runtime.resource,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.runtime.defaults,\
+ org.apache.velocity.runtime.directive;uses:="org.apache.velocity.context,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.parser,\
+ org.apache.velocity.runtime.parser.node",\
+ org.apache.velocity.runtime.log;uses:="org.apache.log.format,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.directive,\
+ org.apache.velocity.runtime.parser.node,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.runtime.parser;uses:="org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.directive,\
+ org.apache.velocity.runtime.parser.node",\
+ org.apache.velocity.runtime.parser.node;uses:="org.apache.commons.lang.text,\
+ org.apache.velocity.context,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.log,\
+ org.apache.velocity.runtime.parser,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.runtime.resource;uses:="org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.resource.loader",\
+ org.apache.velocity.runtime.resource.loader;uses:="javax.sql,\
+ org.apache.commons.collections,\
+ org.apache.velocity.exception,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.resource,\
+ org.apache.velocity.runtime.resource.util",\
+ org.apache.velocity.runtime.resource.util,\
+ org.apache.velocity.runtime.visitor;uses:="org.apache.velocity.context,\
+ org.apache.velocity.runtime.parser.node",\
+ org.apache.velocity.servlet;uses:="javax.servlet,\
+ javax.servlet.http,\
+ org.apache.velocity,\
+ org.apache.velocity.context,\
+ org.apache.velocity.exception",\
+ org.apache.velocity.texen;uses:="org.apache.velocity,\
+ org.apache.velocity.app,\
+ org.apache.velocity.context",\
+ org.apache.velocity.texen.ant;uses:="org.apache.commons.collections,\
+ org.apache.tools.ant,\
+ org.apache.velocity.context",\
+ org.apache.velocity.texen.defaults,\
+ org.apache.velocity.texen.util,\
+ org.apache.velocity.util;uses:="org.apache.velocity.context,\
+ org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.parser.node,\
+ org.apache.velocity.util.introspection",\
+ org.apache.velocity.util.introspection;uses:="org.apache.velocity.runtime,\
+ org.apache.velocity.runtime.log,\
+ org.apache.velocity.runtime.parser.node,\
+ org.apache.velocity.util"
Modified: velocity/engine/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/changes/changes.xml?rev=956175&r1=956174&r2=956175&view=diff
==============================================================================
--- velocity/engine/trunk/src/changes/changes.xml (original)
+++ velocity/engine/trunk/src/changes/changes.xml Sat Jun 19 02:23:14 2010
@@ -26,6 +26,9 @@
<body>
<release version="1.7" date="In Subversion">
+ <action type="fix" dev="nbubna" issue="VELOCITY-753" due-to="Matt Ryall">
+ Mark optional dependencies as such in OSGi bundle manifest.
+ </action>
</release>
<release version="1.7-beta1" date="2010-04-10">