Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Update snakeyaml, slf4j and icu4j
Browse files Browse the repository at this point in the history
And exclude slf4j-simple and woodstox from okapi dependencies
  • Loading branch information
djansen-redhat committed Apr 21, 2016
1 parent a5e6179 commit 471ba4e
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 3 deletions.
19 changes: 16 additions & 3 deletions pom.xml
Expand Up @@ -45,7 +45,7 @@
<groovy.version>2.4.5</groovy.version>
<guava.version>19.0</guava.version>
<gwt.version>2.7.0</gwt.version>
<icu4j.version>55.1</icu4j.version>
<icu4j.version>56.1</icu4j.version>
<lombok.source.dir>${project.build.sourceDirectory}/org/zanata</lombok.source.dir>
<lucene.version>3.6.2</lucene.version>
<org.mock-server.version>3.9.17</org.mock-server.version>
Expand Down Expand Up @@ -82,6 +82,7 @@
-->

<solr.version>${lucene.version}</solr.version>
<seam.version>2.3.1.Final</seam.version>
<slf4j.version>1.7.18</slf4j.version>
<gwteventservice.version>1.2.1</gwteventservice.version>
<okapi.version>0.29</okapi.version>
Expand Down Expand Up @@ -280,7 +281,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.13</version>
<version>1.16</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -330,8 +331,12 @@
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>-->

<dependency>
<groupId>org.jboss.spec</groupId>
Expand Down Expand Up @@ -912,6 +917,10 @@
<groupId>net.sf.okapi.logbind</groupId>
<artifactId>build-log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand All @@ -936,6 +945,10 @@
<groupId>net.sf.okapi.logbind</groupId>
<artifactId>build-log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
46 changes: 46 additions & 0 deletions zanata-war/pom.xml
Expand Up @@ -1716,30 +1716,76 @@
<dependency>
<groupId>net.sf.okapi.filters</groupId>
<artifactId>okapi-filter-dtd</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.okapi.filters</groupId>
<artifactId>okapi-filter-html</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.okapi.filters</groupId>
<artifactId>okapi-filter-idml</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.okapi.filters</groupId>
<artifactId>okapi-filter-openoffice</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.okapi.filters</groupId>
<artifactId>okapi-filter-plaintext</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.okapi.filters</groupId>
<artifactId>okapi-filter-regex</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.okapi.filters</groupId>
<artifactId>okapi-filter-ts</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-lgpl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.okapi</groupId>
Expand Down

0 comments on commit 471ba4e

Please sign in to comment.