freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker-site git commit: (Trying to fix repo checksum problems...)
Date Sun, 29 Nov 2015 00:33:59 GMT
Repository: incubator-freemarker-site
Updated Branches:
  refs/heads/asf-site 1385d159d -> 35703f615


(Trying to fix repo checksum problems...)


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/35703f61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/35703f61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/35703f61

Branch: refs/heads/asf-site
Commit: 35703f615712857877c0885280368172228d4a30
Parents: 1385d15
Author: ddekany <ddekany@apache.org>
Authored: Sun Nov 29 01:33:36 2015 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sun Nov 29 01:33:36 2015 +0100

----------------------------------------------------------------------
 .../freemarker/freemarker-2.3-branch-head.jar   | Bin 1422576 -> 1461107 bytes
 .../freemarker-2.3-branch-head.jar.md5          |   2 +-
 .../freemarker-2.3-branch-head.jar.sha1         |   2 +-
 .../freemarker/ivy-2.3-branch-head.xml          |  25 +++++++++++--------
 .../freemarker/ivy-2.3-branch-head.xml.md5      |   2 +-
 .../freemarker/ivy-2.3-branch-head.xml.sha1     |   2 +-
 6 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/35703f61/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar
----------------------------------------------------------------------
diff --git a/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar b/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar
index 0a04d6b..bc5229e 100644
Binary files a/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar and b/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar
differ

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/35703f61/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar.md5
----------------------------------------------------------------------
diff --git a/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar.md5 b/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar.md5
index cf064f4..a9b4e4d 100644
--- a/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar.md5
+++ b/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar.md5
@@ -1 +1 @@
-59beb13e02b6c87d07e537ab48d421bc
\ No newline at end of file
+0f5640d268f8e511ce79bfa71046b28e
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/35703f61/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar.sha1
----------------------------------------------------------------------
diff --git a/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar.sha1 b/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar.sha1
index 1ba789f..e06fe8a 100644
--- a/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar.sha1
+++ b/repos/ivy/org.freemarker/freemarker/freemarker-2.3-branch-head.jar.sha1
@@ -1 +1 @@
-3df587ac23e7f554416c8aad5835764408f7eb25
\ No newline at end of file
+13c75eabd05873a68a1410bcf59efd41c64a3e58
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/35703f61/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml
----------------------------------------------------------------------
diff --git a/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml b/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml
index f1ddb5d..61b4ce8 100644
--- a/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml
+++ b/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   AFTER CHANGING THIS FILE don't forget to issue: ant update-deps
--->
+-->
 <ivy-module version="2.0">
-  <info organisation="org.freemarker" module="freemarker" revision="2.3-branch-head" status="integration"
publication="20150902021828">
+  <info organisation="org.freemarker" module="freemarker" revision="2.3-branch-head" status="integration"
publication="20151129010609">
     <license name="Apache License, Version 2.0" url="http://freemarker.org/docs/app_license.html"/>
     <description homepage="http://freemarker.org/">
       FreeMarker is a &quot;template engine&quot;; a generic tool to
@@ -18,7 +18,6 @@
 
     <conf name="build.base" extends="default" visibility="private" description="for building
FreeMarker without dependencies that optinal dependencies"/>
 
-    <conf name="build.jsp1.2" extends="build.base" description="for building FreeMarker
with JSP 1.2 support"/>
     <conf name="build.jsp2.0" extends="build.base" description="for building FreeMarker
with JSP 2.0 support"/>
     <conf name="build.jsp2.1" extends="build.base" description="for building FreeMarker
with JSP 2.1 support"/>
 
@@ -59,15 +58,13 @@
       <exclude org="xml-apis" module="xml-apis"/>
     </dependency>
     <dependency org="dom4j" name="dom4j" rev="1.3" conf="build.base->default"/>
<!-- legacy -->
-    <dependency org="org.jdom" name="jdom" rev="1.0-beta8-dev" conf="build.base->default"/>
<!-- legacy -->
+    <dependency org="jdom" name="jdom" rev="1.0b8" conf="build.base->default"/>
<!-- legacy -->
 
     <dependency org="ant" name="ant" rev="1.6.5" conf="build.base->default">
       <!-- The lowerst supported xml-apis version depends on JDK version; prevent any
collosion: -->
       <exclude org="xml-apis" module="xml-apis"/>
     </dependency>
     
-    <dependency org="javax.servlet.jsp" name="jsp-api" rev="1.2" conf="build.jsp1.2->default"/>
-    <dependency org="javax.servlet" name="servlet-api" rev="2.3" conf="build.jsp1.2->default"/>
     <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.1" conf="build.jsp2.1->default"/>
@@ -75,7 +72,8 @@
     
     <dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default"/>
 
-    <dependency org="org.python" name="jython" rev="2.0.0" conf="build.jython2.0->default"/>
+    <!-- We use Jython 2.1 because there was no 2.0 in central; the relevant methods are
the same. -->
+    <dependency org="jython" name="jython" rev="2.1" conf="build.jython2.0->default"/>
     <dependency org="org.python" name="jython" rev="2.2.1" conf="build.jython2.2->default"/>
     <dependency org="org.python" name="jython" rev="2.5.0" conf="build.jython2.5->default"/>
     
@@ -114,7 +112,14 @@
       <exclude org="org.slf4j" name="jcl104-over-slf4j"/>
       <exclude org="log4j" name="log4j"/>
     </dependency>
-    
+
+    <dependency org="org.springframework" name="spring-core" rev="2.5.6.SEC03" conf="test->default">
+      <exclude org="commons-logging" name="commons-logging"/>
+    </dependency>
+    <dependency org="org.springframework" name="spring-test" rev="2.5.6.SEC03" conf="test->default">
+      <exclude org="commons-logging" name="commons-logging"/>
+    </dependency>
+
     <!-- docs -->
     
     <dependency org="org.freemarker" name="docgen" rev="2.0-branch-head" conf="manual->default"
changing="true"/>
@@ -135,4 +140,4 @@
     <conflict org="javax.servlet.jsp" module="jsp-api" manager="strict"/>
     
   </dependencies>
-</ivy-module>
+</ivy-module>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/35703f61/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml.md5
----------------------------------------------------------------------
diff --git a/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml.md5 b/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml.md5
index 164d822..a062bd9 100644
--- a/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml.md5
+++ b/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml.md5
@@ -1 +1 @@
-35dc38cf7325085e7255df1a29e523e0
\ No newline at end of file
+872afef73597f050a791cd833ca3efc3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/35703f61/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml.sha1
----------------------------------------------------------------------
diff --git a/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml.sha1 b/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml.sha1
index d9a8ce9..223bd5b 100644
--- a/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml.sha1
+++ b/repos/ivy/org.freemarker/freemarker/ivy-2.3-branch-head.xml.sha1
@@ -1 +1 @@
-fc7faac4643441acd716abe4f05f635d813c2b74
\ No newline at end of file
+f71e24f9c9b18eead1a00686f2c9dc5b6509c929
\ No newline at end of file


Mime
View raw message