Repository: struts-site
Updated Branches:
  refs/heads/master e662bf2bb -> 4239884d8


Adds info about 2.5 BETA1


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/4e8f12fc
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/4e8f12fc
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/4e8f12fc

Branch: refs/heads/master
Commit: 4e8f12fc97b30989ec8711010fe8b69a2272a108
Parents: 0c03b89
Author: Lukasz Lenart <lukasz.len...@gmail.com>
Authored: Fri Aug 7 14:51:21 2015 +0200
Committer: Lukasz Lenart <lukasz.len...@gmail.com>
Committed: Fri Aug 7 14:51:46 2015 +0200

----------------------------------------------------------------------
 _config.yml           |  3 ++
 source/announce.md    | 33 +++++++++++++++++++++-
 source/download.html  | 68 +++++++++++++++++++++++++++++++++++++++++++++-
 source/downloads.html |  9 +++++-
 source/index.html     | 10 +++----
 5 files changed, 115 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-site/blob/4e8f12fc/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 7c69788..27731ee 100644
--- a/_config.yml
+++ b/_config.yml
@@ -29,5 +29,8 @@ root:
 # Simplifies introducing changes related to the latest release
 current_version: 2.3.24
 current_version_short: 2324
+current_beta_version: 2.5-BETA1
+current_beta_version_short: 25
 release_date: 7 may 2015
 release_date_short: 20150507
+beta_release_date_short: 20150731

http://git-wip-us.apache.org/repos/asf/struts-site/blob/4e8f12fc/source/announce.md
----------------------------------------------------------------------
diff --git a/source/announce.md b/source/announce.md
index f706d67..216bee1 100644
--- a/source/announce.md
+++ b/source/announce.md
@@ -8,6 +8,37 @@ title: Announcements
   Skip to: <a href="announce-2014.html">Announcements - 2014</a>
 </p>
 
+#### 31 July 2015 - Struts 2.5-BETA1 (BETA) {#a20150731}
+
+The Apache Struts group is pleased to announce that Struts 2.5-BETA1 is 
available as a "BETA"
+release.
+
+Apache Struts 2 is an elegant, extensible framework for creating 
enterprise-ready Java web applications.
+The framework is designed to streamline the full development cycle, from 
building, to deploying,
+to maintaining applications over time.
+
+This release contains several breaking changes and improvements just to 
mention few of them:
+
+ - XWork source was merged into Struts Core source, it means that there be no 
more xwork artifact nor dedicated jar
+ - OGNL was upgraded to version 3.0.11 and it breaks access to properties as 
it follows Java Bean Specification, see WW-4207 and WW-3909
+ - Spring dependency for tests and spring plugin was upgraded to version 
4.1.6, see WW-4510.
+ - Struts2 internal logging api was marked as deprecated and was replaced with 
new Log4j2 api as logging layer, see WW-4504.
+ - Struts2 is now build with JDK7, see WW-4503.
+ - New plugin to support bean validation is now part of the distribution, see 
WW-4505.
+ - Deprecated plugins are now removed from the distribution and are not longer 
supported anymore:
+   - Dojo Plugin
+   - Codebehind Plugin
+   - JSF Plugin
+   - Struts1 Plugin
+
+and many other improvements, please check the version notes
+
+The 2.5.x series of the Apache Struts framework has a minimum requirement of 
the following specification versions:
+Servlet API 2.4, JSP API 2.0, and Java 7.
+
+Should any issues arise with your use of any version of the Struts framework,
+please post your comments to the user list, and, if appropriate, file a 
tracking ticket.
+
 #### 7 May 2015 - Struts 2.3.24 General Availability {#a20150507}
 
 The Apache Struts group is pleased to announce that Struts 2.3.24 is available 
as a "General Availability"
@@ -31,7 +62,7 @@ This release contains several fixes and improvements just to 
mention few of them
  - fixed parameters encoding in `ServletRedirectAction` before checking for 
valid URI
  - `css_xhtml` hidden input adding table row markup
  - FreeMarker was upgraded to the latest available version - 2.3.22
- - support for Log4j2 was added 
+ - support for Log4j2 was added
 
 and many other improvements, please check the version notes
 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/4e8f12fc/source/download.html
----------------------------------------------------------------------
diff --git a/source/download.html b/source/download.html
index 568c328..3a0f9db 100644
--- a/source/download.html
+++ b/source/download.html
@@ -66,7 +66,7 @@ title: Download a Release
 <h2>Struts {{ site.current_version }}</h2>
 
 <p>
-  <a href="http://struts.apache.org/release/2.3.x/";>Apache Struts {{ 
site.current_version }}</a> is an elegant, extensible
+  <a href="http://struts.apache.org/";>Apache Struts {{ site.current_version 
}}</a> is an elegant, extensible
   framework for creating enterprise-ready Java web applications. It is 
available in a full distribution,
   or as separate library, source, example and documentation distributions.
   Struts {{ site.current_version }} is the "best available" version of Struts 
in the 2.3 series.
@@ -127,6 +127,72 @@ title: Download a Release
 
 </ul>
 
