You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by co...@apache.org on 2017/06/13 14:17:02 UTC
[1/2] syncope git commit: Fixing a few references to syncopeDataSource
Repository: syncope
Updated Branches:
refs/heads/2_0_X 35019bc57 -> f0ea28843
Fixing a few references to syncopeDataSource
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/874b6217
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/874b6217
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/874b6217
Branch: refs/heads/2_0_X
Commit: 874b62174a33e32a4c9c987f3653fb053afc63e0
Parents: 35019bc
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jun 13 14:54:32 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jun 13 15:16:51 2017 +0100
----------------------------------------------------------------------
deb/core/src/deb/tomcat8/syncope.xml | 4 ++--
src/main/asciidoc/getting-started/obtain.adoc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/874b6217/deb/core/src/deb/tomcat8/syncope.xml
----------------------------------------------------------------------
diff --git a/deb/core/src/deb/tomcat8/syncope.xml b/deb/core/src/deb/tomcat8/syncope.xml
index 7581654..b06a129 100644
--- a/deb/core/src/deb/tomcat8/syncope.xml
+++ b/deb/core/src/deb/tomcat8/syncope.xml
@@ -25,7 +25,7 @@ under the License.
<!-- Sample PostgreSQL Data source
- <Resource name="jdbc/syncopeDataSource" auth="Container"
+ <Resource name="jdbc/syncopeMasterDataSource" auth="Container"
type="javax.sql.DataSource" driverClassName="org.postgresql.Driver"
url="jdbc:postgresql://127.0.0.1:5432/syncope"
username="syncope" password="password" maxActive="20" maxIdle="10"
@@ -34,7 +34,7 @@ under the License.
<!-- https://cwiki.apache.org/confluence/display/SYNCOPE/Run+Syncope+in+real+environments
- <Resource name="jdbc/syncopeDataSource" auth="Container" type="javax.sql.DataSource"
+ <Resource name="jdbc/syncopeMasterDataSource" auth="Container" type="javax.sql.DataSource"
factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" testWhileIdle="true"
testOnBorrow="true" testOnReturn="true" validationQuery="SELECT 1" validationInterval="30000"
maxActive="100" minIdle="2" maxWait="10000" initialSize="2" removeAbandonedTimeout="20000"
http://git-wip-us.apache.org/repos/asf/syncope/blob/874b6217/src/main/asciidoc/getting-started/obtain.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/obtain.adoc b/src/main/asciidoc/getting-started/obtain.adoc
index e62cf19..9377ffd 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -197,7 +197,7 @@ operating system. +
. http://maven.apache.org/[Apache Maven^] (version 3.0.3 or higher) installed
. one of the supported <<internal-storage,DBMSes>> up and running
. one of the supported <<java-ee-container, Java EE containers>> up and running
- . A datasource with the name `syncopeDataSource` configured in the selected Java EE container, for a database instance in the
+ . A datasource with the name `syncopeMasterDataSource` configured in the selected Java EE container, for a database instance in the
DBMS of choice
[WARNING]
[2/2] syncope git commit: Updating httpclient to 4.5.3 (see
https://issues.apache.org/jira/browse/HTTPCLIENT-1743)
Posted by co...@apache.org.
Updating httpclient to 4.5.3 (see https://issues.apache.org/jira/browse/HTTPCLIENT-1743)
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f0ea2884
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f0ea2884
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f0ea2884
Branch: refs/heads/2_0_X
Commit: f0ea28843015f67a1981efc78fa23f3825484ad7
Parents: 874b621
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jun 13 14:54:52 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jun 13 15:16:57 2017 +0100
----------------------------------------------------------------------
installer/src/main/resources/izpack/install.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f0ea2884/installer/src/main/resources/izpack/install.xml
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/install.xml b/installer/src/main/resources/izpack/install.xml
index bfed44b..4a112c1 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.3.3.jar"/>
+ <jar src="lib/httpcore-4.4.6.jar"/>
<jar src="lib/jackson-databind-@{jackson.version}.1.jar"/>
<jar src="lib/jackson-core-@{jackson.version}.jar"/>
<jar src="lib/jackson-annotations-@{jackson.version}.jar"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/f0ea2884/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 43a0d37..5212372 100644
--- a/pom.xml
+++ b/pom.xml
@@ -443,7 +443,7 @@ under the License.
<fileSaver.version>0.0.2</fileSaver.version>
<izpack.version>5.1.0</izpack.version>
- <httpclient.version>4.3.6</httpclient.version>
+ <httpclient.version>4.5.3</httpclient.version>
<maven-invoker.version>3.0.0</maven-invoker.version>
<ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
<maven-jar-plugin-version>3.0.0</maven-jar-plugin-version>