From ef382bb033cea506bd9465426b2a98d390932719 Mon Sep 17 00:00:00 2001 From: David Currie Date: Fri, 13 Feb 2015 16:55:29 +0000 Subject: [PATCH] Add reference to beta license --- websphere-liberty/license.md | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/websphere-liberty/license.md b/websphere-liberty/license.md index d8303a83a..454fc1009 100644 --- a/websphere-liberty/license.md +++ b/websphere-liberty/license.md @@ -1,12 +1,17 @@ -The Dockerfile and associated scripts are licensed under the [Apache License -2.0][apache-license]. The IBM JRE and WebSphere Application Server for -Developers are licensed under the IBM International License Agreement for -Non-Warranted Programs. Those licenses may be viewed from the image using the -`LICENSE=view` environment variable as described above or may be found online -for the [IBM JRE][jre-license] and [IBM WebSphere Application Server for -Developers][liberty-license]. Note that this license does not permit further -distribution and that the image is for development use only. +The Dockerfile and associated scripts are licensed under the [Apache +License 2.0][apache-license]. The IBM JRE and WebSphere Application +Server for Developers are licensed under the IBM International License +Agreement for Non-Warranted Programs and the Beta under the IBM +International License Agreement for Early Release of Programs. Those +licenses may be viewed from the image using the `LICENSE=view` +environment variable as described above or may be found online for the +[IBM JRE][jre-license], [IBM WebSphere Application Server for +Developers][liberty-license] and [IBM WebSphere Application Server +Liberty v9 Beta with Java EE 7][beta-license]. Note that this license +does not permit further distribution and that the image is for +development use only. [apache-license]: http://www.apache.org/licenses/LICENSE-2.0.html [jre-license]: https://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=&li_formnum=L-EWOD-99YA4J&title=IBM%C2%AE+SDK%2C+Java+Technology+Edition%2C+Version+7+Release+1&l=en -[liberty-license]: https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/8.5.5.3/lafiles/runtime/en.html +[liberty-license]: https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/8.5.5.4/lafiles/runtime/en.html +[beta-license]: https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/beta/lafiles/en.html