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/13 10:30:36 UTC
[syncope] branch SYNCOPE-1545 updated: wip: fix ci build
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
The following commit(s) were added to refs/heads/SYNCOPE-1545 by this push:
new 51468cf wip: fix ci build
51468cf is described below
commit 51468cfdd66c139af99f19bab60f3ad4de444370
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Fri Mar 13 14:00:17 2020 +0330
wip: fix ci build
---
.travis.yml | 7 +++----
pom.xml | 22 +++++++++++++++++++---
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e2597fb..0ed30c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,9 @@ git:
env:
global:
- MAVEN_OPTS="-Xmx4096M -Xss128M -XX:+CMSClassUnloadingEnabled -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -noverify"
+ - JAVAEE_CONTAINER=Tomcat
+ - DBMS=H2
+ - jaxrsContentType=application/json
install: true
notifications:
email:
@@ -53,10 +56,6 @@ jobs:
######################################################
- stage: fit
name: "Full Integration Tests: Apache Tomcat / H2 / JSON Content-Type"
- env:
- - JAVAEE_CONTAINER=Tomcat
- - DBMS=H2
- - jaxrsContentType=application/json
script: travis_wait 55 mvn -f fit/core-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
after_failure:
- cat fit/core-reference/target/log/*
diff --git a/pom.xml b/pom.xml
index c510f95..eb74eec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -444,7 +444,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>
-
+ <batik.version>1.10</batik.version>
<tika.version>1.23</tika.version>
<joda.version>2.10.5</joda.version>
@@ -1377,17 +1377,33 @@ under the License.
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-svg-dom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-bridge</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-transcoder</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-extension</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-i18n</artifactId>
- <version>1.10</version>
+ <version>${batik.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-constants</artifactId>
- <version>1.10</version>
+ <version>${batik.version}</version>
</dependency>
<!-- Flowable -->