This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/master by this push: new 8a6e868 PLC4X-26 - Website is missing a number of required links 8a6e868 is described below commit 8a6e868dc80fc6aa33649599f7ad60f864d75cd6 Author: Christofer Dutz <christofer.d...@c-ware.de> AuthorDate: Fri Feb 2 13:44:09 2018 +0100 PLC4X-26 - Website is missing a number of required links - Added a new "Apache" menu with all missing links - Added a "users"/"security" menu with the required security content PLC4X-27 - Add incubating disclaimer to website - Added the disclaimer PLC4X-24 - Broken links on web site - Fixed the link to the Apache CI on the CI page - The contribute page is not broken, it's just empty --- src/site/asciidoc/developers/ci.adoc | 2 +- .../asciidoc/{developers/ci.adoc => users/security.adoc} | 12 +++++------- src/site/resources/css/site.css | 4 ++++ src/site/site.xml | 16 +++++++++++++++- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/site/asciidoc/developers/ci.adoc b/src/site/asciidoc/developers/ci.adoc index 4d01a95..5fb2d31 100644 --- a/src/site/asciidoc/developers/ci.adoc +++ b/src/site/asciidoc/developers/ci.adoc @@ -19,7 +19,7 @@ We are currently using two different CI systems. -- Apache's Jenkins at: https://builds.apache.org/view/P/view/PLC4X/ +- Apache's Jenkins at: https://builds.apache.org/view/M-R/job/PLC4X/ - Travis at: https://travis-ci.org/apache/incubator-plc4x/ Hereby Apache Jenkins clearly is responsible for running the full testsuite with all integration-tests. diff --git a/src/site/asciidoc/developers/ci.adoc b/src/site/asciidoc/users/security.adoc similarity index 60% copy from src/site/asciidoc/developers/ci.adoc copy to src/site/asciidoc/users/security.adoc index 4d01a95..f72e7ea 100644 --- a/src/site/asciidoc/developers/ci.adoc +++ b/src/site/asciidoc/users/security.adoc @@ -15,14 +15,12 @@ // limitations under the License. // -== Continuous Integration +== Security Vulnerabilities -We are currently using two different CI systems. +Please note that binary patches are not produced for individual vulnerabilities. To obtain the binary fix for a particular vulnerability you should upgrade to an Apache PLC4X version where that vulnerability has been fixed. -- Apache's Jenkins at: https://builds.apache.org/view/P/view/PLC4X/ -- Travis at: https://travis-ci.org/apache/incubator-plc4x/ +For more information about reporting vulnerabilities, see the https://www.apache.org/security/[Apache Security Team] page. -Hereby Apache Jenkins clearly is responsible for running the full testsuite with all integration-tests. -Also only jobs on Apache Jenkins are allowed to publish SNAPSHOT versions of the Maven artifacts to Apaches Nexus. +=== Known Vulnerabilities -Travis integrates perfectly into GitHub. We are using this to auto-check any pull-requests coming in. +No vulnerabilities have been reported. \ No newline at end of file diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css index 79f8a11..97e77f8 100644 --- a/src/site/resources/css/site.css +++ b/src/site/resources/css/site.css @@ -47,3 +47,7 @@ under the License. .protocolParameter { background-color: #80DED9; } + +#bannerRight > img { + width: 400px; +} diff --git a/src/site/site.xml b/src/site/site.xml index aa757dc..8543d95 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -52,7 +52,9 @@ </brand> <bottomDescription> <![CDATA[ - <p id="bottomNote"></p> + <p id="bottomNote"> + Apache PLC4X is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...] + </p> ]]> </bottomDescription> <breadcrumbs>true</breadcrumbs> @@ -65,6 +67,10 @@ </reflowSkin> </custom> + <poweredBy> + <logo name="Apache Software Foundation" img="https://www.apache.org/img/asf_logo.png" href="https://www.apache.org/"/> + </poweredBy> + <bannerLeft> <name>Apache PLC4X (incubating)</name> <src>https://plc4x.apache.org/img/apache_plc4x_logo.png</src> @@ -86,6 +92,7 @@ <menu name="Users"> <item name="Getting Started" href="users/gettingstarted.html"/> <item name="Industry 4.0 with Apache" href="users/industry40.html"/> + <item name="Security" href="users/security.html"/> </menu> <menu name="Developers"> <item name="Bug & Issue Tracker" href="developers/issues.html"/> @@ -103,6 +110,13 @@ <item name="S7/Profinet" href="protocols/s7/index.html"/> </menu> <menu name="Reports" ref="reports" inherit="top"/> + <menu name="Apache"> + <item name="Apache Software Foundation" href="http://www.apache.org/"/> + <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/> + <item name="Apache License" href="http://www.apache.org/licenses/"/> + <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/> + <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/> + </menu> <menu ref="modules" inherit="top"/> </body> -- To stop receiving notification emails like this one, please contact cd...@apache.org.