libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

KEYCLOAK-12691 Upgrade to freemarker 2.3.29

Browse source
This commit is contained in:
Martin Kanis 2020-01-20 10:03:49 +01:00 committed by Hynek Mlnařík
parent fc7b769b6e
commit 7a51ec486c
5 changed files with 39 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml
View file

@ -70,11 +70,11 @@
<dependency> <dependency>
<groupId>org.freemarker</groupId> <groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId> <artifactId>freemarker</artifactId>
<version>2.3.26-incubating</version> <version>2.3.29</version>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache Software License 2.0</name>
<url>https://git-wip-us.apache.org/repos/asf?p=freemarker.git;a=blob_plain;f=LICENSE;hb=v2.3.26</url> <url>https://git-wip-us.apache.org/repos/asf?p=freemarker.git;a=blob_plain;f=LICENSE;hb=v2.3.29</url>
</license> </license>
</licenses> </licenses>
</dependency> </dependency>

25
distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.freemarker,freemarker,2.3.26-incubating,Apache Software License 2.0.txt → distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.freemarker,freemarker,2.3.29,Apache Software License 2.0.txt
View file

@ -203,12 +203,21 @@
========================================================================= =========================================================================
The Apache FreeMarker (incubating) source code contains the following The source code contains the following binaries,
binaries, which were created at the Apache FreeMarker (incubating) which were created at the Apache FreeMarker project, and hence are
project, and hence are covered by the same license as the other source covered by the same license as the other source files of it:
files of it:
src/main/misc/overloadedNumberRules/prices.ods src/main/misc/overloadedNumberRules/prices.ods
src/manual/en_US/docgen-originals/figures/overview.odg src/manual/en_US/docgen-originals/figures/overview.odg
src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png
========================================================================= src/manual/en_US/docgen-originals/figures/tree_with_alpha.png
src/manual/en_US/favicon.png
src/manual/en_US/figures/model2sketch.png
src/manual/en_US/figures/overview.png
src/manual/en_US/figures/tree.png
src/manual/en_US/logo.png
src/manual/zh_CN/favicon.png
src/manual/zh_CN/figures/model2sketch.png
src/manual/zh_CN/figures/overview.png
src/manual/zh_CN/figures/tree.png
src/manual/zh_CN/logo.png

4
distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
View file

@ -70,11 +70,11 @@
<dependency> <dependency>
<groupId>org.freemarker</groupId> <groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId> <artifactId>freemarker</artifactId>
<version>2.3.26.incubating-redhat-3</version> <version>2.3.29.redhat-00001</version>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache Software License 2.0</name>
<url>https://git-wip-us.apache.org/repos/asf?p=freemarker.git;a=blob_plain;f=LICENSE;hb=v2.3.26</url> <url>https://git-wip-us.apache.org/repos/asf?p=freemarker.git;a=blob_plain;f=LICENSE;hb=v2.3.29</url>
</license> </license>
</licenses> </licenses>
</dependency> </dependency>

25
distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.26.incubating-redhat-3,Apache Software License 2.0.txt → distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.29.redhat-00001,Apache Software License 2.0.txt
View file

@ -203,12 +203,21 @@
========================================================================= =========================================================================
The Apache FreeMarker (incubating) source code contains the following The source code contains the following binaries,
binaries, which were created at the Apache FreeMarker (incubating) which were created at the Apache FreeMarker project, and hence are
project, and hence are covered by the same license as the other source covered by the same license as the other source files of it:
files of it:
src/main/misc/overloadedNumberRules/prices.ods src/main/misc/overloadedNumberRules/prices.ods
src/manual/en_US/docgen-originals/figures/overview.odg src/manual/en_US/docgen-originals/figures/overview.odg
src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png
========================================================================= src/manual/en_US/docgen-originals/figures/tree_with_alpha.png
src/manual/en_US/favicon.png
src/manual/en_US/figures/model2sketch.png
src/manual/en_US/figures/overview.png
src/manual/en_US/figures/tree.png
src/manual/en_US/logo.png
src/manual/zh_CN/favicon.png
src/manual/zh_CN/figures/model2sketch.png
src/manual/zh_CN/figures/overview.png
src/manual/zh_CN/figures/tree.png
src/manual/zh_CN/logo.png

2
pom.xml
View file

@ -114,7 +114,7 @@
<apacheds.version>2.0.0-M21</apacheds.version> <apacheds.version>2.0.0-M21</apacheds.version>
<apacheds.codec.version>1.0.0-M33</apacheds.codec.version> <apacheds.codec.version>1.0.0-M33</apacheds.codec.version>
<google.zxing.version>3.2.1</google.zxing.version> <google.zxing.version>3.2.1</google.zxing.version>
<freemarker.version>2.3.26-incubating</freemarker.version> <freemarker.version>2.3.29</freemarker.version>
<jetty9.version>${jetty92.version}</jetty9.version> <jetty9.version>${jetty92.version}</jetty9.version>
<liquibase.version>3.5.5</liquibase.version> <liquibase.version>3.5.5</liquibase.version>