Issue 686 (#43)

* Bumpging activemq, camel, and toolbox versions. No longer relying on ranges * Epic derp
Islandora · Sep 19, 2017 · 2ea125c · 2ea125c
1 parent 0906cc7
commit 2ea125c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,15 +44,13 @@ subprojects {
         docURL = 'http://github.com/Islandora-CLAW/wiki'
         license = 'MIT'
 
-        camelVersion = '2.18.1'
+        camelVersion = '2.19.2'
         slf4jVersion = '1.7.12'
         fcrepoCamelVersion = '4.5.0'
-        fcrepoCamelToolboxVersion = '4.7.0'
-        activemqVersion = '5.14.1'
+        fcrepoCamelToolboxVersion = '4.7.2'
+        activemqVersion = '5.15.0'
         commonsIoVersion = '2.4'
 
-        camelVersionRange = '[2.18.0, 3)'
-
         /* OSGi */
         defaultOsgiImports = 'org.osgi.service.blueprint;version="[1,2)",*'
         projectOsgiVersion = project.version.replaceAll("-SNAPSHOT", ".SNAPSHOT")

diff --git a/islandora-connector-broadcast/build.gradle b/islandora-connector-broadcast/build.gradle
@@ -18,7 +18,7 @@ jar {
         license project.license
 
         instruction 'Import-Package', 'org.apache.activemq.camel.component,' +
-                            "org.apache.camel;version=\"${camelVersionRange}\"," +
+                            "org.apache.camel;version=\"${camelVersion}\"," +
                             defaultOsgiImports
         instruction 'Export-Package', 'ca.islandora.alpaca.connector.broadcast'
     }

diff --git a/islandora-indexing-fcrepo/build.gradle b/islandora-indexing-fcrepo/build.gradle
@@ -23,7 +23,7 @@ jar {
       license project.license
 
       instruction 'Import-Package', 'org.apache.camel.component.http4,' +
-                            "org.apache.camel;version=\"${camelVersionRange}\"," +
+                            "org.apache.camel;version=\"${camelVersion}\"," +
                             "org.apache.activemq.camel.component;version=\"${activemqVersion}\"," +
                             defaultOsgiImports
       instruction 'Export-Package', 'ca.islandora.indexing.fcrepo'

diff --git a/islandora-indexing-triplestore/build.gradle b/islandora-indexing-triplestore/build.gradle
@@ -25,7 +25,7 @@ jar {
       license project.license
 
       instruction 'Import-Package', 'org.apache.camel.component.http4,' +
-                            "org.apache.camel;version=\"${camelVersionRange}\"," +
+                            "org.apache.camel;version=\"${camelVersion}\"," +
                             "org.fcrepo.camel.processor," +
                             defaultOsgiImports
       instruction 'Export-Package', 'ca.islandora.indexing.triplestore'

diff --git a/...estore/src/test/java/ca/islandora/alpaca/indexing/triplestore/TriplestoreIndexerTest.java b/...estore/src/test/java/ca/islandora/alpaca/indexing/triplestore/TriplestoreIndexerTest.java
@@ -112,7 +112,6 @@ public void testParseEvent() throws Exception {
             @Override
             public void configure() throws Exception {
                 replaceFromWith("direct:start");
-                mockEndpointsAndSkip("*");
             }
         });
         context.start();