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ò <[email protected]> Authored: Wed May 30 16:35:27 2018 +0200 Committer: Francesco Chicchiriccò <[email protected]> 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" />
