diff --git a/build.gradle b/build.gradle index 36d450da..9314a9e7 100644 --- a/build.gradle +++ b/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)",*' diff --git a/islandora-connector-broadcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/islandora-connector-broadcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml index c2e250e5..d8b752d2 100644 --- a/islandora-connector-broadcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/islandora-connector-broadcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -13,7 +13,7 @@ - + ca.islandora.alpaca.connector.broadcast diff --git a/karaf/src/main/resources/features.xml b/karaf/src/main/resources/features.xml index 5c2fa538..0690840b 100644 --- a/karaf/src/main/resources/features.xml +++ b/karaf/src/main/resources/features.xml @@ -2,10 +2,9 @@ mvn:org.fcrepo.camel/fcrepo-camel/${fcrepoCamelVersion}/xml/features - mvn:org.fcrepo.camel/fcrepo-camel-toolbox/${fcrepoCamelToolboxVersion}/xml/features + mvn:org.fcrepo.camel/toolbox-features/${fcrepoCamelToolboxVersion}/xml/features mvn:org.apache.activemq/activemq-karaf/${activemqVersion}/xml/features mvn:org.apache.camel.karaf/apache-camel/${camelVersion}/xml/features - mvn:org.apache.cxf.karaf/apache-cxf/${cxfVersion}/xml/features
Indexes the triplestore from Drupal nodes
@@ -25,7 +24,7 @@ camel mvn:ca.islandora.alpaca/islandora-connector-broadcast/${project.version} - + fcrepo-service-activemq mvn:ca.islandora.alpaca/islandora-connector-broadcast/${project.version}/cfg/configuration