You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/03/16 15:56:21 UTC
[syncope] 35/36: Merge branch 'SYNCOPE-1545' of
github.com:apache/syncope into SYNCOPE-1545
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 1303a7a06eb0686c9702fd893fde2b5f29e03a9b
Merge: 53a576e 1a4a8a0
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Mon Mar 16 18:39:14 2020 +0330
Merge branch 'SYNCOPE-1545' of github.com:apache/syncope into SYNCOPE-1545
# Conflicts:
# .travis.yml
# core/idrepo/logic/pom.xml
# pom.xml
.travis.yml | 6 +-
core/idrepo/logic/pom.xml | 4 -
pom.xml | 194 +---------------------------------------------
wa/pom.xml | 12 +++
4 files changed, 17 insertions(+), 199 deletions(-)
diff --cc core/idrepo/logic/pom.xml
index c041b5a,cfc1aac..a014f0b
--- a/core/idrepo/logic/pom.xml
+++ b/core/idrepo/logic/pom.xml
@@@ -70,11 -70,8 +70,7 @@@ under the License
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-bridge</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
diff --cc pom.xml
index eef8758,93ab9f5..46ead91
--- a/pom.xml
+++ b/pom.xml
@@@ -440,7 -439,7 +439,8 @@@ under the License
<log4j.version>2.13.1</log4j.version>
<disruptor.version>3.4.2</disruptor.version>
--
++ <batik.version>1.10</batik.version>
++
<commons-jexl.version>3.1</commons-jexl.version>
<commons-lang.version>3.9</commons-lang.version>
<commons-text.version>1.8</commons-text.version>
@@@ -1382,37 -1381,7 +1382,26 @@@
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-i18n</artifactId>
- <version>${batik.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-constants</artifactId>
- <version>${batik.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-bridge</artifactId>
+ <version>${batik.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-i18n</artifactId>
+ <version>${batik.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-constants</artifactId>
+ <version>${batik.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-bridge</artifactId>
+ <version>${batik.version}</version>
+ </dependency>
-
<!-- Flowable -->
<dependency>
<groupId>org.flowable</groupId>