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:20 UTC
[syncope] 34/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 53a576efd2e662add75f357cf59b1958099bef55
Merge: c7cdd08 13624ac
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Mon Mar 16 12:51:53 2020 +0330
Merge branch 'SYNCOPE-1545' of github.com:apache/syncope into SYNCOPE-1545
# Conflicts:
# core/idrepo/logic/pom.xml
# pom.xml
# wa/pom.xml
.../client/ui/commons/wizards/any/AbstractGroups.java | 10 +++++++++-
.../syncope/client/console/wizards/any/Groups.java | 16 ++++++----------
.../syncope/client/enduser/wizards/any/Groups.java | 15 ++++++++++-----
core/idrepo/logic/pom.xml | 8 --------
.../java/org/apache/syncope/fit/core/ReportITCase.java | 7 ++-----
pom.xml | 18 ++++++++++++++++--
wa/pom.xml | 2 +-
7 files changed, 44 insertions(+), 32 deletions(-)
diff --cc core/idrepo/logic/pom.xml
index d7da6ac,cfc1aac..c041b5a
--- a/core/idrepo/logic/pom.xml
+++ b/core/idrepo/logic/pom.xml
@@@ -70,18 -70,7 +70,10 @@@ under the License
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-i18n</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-constants</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-bridge</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
diff --cc pom.xml
index 772a19a,81ff696..eef8758
--- a/pom.xml
+++ b/pom.xml
@@@ -445,8 -444,7 +445,7 @@@ under the License
<commons-lang.version>3.9</commons-lang.version>
<commons-text.version>1.8</commons-text.version>
<commons-logging.version>1.1.3</commons-logging.version>
-
- <tika.version>1.23</tika.version>
-
++
<joda.version>2.10.5</joda.version>
<cas.version>6.2.0-SNAPSHOT</cas.version>
@@@ -1383,21 -1381,6 +1382,36 @@@
</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>