You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/10/04 18:42:30 UTC

[1/2] incubator-freemarker-docgen git commit: (Testing git push problem)

Repository: incubator-freemarker-docgen
Updated Branches:
  refs/heads/master d78b652c0 -> a047778a2


(Testing git push problem)


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/c2de3d3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/c2de3d3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/c2de3d3b

Branch: refs/heads/master
Commit: c2de3d3b5090572f82585e6b98e793ddb4c0c2a8
Parents: d78b652
Author: ddekany <dd...@apache.org>
Authored: Sun Jul 16 09:49:29 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sun Jul 16 09:49:29 2017 +0200

----------------------------------------------------------------------
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/c2de3d3b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 5d6f72d..4162907 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ in the `build/dummy-server-ivy-repo` directory. See the README file in the
 [site Git repo](https://git-wip-us.apache.org/repos/asf/incubator-freemarker-site.git)
 on how to upload content to the FreeMarker homepage!
 
-    
+
 ## Icon Font Attribution
 
 The icon font in this project was built using [IcoMoon](https://icomoon.io/)


[2/2] incubator-freemarker-docgen git commit: Fixed dependencies: Excluded unused dependencies. Added Xalan for OpenJDK 9 compatibility.

Posted by dd...@apache.org.
Fixed dependencies: Excluded unused dependencies. Added Xalan for OpenJDK 9 compatibility.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/a047778a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/a047778a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/a047778a

Branch: refs/heads/master
Commit: a047778a226e9844e96c6443ef3fe34027f65fbe
Parents: c2de3d3
Author: ddekany <dd...@apache.org>
Authored: Wed Oct 4 20:42:24 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Wed Oct 4 20:42:24 2017 +0200

----------------------------------------------------------------------
 ivy.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/a047778a/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 5df2d91..b1a9229 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -7,8 +7,12 @@
         <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>