This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new cc73935 Upgrading Spring, commons-httpclient and
asciidoctor-maven-plugin
cc73935 is described below
commit cc73935a8134b587aa1d9fdfabdf4f4354b56b36
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Mon Apr 1 12:42:14 2019 +0200
Upgrading Spring, commons-httpclient and asciidoctor-maven-plugin
---
installer/src/main/resources/izpack/install.xml | 2 +-
pom.xml | 6 +++---
.../reference-guide/workingwithapachesyncope/customization.adoc | 2 +-
.../systemadministration/javaeecontainer.adoc | 3 ++-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/installer/src/main/resources/izpack/install.xml
b/installer/src/main/resources/izpack/install.xml
index 5274602..48a13b8 100644
--- a/installer/src/main/resources/izpack/install.xml
+++ b/installer/src/main/resources/izpack/install.xml
@@ -136,7 +136,7 @@ under the License.
<jar src="lib/commons-lang3-@{commons-lang.version}.jar"/>
<jar src="lib/httpclient-@{httpclient.version}.jar"/>
<jar src="lib/httpmime-@{httpclient.version}.jar"/>
- <jar src="lib/httpcore-4.4.10.jar"/>
+ <jar src="lib/httpcore-4.4.11.jar"/>
<jar src="lib/jackson-databind-@{jackson.version}.jar"/>
<jar src="lib/jackson-core-@{jackson.version}.jar"/>
<jar src="lib/jackson-annotations-@{jackson.version}.jar"/>
diff --git a/pom.xml b/pom.xml
index 8c6b90e..0b870ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,7 @@ under the License.
<jackson.version>2.9.8</jackson.version>
- <spring.version>4.3.22.RELEASE</spring.version>
+ <spring.version>4.3.23.RELEASE</spring.version>
<spring-security.version>4.2.11.RELEASE</spring-security.version>
<openjpa.version>2.4.3</openjpa.version>
@@ -490,7 +490,7 @@ under the License.
<fileSaver.version>0.0.2</fileSaver.version>
<izpack.version>5.1.3</izpack.version>
- <httpclient.version>4.5.6</httpclient.version>
+ <httpclient.version>4.5.8</httpclient.version>
<maven-invoker.version>3.0.1</maven-invoker.version>
<ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
@@ -2576,7 +2576,7 @@ under the License.
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
- <version>1.5.7.1</version>
+ <version>1.5.8</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
diff --git
a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
index 2c281a6..69965cc 100644
---
a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
+++
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
@@ -828,7 +828,7 @@ An empty `attributes` field translates to skip filtering
and show all attributes
```
shows all `PLAIN` attributes.
-If all attributes are to be hidden, please use
[[customization-enduser-template]] to hide the full wizard step, instead.
+If all attributes are to be hidden, please use
<<customization-enduser-template>> to hide the full wizard step, instead.
====
[NOTE]
diff --git
a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
index 5ad557d..3c69d13 100644
---
a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
+++
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
@@ -34,7 +34,8 @@ On MS Windows, create `%CATALINA_HOME%\bin\setenv.bat` with
similar content (kee
....
set JAVA_OPTS=-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server
-Xms1536m -Xmx1536m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
--XX:MaxPermSize=256m -XX:+DisableExplicitGC....
+-XX:MaxPermSize=256m -XX:+DisableExplicitGC
+....
It is recommended to define a separate datasource for each <<domains,domain>>
(the following example is for the `Master`
domain and MySQL): please also check that the connection parameters are the
same as configured for <<dbms>>:
