You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/05/30 14:35:34 UTC
[1/3] syncope git commit: Upgrading HikariCP
Repository: syncope
Updated Branches:
refs/heads/2_0_X e02356e35 -> 8825e7bb3
refs/heads/master 105b5bb2e -> 22900099e
Upgrading HikariCP
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b36d3485
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b36d3485
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b36d3485
Branch: refs/heads/master
Commit: b36d3485a0893534b37da27a4f7bb730f9d954cd
Parents: 105b5bb
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed May 30 15:53:18 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed May 30 15:53:18 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b36d3485/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 90d72eb..d8bf690 100644
--- a/pom.xml
+++ b/pom.xml
@@ -376,7 +376,7 @@ under the License.
<spring-security.version>5.0.5.RELEASE</spring-security.version>
<openjpa.version>3.0.0-SNAPSHOT</openjpa.version>
- <hikaricp.version>3.1.0</hikaricp.version>
+ <hikaricp.version>3.2.0</hikaricp.version>
<bval.version>1.1.2</bval.version>
<jasypt.version>1.9.2</jasypt.version>
[3/3] syncope git commit: Upgrading Groovy
Posted by il...@apache.org.
Upgrading Groovy
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8825e7bb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8825e7bb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8825e7bb
Branch: refs/heads/2_0_X
Commit: 8825e7bb31990e147beb9e97e20f6d6edf0d0160
Parents: e02356e
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed May 30 16:35:27 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed May 30 16:35:27 2018 +0200
----------------------------------------------------------------------
core/provisioning-java/pom.xml | 29 +++++++++++++++++++++++++++++
core/workflow-activiti/pom.xml | 5 -----
core/workflow-flowable/pom.xml | 5 -----
fit/build-tools/pom.xml | 29 +++++++++++++++++++++++++++--
pom.xml | 34 ++++++++++++++++++++++++++++++++--
standalone/pom.xml | 3 +--
6 files changed, 89 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/8825e7bb/core/provisioning-java/pom.xml
----------------------------------------------------------------------
diff --git a/core/provisioning-java/pom.xml b/core/provisioning-java/pom.xml
index 9d898a7..7b656b0 100644
--- a/core/provisioning-java/pom.xml
+++ b/core/provisioning-java/pom.xml
@@ -69,6 +69,35 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-templates</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-bsf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-jsr223</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-datetime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-dateutil</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-sql</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.syncope.core</groupId>
<artifactId>syncope-core-workflow-api</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/syncope/blob/8825e7bb/core/workflow-activiti/pom.xml
----------------------------------------------------------------------
diff --git a/core/workflow-activiti/pom.xml b/core/workflow-activiti/pom.xml
index 5a74d73..987a44a 100644
--- a/core/workflow-activiti/pom.xml
+++ b/core/workflow-activiti/pom.xml
@@ -65,11 +65,6 @@ under the License.
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.syncope.core</groupId>
<artifactId>syncope-core-workflow-java</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/syncope/blob/8825e7bb/core/workflow-flowable/pom.xml
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/pom.xml b/core/workflow-flowable/pom.xml
index 86fc1de..01546a4 100644
--- a/core/workflow-flowable/pom.xml
+++ b/core/workflow-flowable/pom.xml
@@ -65,11 +65,6 @@ under the License.
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.syncope.core</groupId>
<artifactId>syncope-core-workflow-java</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/syncope/blob/8825e7bb/fit/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index 7eaa7d4..8c7d3c9 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -141,11 +141,36 @@ under the License.
<artifactId>slf4j-logging</artifactId>
</dependency>
+
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-templates</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-bsf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-jsr223</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-datetime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-dateutil</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-sql</artifactId>
+ </dependency>
+
<dependency>
<groupId>net.tirasa.connid.bundles.db</groupId>
<artifactId>net.tirasa.connid.bundles.db.table</artifactId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/8825e7bb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5131e5a..974ca83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -385,7 +385,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <groovy.version>2.4.15</groovy.version>
+ <groovy.version>2.5.0</groovy.version>
<activiti.version>5.22.0</activiti.version>
<flowable.version>5.23.0</flowable.version>
@@ -1052,7 +1052,37 @@ under the License.
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-templates</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-bsf</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-jsr223</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-datetime</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-dateutil</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-sql</artifactId>
<version>${groovy.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/syncope/blob/8825e7bb/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 81b0920..aa33446 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -173,9 +173,8 @@ under the License.
<zip destfile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-fit-build-tools.war" basedir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-fit-build-tools" />
<delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-fit-build-tools" />
- <!-- Tomcat shared libraries: H2, groovy, StAX2 API, Woodstox -->
+ <!-- Tomcat shared libraries: H2, StAX2 API, Woodstox -->
<copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
- <copy file="${settings.localRepository}/org/codehaus/groovy/groovy-all/${groovy.version}/groovy-all-${groovy.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/lib">
<fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="stax2-api-*.jar" />
<fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="woodstox-core-asl-*.jar" />
[2/3] syncope git commit: Better Java 8 map iteration
Posted by il...@apache.org.
Better Java 8 map iteration
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/22900099
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/22900099
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/22900099
Branch: refs/heads/master
Commit: 22900099e40b5b478f7085e5a838435f461fd6ad
Parents: b36d348
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed May 30 15:53:36 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed May 30 15:53:36 2018 +0200
----------------------------------------------------------------------
.../spring/DomainProcessEngineFactoryBean.java | 51 ++++++++++----------
1 file changed, 25 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/22900099/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/spring/DomainProcessEngineFactoryBean.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/spring/DomainProcessEngineFactoryBean.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/spring/DomainProcessEngineFactoryBean.java
index dba98e7..ed6cd25 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/spring/DomainProcessEngineFactoryBean.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/spring/DomainProcessEngineFactoryBean.java
@@ -57,34 +57,33 @@ public class DomainProcessEngineFactoryBean
if (engine == null) {
Map<String, ProcessEngine> engines = new HashMap<>();
- ctx.getBeansOfType(DataSource.class).entrySet().stream().
- filter(entry -> (!entry.getKey().startsWith("local"))).
- forEachOrdered(entry -> {
- String domain = StringUtils.substringBefore(entry.getKey(), DataSource.class.getSimpleName());
- DataSource dataSource = entry.getValue();
- PlatformTransactionManager transactionManager = ctx.getBean(
- domain + "TransactionManager", PlatformTransactionManager.class);
- Object entityManagerFactory = ctx.getBean(domain + "EntityManagerFactory");
+ ctx.getBeansOfType(DataSource.class).forEach((key, dataSource) -> {
+ if (!key.startsWith("local")) {
+ String domain = StringUtils.substringBefore(key, DataSource.class.getSimpleName());
+ PlatformTransactionManager transactionManager = ctx.getBean(
+ domain + "TransactionManager", PlatformTransactionManager.class);
+ Object entityManagerFactory = ctx.getBean(domain + "EntityManagerFactory");
- SpringProcessEngineConfiguration conf = ctx.getBean(SpringProcessEngineConfiguration.class);
- conf.setDataSource(dataSource);
- conf.setTransactionManager(transactionManager);
- conf.setTransactionsExternallyManaged(true);
- conf.setJpaEntityManagerFactory(entityManagerFactory);
- if (conf.getBeans() == null) {
- conf.setBeans(new SpringBeanFactoryProxyMap(ctx));
- }
- if (conf.getExpressionManager() == null) {
- conf.setExpressionManager(new SpringExpressionManager(ctx, conf.getBeans()));
- }
- if (EngineServiceUtil.getIdmEngineConfiguration(conf) == null) {
- conf.addEngineConfiguration(
- EngineConfigurationConstants.KEY_IDM_ENGINE_CONFIG,
- ctx.getBean(SpringIdmEngineConfiguration.class));
- }
+ SpringProcessEngineConfiguration conf = ctx.getBean(SpringProcessEngineConfiguration.class);
+ conf.setDataSource(dataSource);
+ conf.setTransactionManager(transactionManager);
+ conf.setTransactionsExternallyManaged(true);
+ conf.setJpaEntityManagerFactory(entityManagerFactory);
+ if (conf.getBeans() == null) {
+ conf.setBeans(new SpringBeanFactoryProxyMap(ctx));
+ }
+ if (conf.getExpressionManager() == null) {
+ conf.setExpressionManager(new SpringExpressionManager(ctx, conf.getBeans()));
+ }
+ if (EngineServiceUtil.getIdmEngineConfiguration(conf) == null) {
+ conf.addEngineConfiguration(
+ EngineConfigurationConstants.KEY_IDM_ENGINE_CONFIG,
+ ctx.getBean(SpringIdmEngineConfiguration.class));
+ }
- engines.put(domain, conf.buildProcessEngine());
- });
+ engines.put(domain, conf.buildProcessEngine());
+ }
+ });
engine = new DomainProcessEngine(engines);
}