Repository: oodt
Updated Branches:
  refs/heads/asf-site d4d18f411 -> 8f6347dfa


update site with new release and copyright


Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/8f6347df
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/8f6347df
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/8f6347df

Branch: refs/heads/asf-site
Commit: 8f6347dfae0e1026ffca89f234aeab284c227328
Parents: d4d18f4
Author: Tom Barber <[email protected]>
Authored: Tue May 1 23:48:56 2018 +0100
Committer: Tom Barber <[email protected]>
Committed: Tue May 1 23:48:56 2018 +0100

----------------------------------------------------------------------
 2016/06/26/oodt-10-released.html  |  4 ----
 2017/07/27/oodt-110-released.html |  4 ----
 2017/08/28/oodt-112-released.html |  4 ----
 blog.html                         |  8 --------
 download.html                     | 29 ++++++++++++++++++-----------
 index.html                        |  7 +------
 6 files changed, 19 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oodt/blob/8f6347df/2016/06/26/oodt-10-released.html
----------------------------------------------------------------------
diff --git a/2016/06/26/oodt-10-released.html b/2016/06/26/oodt-10-released.html
index 76ccaf3..184bcb7 100644
--- a/2016/06/26/oodt-10-released.html
+++ b/2016/06/26/oodt-10-released.html
@@ -137,11 +137,7 @@ have planned for 2.0!</p>
           </li>
         </ul>
         <hr class="small">
-<<<<<<< HEAD
         <p class="text-muted">Copyright &copy; The Apache Foundation 2018</p>
-=======
-        <p class="text-muted">Copyright &copy; The Apache Foundation 2017</p>
->>>>>>> 8b200c2ed3d2a31133856e923ba1ea67636619da
       </div>
     </div>
   </div>

http://git-wip-us.apache.org/repos/asf/oodt/blob/8f6347df/2017/07/27/oodt-110-released.html
----------------------------------------------------------------------
diff --git a/2017/07/27/oodt-110-released.html 
b/2017/07/27/oodt-110-released.html
index 766eb6d..5fd77f3 100644
--- a/2017/07/27/oodt-110-released.html
+++ b/2017/07/27/oodt-110-released.html
@@ -142,11 +142,7 @@ https://oodt.apache.org/.</p>
           </li>
         </ul>
         <hr class="small">
-<<<<<<< HEAD
         <p class="text-muted">Copyright &copy; The Apache Foundation 2018</p>
-=======
-        <p class="text-muted">Copyright &copy; The Apache Foundation 2017</p>
->>>>>>> 8b200c2ed3d2a31133856e923ba1ea67636619da
       </div>
     </div>
   </div>

http://git-wip-us.apache.org/repos/asf/oodt/blob/8f6347df/2017/08/28/oodt-112-released.html
----------------------------------------------------------------------
diff --git a/2017/08/28/oodt-112-released.html 
b/2017/08/28/oodt-112-released.html
index acc9fa8..70562b7 100644
--- a/2017/08/28/oodt-112-released.html
+++ b/2017/08/28/oodt-112-released.html
@@ -133,11 +133,7 @@ https://oodt.apache.org/.</p>
           </li>
         </ul>
         <hr class="small">
-<<<<<<< HEAD
         <p class="text-muted">Copyright &copy; The Apache Foundation 2018</p>
-=======
-        <p class="text-muted">Copyright &copy; The Apache Foundation 2017</p>
->>>>>>> 8b200c2ed3d2a31133856e923ba1ea67636619da
       </div>
     </div>
   </div>

http://git-wip-us.apache.org/repos/asf/oodt/blob/8f6347df/blog.html
----------------------------------------------------------------------
diff --git a/blog.html b/blog.html
index c69b935..3d9561c 100644
--- a/blog.html
+++ b/blog.html
@@ -89,14 +89,6 @@
         <div class="col-md-offset-3 col-md-6">
             <div class="list-group">
                 
-                <a class="list-group-item" 
href="/2018/02/04/oodt-121-released.html">
-                    <h4 class="list-group-item-heading">Apache OODT 1.2.1 
released</h4>
-                    <p class="list-group-item-text"><p>OODT 1.2.1</p>
-
-</p>
-                </a>
-                
-                
                 
                 <a class="list-group-item" 
href="/2017/08/28/oodt-112-released.html">
                     <h4 class="list-group-item-heading">Apache OODT 1.2 
released</h4>

http://git-wip-us.apache.org/repos/asf/oodt/blob/8f6347df/download.html
----------------------------------------------------------------------
diff --git a/download.html b/download.html
index ea8a123..c8f812b 100644
--- a/download.html
+++ b/download.html
@@ -84,7 +84,7 @@
       <h1>Introduction</h1>
       <p>Thanks for checking out Apache OODT. On this page you can download 
our official release.<br/> <strong>N.B. OODT is ONLY released as source code 
and NOT binary</strong>. This is because you will most likely want to recompile 
various aspects of the codebase with configuration before deploying an OODT 
system.</p>
 
-      <p>See the <a 
href="https://raw.githubusercontent.com/apache/oodt/1.2.1/CHANGES.txt";>1.2.1-CHANGES.txt</a>
 file for more information on the list of updates in this release.</p>
+      <p>See the <a 
href="https://raw.githubusercontent.com/apache/oodt/1.2.2/CHANGES.txt";>1.2.2-CHANGES.txt</a>
 file for more information on the list of updates in this release.</p>
 
       <p>OODT is always distributed under the <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>Apache License, version 
2.0</a>.</p>
 
