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: Doing this another way instead: Fix released version builds broken because Ivy has problem with HTTP redirection
Date Sat, 11 Nov 2017 23:47:27 GMT
Repository: incubator-freemarker-site
Updated Branches:
  refs/heads/asf-site 9c4e71081 -> 5743790ad


Doing this another way instead: Fix released version builds broken because Ivy has problem
with HTTP redirection


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

Branch: refs/heads/asf-site
Commit: 5743790ada140d7c406af20decb3626eeab081f5
Parents: 9c4e710
Author: ddekany <ddekany@apache.org>
Authored: Sun Nov 12 00:47:21 2017 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sun Nov 12 00:47:21 2017 +0100

----------------------------------------------------------------------
 .htaccess                        | 2 +-
 repos/ivy/ivysettings-remote.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5743790a/.htaccess
----------------------------------------------------------------------
diff --git a/.htaccess b/.htaccess
index aa69a67..4ac8b6f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -11,7 +11,7 @@ RewriteEngine On
 RewriteBase /
 
 # Redirect to the canonical domain: 
-RewriteCond %{REQUEST_URI} !^/repos/ivy/
+#RewriteCond %{REQUEST_URI} !^/repos/ivy/
 RewriteCond %{HTTP_HOST} ^(www\.)?freemarker\.org$ [NC,OR]
 RewriteCond %{HTTP_HOST} ^freemarker\.incubator\. [NC,OR]
 RewriteCond %{HTTPS} ^off$ [NC]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5743790a/repos/ivy/ivysettings-remote.xml
----------------------------------------------------------------------
diff --git a/repos/ivy/ivysettings-remote.xml b/repos/ivy/ivysettings-remote.xml
index e469589..1643402 100644
--- a/repos/ivy/ivysettings-remote.xml
+++ b/repos/ivy/ivysettings-remote.xml
@@ -17,8 +17,8 @@
   
   <resolvers>
     <url name="freemarker-devel-webserver" cache="freemarker-devel-cache">
-      <ivy pattern="http://freemarker.org/repos/ivy/[organisation]/[module]/ivy-[revision].xml"
/>
-      <artifact pattern="http://freemarker.org/repos/ivy/[organisation]/[module]/[artifact]-[revision].[ext]"
/>
+      <ivy pattern="https://freemarker.apache.org/repos/ivy/[organisation]/[module]/ivy-[revision].xml"
/>
+      <artifact pattern="https://freemarker.apache.org/repos/ivy/[organisation]/[module]/[artifact]-[revision].[ext]"
/>
     </url>
   </resolvers>
   <modules>


Mime
View raw message