This is an automated email from the ASF dual-hosted git repository.
srdo pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/storm-site.git
commit bb9f386abc2f384a6942d6849547a842f1080fad
Author: Stig Rohde Døssing
AuthorDate: Thu Jul 18 21:52:54 2019 +0200
Add 1.2.3 to downloads page, remove all old releases from downloads page,
clean up releases plugin a bit, delete releases.html as we don't link to it
anywhere
---
_data/releases.yml | 18 ---
_plugins/releases.rb | 34 +-
downloads.html | 335 +++
releases.html| 44 ---
4 files changed, 22 insertions(+), 409 deletions(-)
diff --git a/_data/releases.yml b/_data/releases.yml
deleted file mode 100644
index aed64fd..000
--- a/_data/releases.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- name: 1.0.0
-- name: 1.0.1
-- name: 1.0.2
-- name: 1.0.3-SNAPSHOT
- git-tag-or-branch: 1.0.x-branch
-- name: 1.1.0-SNAPSHOT
- git-tag-or-branch: 1.x-branch
-- name: 2.0.0-SNAPSHOT
- git-tag-or-branch: master
-- name: 0.10.1
-- name: 0.10.0
-- name: 0.10.0-beta1
-- name: 0.9.6
-- name: 0.9.5
-- name: 0.9.4
-- name: 0.9.3
-- name: 0.9.2-incubating
-- name: 0.9.1-incubating
diff --git a/_plugins/releases.rb b/_plugins/releases.rb
index f28ccd2..8f0d4e0 100644
--- a/_plugins/releases.rb
+++ b/_plugins/releases.rb
@@ -20,46 +20,19 @@ module Releases
return version_string.split('.').map{|e| e.to_i}
end
-def release_from_pom()
- text= `mvn -f ../pom.xml help:evaluate -Dexpression=project.version`
- return text.split("\n").select{|a| !a.start_with?('[')}[0]
-end
-
-def branch_from_git()
- return `git rev-parse --abbrev-ref HEAD`
-end
-
def generate(site)
- if site.config['storm_release_only']
-release_name = release_from_pom()
-puts "release: #{release_name}"
-git_branch = branch_from_git()
-puts "branch: #{git_branch}"
-for page in site.pages do
- page.data['version'] = release_name;
- page.data['git-tree-base'] =
"http://github.com/apache/storm/tree/#{git_branch};
- page.data['git-blob-base'] =
"http://github.com/apache/storm/blob/#{git_branch};
-end
-return
- end
-
releases = Hash.new
- if (site.data['releases'])
-for rel_data in site.data['releases'] do
- releases[rel_data['name']] = rel_data
-end
- end
+ # Find the releases/ subdirectories, their names are the current releases
for page in site.pages do
release_name = dir_to_releasename(page.dir)
if (release_name != nil)
- if !releases.has_key?(release_name)
-releases[release_name] = {'name' => release_name};
- end
+ releases[release_name] = {'name' => release_name};
releases[release_name]['documented'] = true
end
end
+ # Set some metadata for each release
releases.each { |release_name, release_data|
set_if_unset(release_data, 'git-tag-or-branch',
"v#{release_data['name']}")
set_if_unset(release_data, 'git-tree-base',
"http://github.com/apache/storm/tree/#{release_data['git-tag-or-branch']}")
@@ -68,6 +41,7 @@ module Releases
set_if_unset(release_data, 'has-download',
!release_name.end_with?('-SNAPSHOT'))
}
+ # Make release metadata available to each page for release specific
docs, e.g. links to source
for page in site.pages do
release_name = dir_to_releasename(page.dir)
if (release_name != nil)
diff --git a/downloads.html b/downloads.html
index 8314afd..02c752d 100644
--- a/downloads.html
+++ b/downloads.html
@@ -60,29 +60,29 @@ artifactId: storm-{component}
version: 2.0.0
Current 1.2.x Release
- The current 1.2.x release is 1.2.2. Source
and binary distributions can be found below.
+ The current 1.2.x release is 1.2.3. Source
and binary distributions can be found below.
- The list of changes for this release can be
found https://www.apache.org/dist/storm/apache-storm-1.2.2/RELEASE_NOTES.html;>here.
+ The list of changes for this release can be
found https://www.apache.org/dist/storm/apache-storm-1.2.3/RELEASE_NOTES.html;>here.
- Documentation
- Javadocs
+ Documentation
+ Javadocs
- https://www.apache.org/dyn/closer.lua/storm/apache-storm-1.2.2/apache-storm-1.2.2.tar.gz;>apache-storm-1.2.2.tar.gz
-
