Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site bda53bbcc -> d8be10f0b
Updated docgen Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/d8be10f0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/d8be10f0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/d8be10f0 Branch: refs/heads/asf-site Commit: d8be10f0b464e8c31910fed7e87df955743821ea Parents: bda53bb Author: ddekany <[email protected]> Authored: Mon Oct 16 10:10:39 2017 +0200 Committer: ddekany <[email protected]> Committed: Mon Oct 16 10:10:39 2017 +0200 ---------------------------------------------------------------------- .../docgen/docgen-2.0-branch-head.jar | Bin 266702 -> 266369 bytes .../docgen/docgen-2.0-branch-head.jar.md5 | 2 +- .../docgen/docgen-2.0-branch-head.jar.sha1 | 2 +- .../docgen/ivy-2.0-branch-head.xml | 10 +++++++--- .../docgen/ivy-2.0-branch-head.xml.md5 | 2 +- .../docgen/ivy-2.0-branch-head.xml.sha1 | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d8be10f0/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar ---------------------------------------------------------------------- diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar index 8dde3b8..5b94ab1 100644 Binary files a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar and b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar differ http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d8be10f0/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 ---------------------------------------------------------------------- diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 index 4d6b263..733263e 100644 --- a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 +++ b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 @@ -1 +1 @@ -9aae96af649b13b85def66331422b39d \ No newline at end of file +979214f44825086cc26a023b0078a088 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d8be10f0/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 ---------------------------------------------------------------------- diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 index 2a677c3..83fe0f5 100644 --- a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 +++ b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 @@ -1 +1 @@ -8d30d0128e7a34167e3330be0e4a3a8ae1c83668 \ No newline at end of file +169340ac298c512cbc23db77e2fd1935e524da28 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d8be10f0/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml ---------------------------------------------------------------------- diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml index 545ba80..459ef29 100644 --- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml +++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml @@ -3,13 +3,17 @@ AFTER CHANGING THIS FILE don't forget to issue: ant update-deps --> <ivy-module version="2.0"> - <info organisation="org.freemarker" module="docgen" revision="2.0-branch-head" status="integration" publication="20170123191925"/> + <info organisation="org.freemarker" module="docgen" revision="2.0-branch-head" status="integration" publication="20171016100923"/> <publications> <artifact name="docgen" type="jar" ext="jar"/> </publications> <dependencies> - <dependency org="com.thaiopensource" name="jing" rev="20091111" conf="default->default"/> - <dependency org="org.freemarker" name="freemarker" rev="2.3.25-incubating" conf="default->default" changing="true"/> + <dependency org="com.thaiopensource" name="jing" rev="20091111" conf="default->default"> + <exclude org="xerces" name="xercesImpl"/> + <exclude org="xml-apis" name="xml-apis"/> + </dependency> + <dependency org="org.freemarker" name="freemarker" rev="2.3.26-incubating" conf="default->default" changing="true"/> + <dependency org="xalan" name="xalan" rev="2.7.2" conf="default->default"/> <!-- Needed on OpenJDK 9 --> <dependency org="org.apache.ant" name="ant" rev="1.9.3" conf="default->default"/> </dependencies> </ivy-module> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d8be10f0/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 ---------------------------------------------------------------------- diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 index f1e9c85..f80204e 100644 --- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 +++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 @@ -1 +1 @@ -dffa1f18d28db1f5ceffdcc0ebf3b52a \ No newline at end of file +193e2f5ac403d49501cdfcd08b67f054 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d8be10f0/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 ---------------------------------------------------------------------- diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 index 257f49e..a5508d2 100644 --- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 +++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 @@ -1 +1 @@ -6317b27365f87f42cb836eea4076baecd79e8655 \ No newline at end of file +5e02f4cba6b2f73a7471a010cc8ecb5a8b84cca2 \ No newline at end of file
