Commit e48d3c44 authored by acoburn's avatar acoburn
Browse files

Merge branch 'revert_camel' into 'master'

Revert "update fcrepo-camel"

This reverts commit 746a647b.

For some reason, the KarafIT tests no longer pass with the updated camel. I will look into the details of this later, but for now I'd like to downgrade fcrepo-camel.

See merge request !64
parents e57815d0 ed7989e4
......@@ -41,7 +41,7 @@
<commons-lang.version>3.4</commons-lang.version>
<commons-io.version>2.5</commons-io.version>
<derby.version>10.12.1.1</derby.version>
<fcrepo-camel.version>4.4.3</fcrepo-camel.version>
<fcrepo-camel.version>4.4.2</fcrepo-camel.version>
<hk2.version>2.4.0</hk2.version>
<junit.version>4.12</junit.version>
<jsonld.version>0.8.3</jsonld.version>
......@@ -188,6 +188,20 @@
<groupId>org.fcrepo.camel</groupId>
<artifactId>fcrepo-camel</artifactId>
<version>${fcrepo-camel.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment