Repository: logging-log4cxx
Updated Branches:
  refs/heads/latest_stable 3038a51e9 -> 2fd8d2d45


The download page had a lot of hard coded version numbers, which are now 
generated on the fly using properties of pom.xml. Used log4j2 as an example.

# Conflicts:
#       src/site/apt/download.apt.vm


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/41358815
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/41358815
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/41358815

Branch: refs/heads/latest_stable
Commit: 413588154fcc051d461005b2a1d96ea0bda722b3
Parents: 3038a51
Author: Thorsten Schöning <[email protected]>
Authored: Fri Jul 7 20:42:33 2017 +0200
Committer: Thorsten Schöning <[email protected]>
Committed: Sat Jan 27 12:37:01 2018 +0100

----------------------------------------------------------------------
 pom.xml                      | 10 ++++++-
 src/site/apt/download.apt    | 44 -----------------------------
 src/site/apt/download.apt.vm | 58 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/41358815/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3dc4daf..5cee8e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,14 @@
                
<url>https://git-wip-us.apache.org/repos/asf?p=logging-log4cxx.git</url>
        </scm>
 
+       <properties>
+               <!-- Note that any properties you want available in velocity 
templates must not use periods! -->
+               <releaseArtifactId>${project.artifactId}</releaseArtifactId>
+               <releaseVersion>${project.version}</releaseVersion>
+               <releaseManager>Thorsten Schöning</releaseManager>
+               <releaseKey>778C3033</releaseKey>
+       </properties>
+
        <organization>
                <name>Apache Software Foundation</name>
                <url>http://www.apache.org</url>
@@ -125,7 +133,7 @@
                </developer>
                <developer>
                        <id>tschoening</id>
-                       <name>Thorsten Schöning</name>
+                       <name>Thorsten Schöning</name>
                        <email>[email protected]</email>
                        <timezone>Europe/Berlin</timezone>
                        <roles>

