(Build: Removed unused example and retrotranslator related parts)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/000de61c Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/000de61c Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/000de61c Branch: refs/heads/2.3-gae Commit: 000de61c7b5d95d2405aff2ed1cde017421547dc Parents: 567b149 Author: ddekany <ddek...@apache.org> Authored: Fri Jan 20 17:36:27 2017 +0100 Committer: ddekany <ddek...@apache.org> Committed: Fri Jan 20 17:36:27 2017 +0100 ---------------------------------------------------------------------- build.xml | 1 - ivy.xml | 12 ++---------- 2 files changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/000de61c/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index d05c9bd..9b29946 100644 --- a/build.xml +++ b/build.xml @@ -711,7 +711,6 @@ <exclude name="**/*.~*" /> <exclude name="**/*.*~" /> <include name="src/**" /> - <include name="examples/**" /> <include name="*.xml" /> <include name="*.sample" /> <include name="*.txt" /> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/000de61c/ivy.xml ---------------------------------------------------------------------- diff --git a/ivy.xml b/ivy.xml index 9598c87..3eaf8a9 100644 --- a/ivy.xml +++ b/ivy.xml @@ -76,8 +76,6 @@ description="to be used in IDE-s (maybe with the Ivy plugin)" /> - <conf name="retrotranslate" description="for retro-translation" /> - <conf name="parser" extends="default" description="for generating parser" /> <conf name="manual" description="for generating the manual with Docgen" /> @@ -85,12 +83,6 @@ <conf name="rat" description="for generating the Rat report" /> <conf name="bnd" description="for creating OSGi bundle" /> - - <conf name="example.servlet" description="servlet-based examples" /> - <conf name="example.webapp1" extends="example.servlet" /> - <conf name="example.webapp2" extends="example.servlet" /> - <conf name="example.struts-webapp" extends="example.servlet" /> - <conf name="example.ant" /> </configurations> <publications> <artifact name="freemarker" type="jar" conf="runtime" ext="jar" /> @@ -112,8 +104,8 @@ <exclude org="xml-apis" module="xml-apis" /> </dependency> - <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.0" conf="build.jsp2.0->default; example.struts-webapp->default" /> - <dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="build.jsp2.0->default; example.servlet->default" /> + <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.0" conf="build.jsp2.0->default" /> + <dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="build.jsp2.0->default" /> <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" /> <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.jsp2.1->default" />
