third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#359 Upgrading to FreeMarker 2.3.21; Updating license.txt

Browse Source
This commit is contained in:
Gunnar Morling 2014-11-26 00:10:48 +01:00 committed by Andreas Gudian
parent 1bfcdd2c2a
commit 0b7c449f4d
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
license.txt
View File

@ -17,10 +17,25 @@
------------------------------------------------------------------------
MAPSTRUCT SUBCOMPONENTS WITH DIFFERENT LICENCES
MAPSTRUCT SUBCOMPONENTS WITH DIFFERENT COPYRIGHT OWNERS
The MapStruct distribution includes FreeMarker, a software developed by
the Visigoth Software Society (http://www.visigoths.org/) which is
distributed under a BSD-style license. Your use of FreeMarker is subject
to the terms and conditions of this license (see
http://freemarker.sourceforge.net/docs/app_license.html).
The MapStruct distribution (ZIP, TAR.GZ) as well as the MapStruct
library (JAR) include FreeMarker, a software developed by Attila
Szegedi, Daniel Dekany and Jonathan Revusky. FreeMarker is licensed
under the same license as MapStruct itself - Apache License, Version
2.0 - but the copyright owners are the aforementioned individuals.
The MapStruct distribution (ZIP, TAR.GZ) as well as the MapStruct
library (JAR) include a number of files that are licensed by the
Apache Software Foundation under the same license as MapStruct itself -
Apache License, Version 2.0 - but the copyright owner is the Apache
Software Foundation. These files are:
freemarker/ext/jsp/web-app_2_2.dtd
freemarker/ext/jsp/web-app_2_3.dtd
freemarker/ext/jsp/web-app_2_4.xsd
freemarker/ext/jsp/web-app_2_5.xsd
freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
freemarker/ext/jsp/web-jsptaglibrary_2_0.xsd
freemarker/ext/jsp/web-jsptaglibrary_2_1.xsd

2
parent/pom.xml
View File

@ -99,7 +99,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.19</version>
<version>2.3.21</version>
</dependency>
<dependency>
<groupId>org.easytesting</groupId>