You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2020/05/30 12:44:22 UTC

[velocity-site] branch master updated: [site] Adapt site building helpers for git migration

This is an automated email from the ASF dual-hosted git repository.

cbrisson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/velocity-site.git


The following commit(s) were added to refs/heads/master by this push:
     new 1afba6c  [site] Adapt site building helpers for git migration
1afba6c is described below

commit 1afba6ce8e9705bbdf3685094d369218cca25f44
Author: Claude Brisson <cl...@renegat.net>
AuthorDate: Sat May 30 14:43:48 2020 +0200

    [site] Adapt site building helpers for git migration
---
 src/content/engine/1.7/changes.mdtext   | 2 +-
 src/content/engine/2.0/changes.mdtext   | 2 +-
 src/content/engine/2.1/changes.mdtext   | 2 +-
 src/content/engine/2.2/changes.mdtext   | 2 +-
 src/content/engine/devel/changes.mdtext | 2 +-
 src/content/tools/2.0/changes.mdtext    | 2 +-
 src/content/tools/3.0/changes.mdtext    | 2 +-
 src/content/tools/devel/changes.mdtext  | 2 +-
 src/lib/view.pm                         | 7 +++++--
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/content/engine/1.7/changes.mdtext b/src/content/engine/1.7/changes.mdtext
index cb4781a..11dd92e 100644
--- a/src/content/engine/1.7/changes.mdtext
+++ b/src/content/engine/1.7/changes.mdtext
@@ -4,5 +4,5 @@ Title: Apache Velocity Engine - Changes Report
 
 ### Release History
 
-{{changes_report(engine/tags/1.7)}}
+{{changes_report(engine/1.7)}}
 
diff --git a/src/content/engine/2.0/changes.mdtext b/src/content/engine/2.0/changes.mdtext
index b0bf958..502ca62 100644
--- a/src/content/engine/2.0/changes.mdtext
+++ b/src/content/engine/2.0/changes.mdtext
@@ -4,5 +4,5 @@ Title: Apache Velocity Engine - Changes Report
 
 ### Release History
 
-{{changes_report(engine/tags/2.0)}}
+{{changes_report(engine/2.0)}}
 
diff --git a/src/content/engine/2.1/changes.mdtext b/src/content/engine/2.1/changes.mdtext
index c566fa9..1931547 100644
--- a/src/content/engine/2.1/changes.mdtext
+++ b/src/content/engine/2.1/changes.mdtext
@@ -4,5 +4,5 @@ Title: Apache Velocity Engine - Changes Report
 
 ### Release History
 
-{{changes_report(engine/trunk)}}
+{{changes_report(engine/2.1)}}
 
diff --git a/src/content/engine/2.2/changes.mdtext b/src/content/engine/2.2/changes.mdtext
index c566fa9..9c4a732 100644
--- a/src/content/engine/2.2/changes.mdtext
+++ b/src/content/engine/2.2/changes.mdtext
@@ -4,5 +4,5 @@ Title: Apache Velocity Engine - Changes Report
 
 ### Release History
 
-{{changes_report(engine/trunk)}}
+{{changes_report(engine/2.2)}}
 
diff --git a/src/content/engine/devel/changes.mdtext b/src/content/engine/devel/changes.mdtext
index c566fa9..e109b61 100644
--- a/src/content/engine/devel/changes.mdtext
+++ b/src/content/engine/devel/changes.mdtext
@@ -4,5 +4,5 @@ Title: Apache Velocity Engine - Changes Report
 
 ### Release History
 
-{{changes_report(engine/trunk)}}
+{{changes_report(engine/HEAD)}}
 
diff --git a/src/content/tools/2.0/changes.mdtext b/src/content/tools/2.0/changes.mdtext
index e7091e8..4754fba 100644
--- a/src/content/tools/2.0/changes.mdtext
+++ b/src/content/tools/2.0/changes.mdtext
@@ -4,5 +4,5 @@ Title: Apache Velocity Tools - Changes Report
 
 ### Release History
 
-{{changes_report(tools/tags/2.0)}}
+{{changes_report(tools/2.0)}}
 
diff --git a/src/content/tools/3.0/changes.mdtext b/src/content/tools/3.0/changes.mdtext
index afe562c..73f8058 100644
--- a/src/content/tools/3.0/changes.mdtext
+++ b/src/content/tools/3.0/changes.mdtext
@@ -4,5 +4,5 @@ Title: Apache Velocity Tools - Changes Report
 
 ### Release History
 
-{{changes_report(tools/trunk)}}
+{{changes_report(tools/3.0)}}
 
diff --git a/src/content/tools/devel/changes.mdtext b/src/content/tools/devel/changes.mdtext
index afe562c..d85827d 100644
--- a/src/content/tools/devel/changes.mdtext
+++ b/src/content/tools/devel/changes.mdtext
@@ -4,5 +4,5 @@ Title: Apache Velocity Tools - Changes Report
 
 ### Release History
 
-{{changes_report(tools/trunk)}}
+{{changes_report(tools/HEAD)}}
 
diff --git a/src/lib/view.pm b/src/lib/view.pm
index cb0e162..c671126 100644
--- a/src/lib/view.pm
+++ b/src/lib/view.pm
@@ -29,7 +29,8 @@ sub format_date { return time2str("%A, %e %B %Y", str2time(shift)); } ## xsltpro
 sub format_date_short { return time2str("%a, %e %b %Y", str2time(shift)); } ## xsltproc doesn't know XSLT 2.0 format-date function
 sub changes_report
 {
-    my $url = "http://svn.apache.org/repos/asf/velocity/" . shift . "/src/changes/changes.xml";
+    my ($project, $tag) = split '/', shift;
+    my $url = "https://gitbox.apache.org/repos/asf?p=velocity-$project.git;a=blob_plain;f=src/changes/changes.xml;hb=$tag";
     my $xml = get $url;
 
     # hack to fix an error in the XML up to 1.7
@@ -48,6 +49,8 @@ sub changes_report
 }
 sub source_file
 {
+    # Note: those contributions didn't make their way from svn to git
+    # TODO - do something...
     my $url = "http://svn.apache.org/repos/asf/velocity/" . shift;
     my $content = get $url;
 
@@ -82,7 +85,7 @@ sub source_file
 }
 sub team()
 {
-    my $xml = get "http://svn.apache.org/repos/asf/velocity/maven/trunk/pom/pom.xml";
+    my $xml = get 'https://gitbox.apache.org/repos/asf?p=velocity-master.git;a=blob_plain;f=pom/pom.xml;hb=HEAD';
     my ($fh, $filename) = tempfile("XXXXXX");
 
     # hack to fix non-utf8 chars