Repository: syncope Updated Branches: refs/heads/2_0_X 9e7c6bd39 -> 7c8e09746 refs/heads/master 7e0d67750 -> d40aafe76
Upgrading HikariCP, Camel, Bootstrap and maven-dependency-plugin Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7c8e0974 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7c8e0974 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7c8e0974 Branch: refs/heads/2_0_X Commit: 7c8e09746699489b6e321921d56c769eecc6646c Parents: 9e7c6bd Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Mon May 29 09:02:15 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Mon May 29 09:02:15 2017 +0200 ---------------------------------------------------------------------- .../src/main/resources/domains/Master.properties | 4 +--- .../src/test/resources/domains/Master.properties | 4 +--- .../src/test/resources/domains/Two.properties | 4 ++-- .../src/test/resources/domains/TwoDomain.xml | 4 ++-- .../main/resources/mariadb/domains/Master.properties | 6 ++---- .../src/main/resources/mysql/domains/Master.properties | 4 +--- .../src/main/resources/oracle/domains/Master.properties | 4 +--- .../main/resources/postgres/domains/Master.properties | 4 +--- .../main/resources/sqlserver/domains/Master.properties | 4 +--- pom.xml | 12 ++++++------ 10 files changed, 18 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/7c8e0974/core/persistence-jpa/src/main/resources/domains/Master.properties ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/resources/domains/Master.properties b/core/persistence-jpa/src/main/resources/domains/Master.properties index 02f01f5..7b4280b 100644 --- a/core/persistence-jpa/src/main/resources/domains/Master.properties +++ b/core/persistence-jpa/src/main/resources/domains/Master.properties @@ -22,9 +22,7 @@ Master.password=syncope Master.databasePlatform=org.apache.openjpa.jdbc.sql.PostgresDictionary Master.orm=META-INF/spring-orm.xml -Master.pool.initialSize=5 Master.pool.maxActive=10 -Master.pool.maxIdle=5 -Master.pool.minIdle=5 +Master.pool.minIdle=2 Master.audit.sql=audit.sql http://git-wip-us.apache.org/repos/asf/syncope/blob/7c8e0974/core/persistence-jpa/src/test/resources/domains/Master.properties ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/test/resources/domains/Master.properties b/core/persistence-jpa/src/test/resources/domains/Master.properties index 7bf3c40..f3ce3be 100644 --- a/core/persistence-jpa/src/test/resources/domains/Master.properties +++ b/core/persistence-jpa/src/test/resources/domains/Master.properties @@ -22,9 +22,7 @@ Master.password= Master.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary Master.orm=META-INF/spring-orm.xml -Master.pool.initialSize=5 Master.pool.maxActive=10 -Master.pool.maxIdle=5 -Master.pool.minIdle=5 +Master.pool.minIdle=2 Master.audit.sql=audit.sql http://git-wip-us.apache.org/repos/asf/syncope/blob/7c8e0974/core/persistence-jpa/src/test/resources/domains/Two.properties ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/test/resources/domains/Two.properties b/core/persistence-jpa/src/test/resources/domains/Two.properties index 479b223..ea19bd7 100644 --- a/core/persistence-jpa/src/test/resources/domains/Two.properties +++ b/core/persistence-jpa/src/test/resources/domains/Two.properties @@ -22,7 +22,7 @@ Two.password= Two.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary Two.orm=META-INF/spring-orm.xml -# note: other connection pool settings can also be configured here, see DataSource definition -Two.pool.validationQuery=SELECT 1 +Two.pool.maxActive=10 +Two.pool.minIdle=2 Two.audit.sql=audit.sql http://git-wip-us.apache.org/repos/asf/syncope/blob/7c8e0974/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml b/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml index 2b987ad..d0b741f 100644 --- a/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml +++ b/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml @@ -58,8 +58,8 @@ under the License. <util:constant static-field="${Two.pool.transactionIsolation:java.sql.Connection.TRANSACTION_READ_COMMITTED}"/> </property> <!-- connection pool configuration - default values taken from HikariConfig default values --> - <property name="maximumPoolSize" value="${Master.pool.maxActive:8}"/> - <property name="minimumIdle" value="${Master.pool.minIdle:0}"/> + <property name="maximumPoolSize" value="${Two.pool.maxActive:8}"/> + <property name="minimumIdle" value="${Two.pool.minIdle:0}"/> </bean> <bean class="org.springframework.jdbc.datasource.init.DataSourceInitializer"> http://git-wip-us.apache.org/repos/asf/syncope/blob/7c8e0974/fit/core-reference/src/main/resources/mariadb/domains/Master.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/mariadb/domains/Master.properties b/fit/core-reference/src/main/resources/mariadb/domains/Master.properties index 1853e47..5d3e2d3 100644 --- a/fit/core-reference/src/main/resources/mariadb/domains/Master.properties +++ b/fit/core-reference/src/main/resources/mariadb/domains/Master.properties @@ -19,12 +19,10 @@ Master.url=jdbc:mariadb://localhost:3306/syncope?characterEncoding=UTF-8 Master.schema= Master.username=syncope Master.password=syncope -Master.databasePlatform=org.apache.openjpa.jdbc.sql.MariaDBDictionary +Master.databasePlatform=org.apache.openjpa.jdbc.sql.MariaDBDictionary(blobTypeName=LONGBLOB) Master.orm=META-INF/spring-orm.xml -Master.pool.initialSize=5 Master.pool.maxActive=10 -Master.pool.maxIdle=5 -Master.pool.minIdle=5 +Master.pool.minIdle=2 Master.audit.sql=audit.sql http://git-wip-us.apache.org/repos/asf/syncope/blob/7c8e0974/fit/core-reference/src/main/resources/mysql/domains/Master.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/mysql/domains/Master.properties b/fit/core-reference/src/main/resources/mysql/domains/Master.properties index 5939e34..ce7251f 100644 --- a/fit/core-reference/src/main/resources/mysql/domains/Master.properties +++ b/fit/core-reference/src/main/resources/mysql/domains/Master.properties @@ -22,9 +22,7 @@ Master.password=syncope Master.databasePlatform=org.apache.openjpa.jdbc.sql.MySQLDictionary(blobTypeName=LONGBLOB) Master.orm=META-INF/spring-orm.xml -Master.pool.initialSize=5 Master.pool.maxActive=10 -Master.pool.maxIdle=5 -Master.pool.minIdle=5 +Master.pool.minIdle=2 Master.audit.sql=audit.sql http://git-wip-us.apache.org/repos/asf/syncope/blob/7c8e0974/fit/core-reference/src/main/resources/oracle/domains/Master.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/oracle/domains/Master.properties b/fit/core-reference/src/main/resources/oracle/domains/Master.properties index 306de47..13c3c9f 100644 --- a/fit/core-reference/src/main/resources/oracle/domains/Master.properties +++ b/fit/core-reference/src/main/resources/oracle/domains/Master.properties @@ -22,9 +22,7 @@ Master.password=syncope Master.databasePlatform=org.apache.openjpa.jdbc.sql.OracleDictionary Master.orm=META-INF/spring-orm-oracle.xml -Master.pool.initialSize=5 Master.pool.maxActive=10 -Master.pool.maxIdle=5 -Master.pool.minIdle=5 +Master.pool.minIdle=2 Master.audit.sql=audit_oracle.sql http://git-wip-us.apache.org/repos/asf/syncope/blob/7c8e0974/fit/core-reference/src/main/resources/postgres/domains/Master.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/postgres/domains/Master.properties b/fit/core-reference/src/main/resources/postgres/domains/Master.properties index 02f01f5..7b4280b 100644 --- a/fit/core-reference/src/main/resources/postgres/domains/Master.properties +++ b/fit/core-reference/src/main/resources/postgres/domains/Master.properties @@ -22,9 +22,7 @@ Master.password=syncope Master.databasePlatform=org.apache.openjpa.jdbc.sql.PostgresDictionary Master.orm=META-INF/spring-orm.xml -Master.pool.initialSize=5 Master.pool.maxActive=10 -Master.pool.maxIdle=5 -Master.pool.minIdle=5 +Master.pool.minIdle=2 Master.audit.sql=audit.sql http://git-wip-us.apache.org/repos/asf/syncope/blob/7c8e0974/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties b/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties index 7d6e3ee..5e005fa 100644 --- a/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties +++ b/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties @@ -22,9 +22,7 @@ Master.password=syncope Master.databasePlatform=org.apache.openjpa.jdbc.sql.SQLServerDictionary Master.orm=META-INF/spring-orm-sqlserver.xml -Master.pool.initialSize=5 Master.pool.maxActive=10 -Master.pool.maxIdle=5 -Master.pool.minIdle=5 +Master.pool.minIdle=2 Master.audit.sql=audit_sqlserver.sql http://git-wip-us.apache.org/repos/asf/syncope/blob/7c8e0974/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b772e59..7e0e33c 100644 --- a/pom.xml +++ b/pom.xml @@ -361,7 +361,7 @@ under the License. <spring-security.version>4.2.2.RELEASE</spring-security.version> <openjpa.version>2.4.2</openjpa.version> - <hikaricp.version>2.4.11</hikaricp.version> + <hikaricp.version>2.4.12</hikaricp.version> <bval.version>1.1.2</bval.version> <jasypt.version>1.9.2</jasypt.version> @@ -375,7 +375,7 @@ under the License. <activiti.version>5.22.0</activiti.version> <flowable.version>5.23.0</flowable.version> - <camel.version>2.17.6</camel.version> + <camel.version>2.17.7</camel.version> <slf4j.version>1.7.25</slf4j.version> <opensaml.version>3.3.0</opensaml.version> @@ -415,8 +415,8 @@ under the License. <jquery-cookie.version>1.4.1-1</jquery-cookie.version> <bootstrap.version>3.3.7</bootstrap.version> - <bootstrap-select.version>1.12.0</bootstrap-select.version> - <bootstrap-fileinput.version>4.3.9</bootstrap-fileinput.version> + <bootstrap-select.version>1.12.2</bootstrap-select.version> + <bootstrap-fileinput.version>4.4.0</bootstrap-fileinput.version> <bootbox.version>4.4.0</bootbox.version> <font-awesome.version>4.7.0</font-awesome.version> <ionicons.version>2.0.1</ionicons.version> @@ -426,7 +426,7 @@ under the License. <wicket.version>7.7.0</wicket.version> <wicket-jqueryui.version>7.7.0</wicket-jqueryui.version> - <wicket-bootstrap.version>0.10.13</wicket-bootstrap.version> + <wicket-bootstrap.version>0.10.14</wicket-bootstrap.version> <wicket-chartjs.version>7.0.1</wicket-chartjs.version> <angular.version>1.6.4</angular.version> @@ -1728,7 +1728,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.0.0</version> + <version>3.0.1</version> <configuration> <outputDirectory>${bundles.directory}</outputDirectory> <useBaseVersion>true</useBaseVersion>
