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/04/19 09:16:10 UTC
syncope git commit: Upgrading Elasticsearch client and Groovy
Repository: syncope
Updated Branches:
refs/heads/master 85b5c0c80 -> a482f0bae
Upgrading Elasticsearch client and Groovy
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a482f0ba
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a482f0ba
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a482f0ba
Branch: refs/heads/master
Commit: a482f0baecad903cb94a33f96feecc2358562df0
Parents: 85b5c0c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Apr 19 11:13:22 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Apr 19 11:13:22 2018 +0200
----------------------------------------------------------------------
core/provisioning-java/pom.xml | 29 +++++++++++++++++++++++++
core/spring/pom.xml | 2 +-
core/workflow-flowable/pom.xml | 7 +------
fit/build-tools/pom.xml | 30 +++++++++++++++++++++++---
pom.xml | 42 +++++++++++++++++++++++++++++++------
standalone/pom.xml | 3 +--
6 files changed, 95 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a482f0ba/core/provisioning-java/pom.xml
----------------------------------------------------------------------
diff --git a/core/provisioning-java/pom.xml b/core/provisioning-java/pom.xml
index f4510c4..307457d 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/a482f0ba/core/spring/pom.xml
----------------------------------------------------------------------
diff --git a/core/spring/pom.xml b/core/spring/pom.xml
index 22ba98b..10b7f81 100644
--- a/core/spring/pom.xml
+++ b/core/spring/pom.xml
@@ -74,7 +74,7 @@ under the License.
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a482f0ba/core/workflow-flowable/pom.xml
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/pom.xml b/core/workflow-flowable/pom.xml
index 8346c9d..987b960 100644
--- a/core/workflow-flowable/pom.xml
+++ b/core/workflow-flowable/pom.xml
@@ -63,12 +63,7 @@ under the License.
<groupId>org.flowable</groupId>
<artifactId>flowable-json-converter</artifactId>
</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>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a482f0ba/fit/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index a4172e7..f44ebb0 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -144,12 +144,36 @@ under the License.
<groupId>net.tirasa.connid</groupId>
<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/a482f0ba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 514433e..32fe251 100644
--- a/pom.xml
+++ b/pom.xml
@@ -383,7 +383,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <groovy.version>3.0.0-alpha-1</groovy.version>
+ <groovy.version>3.0.0-alpha-2</groovy.version>
<flowable.version>6.3.0</flowable.version>
@@ -392,7 +392,7 @@ under the License.
<slf4j.version>1.7.25</slf4j.version>
<opensaml.version>3.3.0</opensaml.version>
- <elasticsearch.version>6.2.3</elasticsearch.version>
+ <elasticsearch.version>6.2.4</elasticsearch.version>
<log4j.version>2.11.0</log4j.version>
<disruptor.version>3.4.2</disruptor.version>
@@ -974,10 +974,40 @@ 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>
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -2215,7 +2245,7 @@ under the License.
<link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.9/</link>
<link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.21.0/</link>
<link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.21.0/</link>
- <link>https://ci.apache.org/projects/wicket/apidocs/8.x/</link>
+ <link>https://ci.apache.org/projects/wicket/apidocs/7.x/</link>
<link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
<link>https://commons.apache.org/proper/commons-io/javadocs/api-2.6/</link>
<link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
@@ -2223,7 +2253,7 @@ under the License.
<link>http://docs.spring.io/spring-security/site/docs/4.2.x/apidocs/</link>
<link>http://www.flowable.org/docs/javadocs/</link>
<link>https://build.shibboleth.net/nexus/content/sites/site/java-opensaml/3.3.0/apidocs/</link>
- <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/6.2.3/</link>
+ <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/6.2.4/</link>
</links>
</configuration>
<reportSets>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a482f0ba/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 5c60662..ec7f130 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -174,9 +174,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" />