Update various component versions to allow for API-X integration (#27)

* s/Salmon/Alpaca/g - Resolves Islandora/documentation#507

* Update various component versions to allow for API-X integration; Partially resolves Islandora/documentation#504

* code review check-in

* more code review

* one last thing

build.gradle

@@ -44,16 +44,14 @@ subprojects {
         docURL = 'http://github.com/Islandora-CLAW/wiki'
         license = 'MIT'
 
-        camelVersion = '2.17.1'
+        camelVersion = '2.18.1'
         slf4jVersion = '1.7.12'
-        fcrepoCamelVersion = '4.4.3'
-        fcrepoCamelToolboxVersion = '4.6.0'
-        activemqVersion = '5.13.2'
+        fcrepoCamelVersion = '4.5.0'
+        fcrepoCamelToolboxVersion = '4.7.0'
+        activemqVersion = '5.14.0'
         commonsIoVersion = '2.4'
-        cxfVersion = '3.1.4'
-        mustacheVersion = '0.9.0'
 
-        camelVersionRange = '[2.17, 3)'
+        camelVersionRange = '[2.18.0, 3)'
 
         /* OSGi */
         defaultOsgiImports = 'org.osgi.service.blueprint;version="[1,2)",*'

islandora-connector-broadcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml

@@ -13,7 +13,7 @@
         </cm:default-properties>
     </cm:property-placeholder>
 
-    <reference id="broker" interface="org.apache.camel.Component" filter="(osgi.jndi.service.name=acrepo/Broker)"/>
+    <reference id="broker" interface="org.apache.camel.Component" filter="(osgi.jndi.service.name=fcrepo/Broker)"/>
 
     <camelContext id="IslandoraConnectorBroadcast" xmlns="http://camel.apache.org/schema/blueprint">
         <package>ca.islandora.alpaca.connector.broadcast</package>

karaf/src/main/resources/features.xml

@@ -2,10 +2,9 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="${project.name}-${project.version}">
 
   <repository>mvn:org.fcrepo.camel/fcrepo-camel/${fcrepoCamelVersion}/xml/features</repository>
-  <repository>mvn:org.fcrepo.camel/fcrepo-camel-toolbox/${fcrepoCamelToolboxVersion}/xml/features</repository>
+  <repository>mvn:org.fcrepo.camel/toolbox-features/${fcrepoCamelToolboxVersion}/xml/features</repository>
   <repository>mvn:org.apache.activemq/activemq-karaf/${activemqVersion}/xml/features</repository>
   <repository>mvn:org.apache.camel.karaf/apache-camel/${camelVersion}/xml/features</repository>
-  <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxfVersion}/xml/features</repository>
 
  <feature name="islandora-indexing-triplestore" version="${project.version}" start-level="80">
     <details>Indexes the triplestore from Drupal nodes</details>
@@ -25,7 +24,7 @@
     <feature version="${camelVersion}">camel</feature>
 
     <bundle>mvn:ca.islandora.alpaca/islandora-connector-broadcast/${project.version}</bundle>
-
+    <feature version="${fcrepoCamelToolboxVersion}">fcrepo-service-activemq</feature>
     <configfile finalname="/etc/ca.islandora.alpaca.connector.broadcast.cfg">mvn:ca.islandora.alpaca/islandora-connector-broadcast/${project.version}/cfg/configuration</configfile>
 
   </feature>