@@ -92,8 +92,8 @@
       <p>You require <a href="http://maven.apache.org/";>Apache Maven</a> to 
build the OODT source code. Maven can either be downloaded and installed 
manually or alternatively via command line via your operating system package 
manager.</p>
 
       <h1>Official Release</h1>
+      <p>FEB-2018: The Latest Apache™ OODT version 1.2.2 is now released and 
available for download.</p>
 
-      <p>FEB-2018: The Latest Apache™ OODT version 1.2.1 is now released and 
available for download.</p>
       <p><a href="http://www.apache.org/dyn/closer.lua/oodt"; class="btn 
btn-primary">Download OODT</a>
       <h2>Download OODT</h2>
 
@@ -110,19 +110,19 @@
        </tr>
        <tr>
          <td>
-           Apache OODT 1.2.1 (zip)
+           Apache OODT 1.2.2 (zip)
          </td>
          <td>
-           <a 
href="http://www.apache.org/dyn/closer.cgi/oodt/apache-oodt-1.2.1-src.zip";>apache-oodt-1.2.1-src.zip</a>
+           <a 
href="http://www.apache.org/dyn/closer.cgi/oodt/apache-oodt-1.2.2-src.zip";>apache-oodt-1.2.2-src.zip</a>
          </td>
          <td>
-           <a 
href="http://www.apache.org/dist/oodt/apache-oodt-1.2.1-src.zip.md5";>apache-oodt-1.2.1-src.zip.md5</a>
+           <a 
href="http://www.apache.org/dist/oodt/apache-oodt-1.2.2-src.zip.md5";>apache-oodt-1.2.2-src.zip.md5</a>
          </td>
          <td>
-           <a 
href="http://www.apache.org/dist/oodt/apache-oodt-1.2.1-src.zip.asc";>apache-oodt-1.2.1-src.zip.asc</a>
+           <a 
href="http://www.apache.org/dist/oodt/apache-oodt-1.2.2-src.zip.asc";>apache-oodt-1.2.2-src.zip.asc</a>
          </td>
          <td>
-           <a 
href="http://www.apache.org/dist/oodt/apache-oodt-1.2.1-src.zip.sha1";>apache-oodt-1.2.1-src.zip.sha1</a>
+           <a 
href="http://www.apache.org/dist/oodt/apache-oodt-1.2.2-src.zip.sha1";>apache-oodt-1.2.2-src.zip.sha1</a>
          </td>
        </tr>
       </table>
@@ -138,14 +138,14 @@
 
       <p>N.B.Make sure you get these files from the <a 
href="http://www.apache.org/dist/oodt/";>main distribution directory</a>, rather 
than from a mirror. Then verify the signatures using the following:</p>
 
-      <code>$ gpg --import KEYS $ gpg --verify 
apache-oodt-1.2.1-src.zip.asc</code>
-      <p>The files in the most recent release are signed by 2048R/0C1E654B 
Chris Mattmann (CODE SIGNING KEY - Apr 2016) &lt;[email protected]&gt; (CODE 
SIGNING KEY)</p>
+      <code>$ gpg --import KEYS $ gpg --verify 
apache-oodt-1.2.2-src.zip.asc</code>
+      <p>The files in the most recent release are signed by 2048R/5E91D429 Tom 
Barber (CODE SIGNING KEY)</p>
 
       <h4>MD5 Signature</h4>
       <p>Alternatively, you can verify the MD5 signature on the files. A unix 
program called md5 or md5sum is included in many unix distributions.</p>
 
-      <code>$ md5sum apache-oodt-1.2.1-src.tar.gz</code>
-      <p>... output should match the string in 
apache-oodt-1.2.1-src.zip.md5</p>
+      <code>$ md5sum apache-oodt-1.2.2-src.tar.gz</code>
+      <p>... output should match the string in 
apache-oodt-1.2.2-src.zip.md5</p>
 
     </div>
     <div class="col-md-4">
@@ -193,6 +193,13 @@
       <a href="#">Verification KEYS</a>
       </p>
       
+      <p>
+      Release Date: JUN-2015<br/>
+      Version: OODT 0.9<br/>
+      <a 
href="http://www.apache.org/dyn/closer.lua/oodt/apache-oodt-0.9-src.zip";>Download</a><br/>
+      <a href="#">Verification KEYS</a>
+      </p>
+      
     </div>
   </div>
 </div>

http://git-wip-us.apache.org/repos/asf/oodt/blob/8f6347df/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index bbc6e03..777d5e2 100644
--- a/index.html
+++ b/index.html
@@ -91,10 +91,6 @@
     <ul class="list-group">
       
       <li class="list-group-item">
-       <a href="/2018/02/04/oodt-121-released.html">Apache OODT 1.2.1 
released</a>
-      </li>
-      
-      <li class="list-group-item">
        <a href="/2017/08/28/oodt-112-released.html">Apache OODT 1.2 
released</a>
       </li>
       
@@ -104,7 +100,6 @@
       
       <li class="list-group-item">
        <a href="/2016/06/26/oodt-10-released.html">Apache OODT 1.0 released</a>
-
       </li>
       
       <li class="list-group-item">
@@ -112,7 +107,7 @@
       </li>
       
       <li class="list-group-item">
-       <a href="/2016/02/26/oodt-012-released.html">Apache OODT 0.12 hits the 
shelves</a>
+       <a href="/2016/01/04/oodt-011-released.html">Apache OODT 0.11 
Released</a>
       </li>
       
     </ul>

Reply via email to