From 7b127caba3ddc39a5a70628c831953bb870f4b52 Mon Sep 17 00:00:00 2001 From: tkellner Date: Fri, 2 Sep 2011 16:01:13 +0000 Subject: website updates git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@975 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- BKUHelpWebStart/src/site/site.xml | 42 +++++++++++++++++++++++++++++++++++++++ pom.xml | 4 ++-- src/site/apt/download.apt | 2 +- src/site/apt/index.apt | 9 ++++++--- 4 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 BKUHelpWebStart/src/site/site.xml diff --git a/BKUHelpWebStart/src/site/site.xml b/BKUHelpWebStart/src/site/site.xml new file mode 100644 index 00000000..020a04d5 --- /dev/null +++ b/BKUHelpWebStart/src/site/site.xml @@ -0,0 +1,42 @@ + + + + + + + + MOCCA + ../images/mocca-t_s.png + http://mocca.egovlabs.gv.at/ + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index fe48d7e5..9b781e41 100644 --- a/pom.xml +++ b/pom.xml @@ -63,8 +63,8 @@ - Apache 2 - LICENSE.txt + EUPL v1.1 + http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1 manually diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt index c6a985bc..0f301531 100644 --- a/src/site/apt/download.apt +++ b/src/site/apt/download.apt @@ -10,7 +10,7 @@ Download MOCCA * <> - Current stable releases are 1.2.x. + Current stable releases are 1.3.x. <>! diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index 835fccc2..0abb3922 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -33,8 +33,11 @@ Releases Licensing - The MOCCA project as provided by {{{http://www.egiz.gv.at}EGIZ}} is licensed according to the terms of the {{{http://www.apache.org/licenses/LICENSE-2.0.html}Apache License 2.0}}. + Since version 1.3.6, the MOCCA project as provided by {{{http://www.egiz.gv.at}EGIZ}} is licensed according to the terms of the {{{http://osor.eu/eupl}EUPL v1.1}}. - MOCCA also requires software provided by third parties. Most of this software is free and open source. Some required software is licensed under a commercial license. This includes software provided by {{{http://www.sic.st/}Stiftung Secure Information and Communication Technologies (SIC)}}, which however grants a free-of-charge license for the use of their software together with the unchanged software provided by the MOCCA project. + Up to and including version 1.3.6 of this product were published under an {{{http://www.apache.org/licenses/LICENSE-2.0.html}Apache License 2.0}}. + + This product includes software developed by third parties and provided under an {{{http://www.opensource.org}open source license}}. + + This product includes software provided by {{{http://www.sic.st/}Stiftung Secure Information and Communication Technologies (SIC)}} - {{{http://www.sic.st/}Stiftung Secure Information and Communication Technologies (SIC)}} also offers a free-of-charge {{{http://jce.iaik.tugraz.at/sic/Sales/Licences/License-for-Open-Source-Projects}license for open source projects}} which are released under {{{http://www.fsf.org/licenses/gpl.html}GPL Version 2.0}}. This allows open source projects to change or extend software developed by the MOCCA project and obtain a free-of-charge license for software required by MOCCA, as long as such projects are released under GPL Version 2.0. The licensee is responsible for obtaining any required licenses. \ No newline at end of file -- cgit v1.2.3