Skip to content

Commit

Permalink
HSEARCH-2027 Making sure dependency versions used in Karaf features f…
Browse files Browse the repository at this point in the history
…ile match the ones from ORM
  • Loading branch information
gunnarmorling authored and Sanne committed Nov 5, 2015
1 parent 3d7bfe8 commit 145d12e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
Expand Up @@ -57,9 +57,9 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5</bundle>

<bundle>mvn:org.jboss/jandex/1.2.0.Final</bundle>
<bundle>mvn:com.fasterxml/classmate/0.8.0</bundle>
<bundle>mvn:org.javassist/javassist/3.18.1-GA</bundle>
<bundle>mvn:org.jboss/jandex/${jandexVersion}</bundle>
<bundle>mvn:com.fasterxml/classmate/${classMateVersion}</bundle>
<bundle>mvn:org.javassist/javassist/${javassistVersion}</bundle>

<!-- Hibernate ORM -->
<bundle>mvn:org.hibernate/hibernate-core/${hibernateVersion}</bundle>
Expand Down
7 changes: 6 additions & 1 deletion pom.xml
Expand Up @@ -146,8 +146,14 @@
<luceneVersion>5.3.1</luceneVersion>
<infinispanVersion>8.0.1.Final</infinispanVersion>
<jgroupsVersion>3.6.6.Final</jgroupsVersion>

<!-- ORM and transitive deps; Make sure to match ORM's set of versions when updating -->
<hibernateVersion>5.0.3.Final</hibernateVersion>
<hibernateCommonsAnnotationVersion>5.0.0.Final</hibernateCommonsAnnotationVersion>
<jandexVersion>2.0.0.CR1</jandexVersion>
<classMateVersion>0.8.0</classMateVersion>
<javassistVersion>3.18.1-GA</javassistVersion>

<tikaVersion>1.4</tikaVersion>
<bytemanVersion>3.0.2</bytemanVersion>
<jbossLoggingVersion>3.3.0.Final</jbossLoggingVersion>
Expand All @@ -160,7 +166,6 @@
<jbossTransactionApiVersion>1.0.0.Final</jbossTransactionApiVersion>
<commonsLoggingVersion>1.1.1</commonsLoggingVersion>
<activeMQVersion>5.8.0</activeMQVersion>
<commonsIoVersion>2.1</commonsIoVersion>
<commonsLangVersion>2.6</commonsLangVersion>

<!-- Integration tests -->
Expand Down

0 comments on commit 145d12e

Please sign in to comment.