+<h1>Beta Releases</h1>
+<a name="struts-beta"></a>
+
+<h2>Struts 2.5 BETA1</h2>
+
+<p>
+  <a href="http://struts.apache.org/";>Apache Struts {{ 
site.current_beta_version }}</a> is a first release of incoming Struts 2.5.
+  It's the first version which has a lot of backward compatibility breaking 
changes but it should be slightly
+  easy to adjust your application to use this version. Please read version 
notes for more details.
+</p>
+
+<ul>
+  <li>
+    <a href="http://struts.apache.org/docs/version-notes-{{ 
site.current_beta_version_short }}.html">Version Notes</a>
+  </li>
+
+  <li>Full Distribution:
+    <ul>
+      <li>
+        <a href="[preferred]/struts/{{ site.current_beta_version }}/struts-{{ 
site.current_beta_version }}-all.zip">struts-{{ site.current_beta_version 
}}-all.zip</a> (65MB)
+        [<a href="http://www.apache.org/dist/struts/{{ site.current_version 
}}/struts-{{ site.current_beta_version }}-all.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/{{ site.current_version 
}}/struts-{{ site.current_beta_version }}-all.zip.md5">MD5</a>]
+      </li>
+    </ul>
+  </li>
+
+  <li>Example Applications:
+    <ul>
+      <li>
+        <a href="[preferred]/struts/{{ site.current_beta_version }}/struts-{{ 
site.current_beta_version }}-apps.zip">struts-{{ site.current_beta_version 
}}-apps.zip</a> (35MB)
+        [<a href="http://www.apache.org/dist/struts/{{ 
site.current_beta_version }}/struts-{{ site.current_beta_version 
}}-apps.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/{{ 
site.current_beta_version }}/struts-{{ site.current_beta_version 
}}-apps.zip.md5">MD5</a>]
+      </li>
+    </ul>
+  </li>
+  <li>Essential Dependencies Only:
+    <ul>
+      <li>
+        <a href="[preferred]/struts/{{ site.current_beta_version }}/struts-{{ 
site.current_beta_version }}-lib.zip">struts-{{ site.current_beta_version 
}}-lib.zip</a> (19MB)
+        [<a href="http://www.apache.org/dist/struts/{{ 
site.current_beta_version }}/struts-{{ site.current_beta_version 
}}-lib.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/{{ 
site.current_beta_version }}/struts-{{ site.current_beta_version 
}}-lib.zip.md5">MD5</a>]
+      </li>
+    </ul>
+  </li>
+
+  <li>Documentation:
+    <ul>
+      <li>
+        <a href="[preferred]/struts/{{ site.current_beta_version }}/struts-{{ 
site.current_beta_version }}-docs.zip">struts-{{ site.current_beta_version 
}}-docs.zip</a> (13MB)
+        [<a href="http://www.apache.org/dist/struts/{{ 
site.current_beta_version }}/struts-{{ site.current_beta_version 
}}-docs.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/{{ 
site.current_beta_version }}/struts-{{ site.current_beta_version 
}}-docs.zip.md5">MD5</a>]
+      </li>
+    </ul>
+  </li>
+  <li>Source:
+    <ul>
+      <li>
+        <a href="[preferred]/struts/{{ site.current_beta_version }}/struts-{{ 
site.current_beta_version }}-src.zip">struts-{{ site.current_beta_version 
}}-src.zip</a> (7MB)
+        [<a href="http://www.apache.org/dist/struts/{{ 
site.current_beta_version }}/struts-{{ site.current_beta_version 
}}-src.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/{{ 
site.current_beta_version }}/struts-{{ site.current_beta_version 
}}-src.zip.md5">MD5</a>]
+      </li>
+    </ul>
+  </li>
+
+</ul>
+
 <h2>Struts 1.3.10</h2>
 <a name="struts1310"></a>
 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/4e8f12fc/source/downloads.html
----------------------------------------------------------------------
diff --git a/source/downloads.html b/source/downloads.html
index 1ca278a..9e4af76 100644
--- a/source/downloads.html
+++ b/source/downloads.html
@@ -21,7 +21,7 @@ title: Releases
     <strong>General Availability (GA) Releases</strong> - <em>Ready for Prime 
Time!</em>
     <ul>
       <li>
-        <a href="http://struts.apache.org/download.cgi#struts{{ 
site.current_version_short }}">
+        <a href="http://struts.apache.org/download.cgi#struts-ga";>
           Struts {{ site.current_version }}
         </a> ("best available")
       </li>
@@ -29,6 +29,13 @@ title: Releases
   </li>
   <li>
     <strong>Beta Releases</strong> - <em>Help test the next release!</em>
+    <ul>
+      <li>
+        <a href="http://struts.apache.org/download.cgi#struts-beta";>
+          Struts 2.5 BETA 1
+        </a> (first BETA release of new backward compatibility breaking 
version 2.5)
+      </li>
+    </ul>
   </li>
   <li>
     <strong>Trunk Snapshots</strong> - <em>Get involved with the latest and 
greatest fixes and improvements</em>

http://git-wip-us.apache.org/repos/asf/struts-site/blob/4e8f12fc/source/index.html
----------------------------------------------------------------------
diff --git a/source/index.html b/source/index.html
index b398b69..c4d5d49 100644
--- a/source/index.html
+++ b/source/index.html
@@ -39,11 +39,11 @@ title: Welcome to the Apache Struts project
         </p>
       </div>
       <div class="column col-md-4">
-        <h2>Apache Struts 1</h2>
-        <p><strong>End-Of-Life (EOL)</strong></p>
-        <p>The Struts 1.x web framework has reached its end of life and is no 
longer officially supported.
-          <a href="struts1eol-announcement.html">Read the announcement</a> or 
the official
-          <a href="struts1eol-press.html">Press release</a>
+        <h2>Apache Struts 2.5 BETA1</h2>
+        <p>
+          It's a first release of incoming Struts 2.5.
+          Read more in <a href="announce.html#a{{ site.beta_release_date_short 
}}">Announcement</a> or in
+          <a href="/docs/version-notes-{{ site.current_beta_version_short 
}}.html">Version notes</a>
         </p>
       </div>
     </div>

Reply via email to