Skip to content

Commit

Permalink
#23934 Tika fragment has been added in order to resolve tika dependen…
Browse files Browse the repository at this point in the history
…cies issue.

* SLF4J has been upgraded to 1.7.35
* org.apache.logging.log4j has been included as part of osgi-extra.conf to avoid dependency clashes inside of Tika Microsoft parsers.
  • Loading branch information
daniel.colina committed May 16, 2023
1 parent 192af52 commit b6b4fcb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
8 changes: 6 additions & 2 deletions dotCMS/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,15 @@ dependencies {
transitive = false
}

felix group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
felix group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
felix group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.35'
felix group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.35'

//// Felix system configuration
felixsystem group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.35'
felixsystem group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.35'

felixsystem group: 'com.dotcms.tika', name: 'com.dotcms.tika', version: '2.7.0'
felixsystem group: 'com.dotcms.tika', name: 'com.dotcms.tika.fragment', version: '2.7.0'
felixsystem group: 'com.dotcms.samlbundle', name: 'com.dotcms.samlbundle', version: '22.03'

//// starter config
Expand Down
1 change: 1 addition & 0 deletions dotCMS/src/main/resources/osgi/osgi-extra.conf
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@ javax.xml.xpath;version=0.1.0,
net.spy.memcached;version=0.1.0,
net.spy.memcached.internal;version=0.1.0,
net.spy.memcached.transcoders;version=0.1.0,
org.apache.logging.log4j;
org.apache.commons.codec;version=0.1.0,
org.apache.commons.codec.binary;version=0.1.0,
org.apache.commons.codec.digest;version=0.1.0,
Expand Down
1 change: 1 addition & 0 deletions dotCMS/src/main/resources/osgi/system/osgi-extra.conf
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@ javax.xml.xpath;version=0.1.0,
net.spy.memcached;version=0.1.0,
net.spy.memcached.internal;version=0.1.0,
net.spy.memcached.transcoders;version=0.1.0,
org.apache.logging.log4j;
org.apache.commons.codec;version=0.1.0,
org.apache.commons.codec.binary;version=0.1.0,
org.apache.commons.codec.digest;version=0.1.0,
Expand Down

0 comments on commit b6b4fcb

Please sign in to comment.