http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/41358815/src/site/apt/download.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt
deleted file mode 100644
index f56c556..0000000
--- a/src/site/apt/download.apt
+++ /dev/null
@@ -1,44 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one or more
-~~ contributor license agreements.  See the NOTICE file distributed with
-~~ this work for additional information regarding copyright ownership.
-~~ The ASF licenses this file to You under the Apache License, Version 2.0
-~~ (the "License"); you may not use this file except in compliance with
-~~ the License.  You may obtain a copy of the License at
-~~
-~~      http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing, software
-~~ distributed under the License is distributed on an "AS IS" BASIS,
-~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~~ See the License for the specific language governing permissions and
-~~ limitations under the License.
- ------
-Download Apache log4cxx 0.10.0
- ------
- ------
- ------
-
-Download Apache log4cxx 0.10.0
-
-  Apache log4cxx 0.10.0 is distributed under the 
{{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version 
2.0}}.
-
-  The link in the Mirrors column should display a list of available mirrors 
with a
-  default selection based on your inferred location.  If you do not see that 
page,
-  try a different browser.  The checksum and signature are links to
-  the originals on the main distribution server.
-  
-*-------------------------+---------+----------+-----------+
-|                         | Mirrors | Checksum | Signature |
-*-------------------------+---------+----------+-----------+
-| Apache log4cxx 0.10.0 (tar.gz)      | 
{{{http://www.apache.org/dyn/closer.cgi/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz}
 apache-log4cxx-0.10.0.tar.gz}} | 
{{{http://www.apache.org/dist/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz.md5}
 apache-log4cxx-0.10.0.tar.gz.md5}} | 
{{{http://www.apache.org/dist/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz.asc}
 apache-log4cxx-0.10.0.tar.gz.asc}} |
-*-------------------------+---------+----------+-----------+
-| Apache log4cxx 0.10.0 (zip)      | 
{{{http://www.apache.org/dyn/closer.cgi/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.zip}
 apache-log4cxx-0.10.0.zip}} | 
{{{http://www.apache.org/dist/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.zip.md5}
 apache-log4cxx-0.10.0.zip.md5}} | 
{{{http://www.apache.org/dist/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.zip.asc}
 apache-log4cxx-0.10.0.zip.asc}} |
-*-------------------------+---------+----------+-----------+
-
-  Please read {{{http://httpd.apache.org/dev/verification.html}Verifying 
Apache HTTP Server Releases}}
-   for more information on why you should verify our releases.
-
-
-* Previous Releases
-
-  All previous releases of Apache log4cxx can be found in the 
{{{http://archive.apache.org/dist/logging/log4cxx}archive repository}}.

http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/41358815/src/site/apt/download.apt.vm
----------------------------------------------------------------------
diff --git a/src/site/apt/download.apt.vm b/src/site/apt/download.apt.vm
new file mode 100644
index 0000000..432c2f0
--- /dev/null
+++ b/src/site/apt/download.apt.vm
@@ -0,0 +1,58 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one or more
+~~ contributor license agreements.  See the NOTICE file distributed with
+~~ this work for additional information regarding copyright ownership.
+~~ The ASF licenses this file to You under the Apache License, Version 2.0
+~~ (the "License"); you may not use this file except in compliance with
+~~ the License.  You may obtain a copy of the License at
+~~
+~~      http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing, software
+~~ distributed under the License is distributed on an "AS IS" BASIS,
+~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~~ See the License for the specific language governing permissions and
+~~ limitations under the License.
+ ------
+Download Apache log4cxx ${releaseVersion}
+ ------
+ ------
+ ------
+
+Download Apache log4cxx ${releaseVersion}
+
+  Apache log4cxx ${releaseVersion} is distributed under the 
{{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version 
2.0}}.
+
+  The link in the Mirrors column should display a list of available mirrors 
with a
+  default selection based on your inferred location.  If you do not see that 
page,
+  try a different browser.  The checksum and signature are links to
+  the originals on the main distribution server.
+
+*-------------------------+---------+----------+-----------+
+|                         | Mirrors | Checksum | Signature |
+*-------------------------+---------+----------+-----------+
+| Apache log4cxx ${releaseVersion} (tar.gz)      | 
{{{http://www.apache.org/dyn/closer.cgi/logging/log4cxx/${releaseVersion}/${releaseArtifactId}-${releaseVersion}.tar.gz}
 ${releaseArtifactId}-${releaseVersion}.tar.gz}} | 
{{{http://www.apache.org/dist/logging/log4cxx/${releaseVersion}/${releaseArtifactId}-${releaseVersion}.tar.gz.md5}
 ${releaseArtifactId}-${releaseVersion}.tar.gz.md5}} | 
{{{http://www.apache.org/dist/logging/log4cxx/${releaseVersion}/${releaseArtifactId}-${releaseVersion}.tar.gz.asc}
 ${releaseArtifactId}-${releaseVersion}.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Apache log4cxx ${releaseVersion} (zip)      | 
{{{http://www.apache.org/dyn/closer.cgi/logging/log4cxx/${releaseVersion}/${releaseArtifactId}-${releaseVersion}.zip}
 ${releaseArtifactId}-${releaseVersion}.zip}} | 
{{{http://www.apache.org/dist/logging/log4cxx/${releaseVersion}/${releaseArtifactId}-${releaseVersion}.zip.md5}
 ${releaseArtifactId}-${releaseVersion}.zip.md5}} | 
{{{http://www.apache.org/dist/logging/log4cxx/${releaseVersion}/${releaseArtifactId}-${releaseVersion}.zip.asc}
 ${releaseArtifactId}-${releaseVersion}.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+
+    It is essential that you verify the integrity of the downloaded files 
using the PGP or MD5 signatures.
+    Please read {{{http://httpd.apache.org/dev/verification.html}Verifying 
Apache HTTP Server Releases}} for more
+    information on why you should verify our releases.
+
+    The PGP signatures can be verified using PGP or GPG. First download the 
{{{http://www.apache.org/dist/logging/KEYS}KEYS}}
+    as well as the asc signature file for the relevant distribution. Make sure 
you get these files from the
+    {{{http://www.apache.org/dist/logging/}main distribution directory}}, 
rather than from a mirror. Then verify the signatures using
+
+---
+% gpg --import KEYS
+% gpg --verify ${releaseArtifactId}-${releaseVersion}.tar.gz.asc
+---
+
+        * ${releaseArtifactId}-${releaseVersion} is signed by 
${releaseManager} (${releaseKey})
+
+    Alternatively, you can verify the MD5 signature on the files. A unix 
program called md5 or md5sum is included
+    in many unix distributions.
+
+* Previous Releases
+
+  All previous releases of Apache log4cxx can be found in the 
{{{http://archive.apache.org/dist/logging/log4cxx}archive repository}}.

Reply via email to