Commit c6e6b9f5 authored by Aaron Coburn's avatar Aaron Coburn
Browse files

Update gradle, plugins and dependencies

parent ffd50b4a
......@@ -12,7 +12,6 @@ dependencies {
compile group: 'org.codehaus.woodstox', name: 'woodstox-core-asl', version: woodstoxVersion
testCompile project(':acrepo-services-mint')
testCompile group: 'xerces', name: 'xercesImpl', version: xercesVersion
testCompile group: 'junit', name: 'junit', version: junitVersion
testCompile group: 'org.apache.derby', name: 'derby', version: derbyVersion
testCompile group: 'org.apache.camel', name: 'camel-test-blueprint', version: camelVersion
......
......@@ -6,6 +6,8 @@ dependencies {
compile group: 'org.apache.camel', name: 'camel-http4', version: camelVersion
compile group: 'org.apache.camel', name: 'camel-blueprint', version: camelVersion
compile group: 'org.apache.jena', name: 'jena-osgi', version: jenaVersion
testCompile group: 'org.apache.commons', name: 'commons-compress', version: commonsCompressVersion
}
jar {
......
......@@ -6,7 +6,10 @@ dependencies {
compile group: 'org.apache.camel', name: 'camel-blueprint', version: camelVersion
compile group: 'org.apache.camel', name: 'camel-jetty9', version: camelVersion
compile group: 'org.apache.jena', name: 'jena-osgi', version: jenaVersion
compile project(':acrepo-services-entailment')
testCompile group: 'org.apache.commons', name: 'commons-compress', version: commonsCompressVersion
}
jar {
......
......@@ -7,8 +7,10 @@ dependencies {
compile group: 'org.apache.camel', name: 'camel-jetty9', version: camelVersion
compile group: 'org.apache.jena', name: 'jena-osgi', version: jenaVersion
compile project(':acrepo-services-ore')
testCompile group: 'junit', name: 'junit', version: junitVersion
testCompile group: 'org.apache.camel', name: 'camel-test-blueprint', version: camelVersion
testCompile group: 'org.apache.commons', name: 'commons-compress', version: commonsCompressVersion
testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
}
......
......@@ -7,9 +7,12 @@ dependencies {
compile group: 'org.apache.camel', name: 'camel-http4', version: camelVersion
compile group: 'org.apache.camel', name: 'camel-jetty9', version: camelVersion
compile group: 'org.apache.jena', name: 'jena-osgi', version: jenaVersion
compile project(':acrepo-services-pcdm')
testCompile group: 'junit', name: 'junit', version: junitVersion
testCompile group: 'org.apache.camel', name: 'camel-test-blueprint', version: camelVersion
testCompile group: 'org.apache.commons', name: 'commons-compress', version: commonsCompressVersion
testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
}
......
buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
classpath 'org.akhikhl.gretty:gretty:2.0.0'
}
}
apply plugin: 'org.akhikhl.gretty'
apply plugin: 'org.gretty'
description = """OSGi Integration tests for repository services"""
......@@ -90,7 +80,7 @@ dependencies {
task generateDependsFile {
// This is useful for the org.ops4j.pax.exam.CoreOptions.maven() stuff
File outputFileDir = project.file( 'build/classes/test/META-INF/maven/' )
File outputFileDir = project.file( "${project.buildDir}/classes/java/test/META-INF/maven/" )
File outputFile = new File( outputFileDir, 'dependencies.properties' )
outputs.file outputFile
......@@ -166,7 +156,7 @@ farm {
systemProperty 'fcrepo.dynamic.stomp.port', fcrepoStompPort
systemProperty 'FUSEKI_BASE', 'build/fuseki_home'
webapp "org.fcrepo:fcrepo-webapp:${fcrepoVersion}@war", contextPath: '/fcrepo'
webapp "org.apache.jena:jena-fuseki-war:${fusekiVersion}@war", contextPath: '/fuseki'
webapp "org.apache.jena:jena-fuseki-war:${jenaVersion}@war", contextPath: '/fuseki'
}
processTestResources.dependsOn copyTestResources
......
......@@ -80,6 +80,8 @@ public class AcrepoBroadcastIT extends AbstractOSGiIT {
keepRuntimeFolder(),
configureConsole().ignoreLocalConsole(),
features(maven().groupId("org.apache.karaf.features").artifactId("spring")
.version("4.1.0").classifier("features").type("xml"), "spring"),
features(maven().groupId("org.apache.karaf.features").artifactId("standard")
.versionAsInProject().classifier("features").type("xml"), "scr"),
features(maven().groupId("org.apache.activemq").artifactId("activemq-karaf")
......
......@@ -147,7 +147,7 @@ public class AcrepoEntailmentIT extends AbstractOSGiIT {
final String baseUrl = "http://localhost:" + System.getProperty("fcrepo.port") + "/fcrepo/rest";
final String baseSvcUrl = "http://localhost:" + System.getProperty("karaf.entailment.port") + "/entailment";
final String obj = post(baseUrl, getClass().getResourceAsStream("/resource.ttl"), "text/turtle");
final String obj = post(baseUrl, TestUtils.getResource(), "text/turtle");
final String response = get(baseSvcUrl + "?context=" + obj);
final InputStream input = new ByteArrayInputStream(response.getBytes(UTF_8));
......@@ -170,7 +170,7 @@ public class AcrepoEntailmentIT extends AbstractOSGiIT {
final String baseUrl = "http://localhost:" + System.getProperty("fcrepo.port") + "/fcrepo/rest";
final String baseSvcUrl = "http://localhost:" + System.getProperty("karaf.entailment.port") + "/entailment";
final String obj = post(baseUrl, getClass().getResourceAsStream("/resource.ttl"), "text/turtle");
final String obj = post(baseUrl, TestUtils.getResource(), "text/turtle");
final String response = get(baseSvcUrl + "?context=" + obj, "application/ld+json");
......
......@@ -116,7 +116,7 @@ public class AcrepoExtsSerializeXmlIT extends AbstractOSGiIT {
assertTrue(options(baseSvcUrl).contains("apix:bindsTo ldp:Resource"));
final String id = post(baseUrl, getClass().getResourceAsStream("/resource.ttl"), "text/turtle");
final String id = post(baseUrl, TestUtils.getResource(), "text/turtle");
final InputStream input = new ByteArrayInputStream(get(baseSvcUrl + "?format=dc&context=" + id)
.getBytes("UTF-8"));
......
/*
* Copyright 2016 Amherst College
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package edu.amherst.acdc.itests;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
import static org.slf4j.LoggerFactory.getLogger;
import java.io.File;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.ConfigurationManager;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.slf4j.Logger;
/**
* @author Aaron Coburn
* @since May 2, 2016
*/
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class AcrepoJenaLibsIT extends AbstractOSGiIT {
private static Logger LOGGER = getLogger(AcrepoJenaLibsIT.class);
@Configuration
public Option[] config() {
final ConfigurationManager cm = new ConfigurationManager();
final String rmiRegistryPort = cm.getProperty("karaf.rmiRegistry.port");
final String rmiServerPort = cm.getProperty("karaf.rmiServer.port");
final String sshPort = cm.getProperty("karaf.ssh.port");
final String jenaVersion = cm.getProperty("karaf.jena.version");
return new Option[] {
karafDistributionConfiguration()
.frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf")
.version(cm.getProperty("karaf.version")).type("zip"))
.unpackDirectory(new File("build", "exam"))
.useDeployFolder(false),
logLevel(LogLevel.INFO),
keepRuntimeFolder(),
configureConsole().ignoreLocalConsole(),
features(maven().groupId("org.apache.karaf.features").artifactId("standard")
.versionAsInProject().classifier("features").type("xml"), "scr"),
features(maven().groupId("org.apache.jena").artifactId("jena-osgi-features")
.version(jenaVersion).classifier("features").type("xml")),
features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf")
.type("xml").classifier("features").versionAsInProject(), "acrepo-libs-jena"),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", rmiRegistryPort),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", rmiServerPort),
editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", "sshPort", sshPort)
};
}
@Test
public void testInstallation() throws Exception {
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jena")));
}
}
......@@ -129,9 +129,9 @@ public class AcrepoOreIT extends AbstractOSGiIT {
final String baseUrl = "http://localhost:" + System.getProperty("fcrepo.port") + "/fcrepo/rest";
final String baseSvcUrl = "http://localhost:" + System.getProperty("karaf.ore.port") + "/ore";
final String oreObj = post(baseUrl, getClass().getResourceAsStream("/aggregation.ttl"), "text/turtle");
final String oreObj = post(baseUrl, TestUtils.getResource(), "text/turtle");
final String members = oreObj + "/members";
assertTrue(put(members, getClass().getResourceAsStream("/directcontainer.ttl"), "text/turtle"));
assertTrue(put(members, TestUtils.getDirectContainer("ore:aggregates"), "text/turtle"));
final String page1 = post(members);
final String page2 = post(members);
......@@ -163,9 +163,9 @@ public class AcrepoOreIT extends AbstractOSGiIT {
final String baseUrl = "http://localhost:" + System.getProperty("fcrepo.port") + "/fcrepo/rest";
final String baseSvcUrl = "http://localhost:" + System.getProperty("karaf.ore.port") + "/ore";
final String oreObj = post(baseUrl, getClass().getResourceAsStream("/aggregation.ttl"), "text/turtle");
final String oreObj = post(baseUrl, TestUtils.getResource(), "text/turtle");
final String members = oreObj + "/members";
assertTrue(put(members, getClass().getResourceAsStream("/directcontainer.ttl"), "text/turtle"));
assertTrue(put(members, TestUtils.getDirectContainer("ore:aggregates"), "text/turtle"));
final String page1 = post(members);
final String page2 = post(members);
......
......@@ -129,9 +129,9 @@ public class AcrepoPcdmIT extends AbstractOSGiIT {
final String baseUrl = "http://localhost:" + System.getProperty("fcrepo.port") + "/fcrepo/rest";
final String baseSvcUrl = "http://localhost:" + System.getProperty("karaf.pcdm.port") + "/pcdm";
final String pcdmObj = post(baseUrl, getClass().getResourceAsStream("/resource.ttl"), "text/turtle");
final String pcdmObj = post(baseUrl, TestUtils.getResource(), "text/turtle");
final String members = pcdmObj + "/members";
assertTrue(put(members, getClass().getResourceAsStream("/members.ttl"), "text/turtle"));
assertTrue(put(members, TestUtils.getDirectContainer("pcdm:hasMember"), "text/turtle"));
final String page1 = post(members);
final String page2 = post(members);
......@@ -163,9 +163,9 @@ public class AcrepoPcdmIT extends AbstractOSGiIT {
final String baseUrl = "http://localhost:" + System.getProperty("fcrepo.port") + "/fcrepo/rest";
final String baseSvcUrl = "http://localhost:" + System.getProperty("karaf.pcdm.port") + "/pcdm";
final String pcdmObj = post(baseUrl, getClass().getResourceAsStream("/resource.ttl"), "text/turtle");
final String pcdmObj = post(baseUrl, TestUtils.getResource(), "text/turtle");
final String members = pcdmObj + "/members";
assertTrue(put(members, getClass().getResourceAsStream("/members.ttl"), "text/turtle"));
assertTrue(put(members, TestUtils.getDirectContainer("pcdm:hasMember"), "text/turtle"));
final String page1 = post(members);
final String page2 = post(members);
......
......@@ -74,6 +74,8 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
logLevel(LogLevel.INFO),
keepRuntimeFolder(),
configureConsole().ignoreLocalConsole(),
features(maven().groupId("org.apache.karaf.features").artifactId("spring")
.version("4.1.0").classifier("features").type("xml"), "spring"),
features(maven().groupId("org.apache.karaf.features").artifactId("standard")
.versionAsInProject().classifier("features").type("xml"), "scr"),
features(maven().groupId("org.apache.camel.karaf").artifactId("apache-camel")
......@@ -100,8 +102,6 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
"acrepo-exts-serialize-xml",
"acrepo-exts-template",
"acrepo-libs-jena",
"acrepo-services-entailment",
"acrepo-services-inference",
"acrepo-services-mint",
......@@ -137,7 +137,6 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-pcdm")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-serialize-xml")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-template")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jena")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-entailment")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-inference")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-mint")));
......
/*
* Copyright 2016 Amherst College
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package edu.amherst.acdc.itests;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
/**
* @author acoburn
*/
final class TestUtils {
public static InputStream getResource() {
final String resource =
"@prefix bf: <http://id.loc.gov/ontologies/bibframe/> .\n" +
"@prefix pcdm: <http://pcdm.org/models#> .\n" +
"@prefix skos: <http://www.w3.org/2004/02/skos/core#> .\n" +
"@prefix dcterms: <http://purl.org/dc/terms/> .\n" +
"@prefix dc: <http://purl.org/dc/elements/1.1/> .\n\n" +
"<> a pcdm:Object ;" +
" skos:prefLabel \"Manuscript Title\" ;" +
" skos:note \"This is a sample manuscript record\" ;" +
" dc:identifier \"Amherst Manuscript # 681\" ;" +
" dcterms:extent \"1 volume (420 pages): photographs\" ;" +
" dcterms:tableOfContents \"First this, then that\" ;" +
" dcterms:format pcdm:Document ;" +
" dcterms:isPartOf <http://acdc.amherst.edu/> ;" +
" dcterms:rights <http://rightsstatements.org/vocab/NKC/1.0/> ;" +
" dcterms:identifier <doi:123456/12> , <http://acdc.amherst.edu/id/abcdefg> ;" +
" dcterms:created \"2001-02-03\"^^<http://id.loc.gov/datatypes/edtf/EDTF> ;" +
" dcterms:language <http://id.loc.gov/vocabulary/iso639-2/eng> ;" +
" dcterms:abstract \"This is a textual description of the manuscript\" ;" +
" dcterms:medium \"Pen and ink on linen\" ; " +
" dcterms:type <http://id.loc.gov/vocabulary/resourceTypes/txt> , " +
" <http://purl.org/dc/dcmitype/StillImage> , <http://vocab.getty.edu/aat/30002491> ;" +
" bf:descriptionLanguage <http://id.loc.gov/vocabulary/iso639-2/eng> ;" +
" bf:heldBy <http://acdc.amherst.edu/> .";
return new ByteArrayInputStream(resource.getBytes(UTF_8));
}
public static InputStream getDirectContainer(final String relation) {
final String resource =
"@prefix pcdm: <http://pcdm.org/models#> .\n" +
"@prefix ore: <http://www.openarchives.org/ore/terms/> .\n" +
"@prefix ldp: <http://www.w3.org/ns/ldp#> .\n\n" +
"<> a ldp:DirectContainer ;" +
" ldp:membershipResource <.> ;" +
" ldp:hasMemberRelation " + relation + " .";
return new ByteArrayInputStream(resource.getBytes(UTF_8));
}
private TestUtils() {
}
}
@prefix bf: <http://id.loc.gov/ontologies/bibframe/> .
@prefix ore: <http://www.openarchives.org/ore/terms/> .
@prefix skos: <http://www.w3.org/2004/02/skos/core#> .
@prefix dcterms: <http://purl.org/dc/terms/> .
@prefix dc: <http://purl.org/dc/elements/1.1/> .
@prefix ldp: <http://www.w3.org/ns/ldp#> .
<> a ldp:Container ;
skos:prefLabel "Manuscript Title" ;
skos:note "This is a sample manuscript record" ;
dc:identifier "Amherst Manuscript # 681" ;
dcterms:extent "1 volume (420 pages): photographs" ;
dcterms:tableOfContents "First this, then that" ;
dcterms:isPartOf <http://acdc.amherst.edu/> ;
dcterms:rights <http://rightsstatements.org/vocab/NKC/1.0/> ;
dcterms:identifier <doi:123456/12> , <http://acdc.amherst.edu/id/abcdefg> ;
dcterms:created "2001-02-03"^^<http://id.loc.gov/datatypes/edtf/EDTF> ;
dcterms:language <http://id.loc.gov/vocabulary/iso639-2/eng> ;
dcterms:abstract "This is a textual description of the manuscript" ;
dcterms:medium "Pen and ink on linen" ;
dcterms:type <http://id.loc.gov/vocabulary/resourceTypes/txt> , <http://purl.org/dc/dcmitype/StillImage> , <http://vocab.getty.edu/aat/30002491> ;
bf:descriptionLanguage <http://id.loc.gov/vocabulary/iso639-2/eng> ;
bf:heldBy <http://acdc.amherst.edu/> .
@prefix ore: <http://www.openarchives.org/ore/terms/> .
@prefix ldp: <http://www.w3.org/ns/ldp#> .
<> a ldp:DirectContainer ;
ldp:membershipResource <.> ;
ldp:hasMemberRelation ore:aggregates .
@prefix pcdm: <http://pcdm.org/models#> .
@prefix ldp: <http://www.w3.org/ns/ldp#> .
<> a ldp:DirectContainer ;
ldp:membershipResource <.> ;
ldp:hasMemberRelation pcdm:hasMember .
@prefix bf: <http://id.loc.gov/ontologies/bibframe/> .
@prefix pcdm: <http://pcdm.org/models#> .
@prefix skos: <http://www.w3.org/2004/02/skos/core#> .
@prefix dcterms: <http://purl.org/dc/terms/> .
@prefix dc: <http://purl.org/dc/elements/1.1/> .
<> a pcdm:Object ;
skos:prefLabel "Manuscript Title" ;
skos:note "This is a sample manuscript record" ;
dc:identifier "Amherst Manuscript # 681" ;
dcterms:extent "1 volume (420 pages): photographs" ;
dcterms:tableOfContents "First this, then that" ;
dcterms:format pcdm:Document ;
dcterms:isPartOf <http://acdc.amherst.edu/> ;
dcterms:rights <http://rightsstatements.org/vocab/NKC/1.0/> ;
dcterms:identifier <doi:123456/12> , <http://acdc.amherst.edu/id/abcdefg> ;
dcterms:created "2001-02-03"^^<http://id.loc.gov/datatypes/edtf/EDTF> ;
dcterms:language <http://id.loc.gov/vocabulary/iso639-2/eng> ;
dcterms:abstract "This is a textual description of the manuscript" ;
dcterms:medium "Pen and ink on linen" ;
dcterms:type <http://id.loc.gov/vocabulary/resourceTypes/txt> , <http://purl.org/dc/dcmitype/StillImage> , <http://vocab.getty.edu/aat/30002491> ;
bf:descriptionLanguage <http://id.loc.gov/vocabulary/iso639-2/eng> ;
bf:heldBy <http://acdc.amherst.edu/> .
......@@ -5,6 +5,7 @@
<feature>jndi</feature>
<feature>jdbc</feature>
<feature>aries-blueprint</feature>
<feature version="${camelVersionRange}">camel</feature>
<feature version="${camelVersionRange}">camel-blueprint</feature>
......@@ -49,12 +50,13 @@
<feature name="acrepo-exts-entailment" version="${project.version}">
<details>Installs the RDFS entailment extension</details>
<feature>aries-blueprint</feature>
<feature version="${camelVersionRange}">camel</feature>
<feature version="${camelVersionRange}">camel-blueprint</feature>
<feature version="${camelVersionRange}">camel-http4</feature>
<feature version="${camelVersionRange}">camel-jetty9</feature>
<feature version="${jenaVersionRange}">jena</feature>
<feature version="${project.version}">acrepo-services-entailment</feature>
<feature version="${project.version}">acrepo-libs-jena</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-exts-entailment/${project.version}</bundle>
......@@ -64,6 +66,7 @@
<feature name="acrepo-exts-image" version="${project.version}">
<details>Installs the image service</details>
<feature>aries-blueprint</feature>
<feature version="${camelVersionRange}">camel</feature>
<feature version="${camelVersionRange}">camel-blueprint</feature>
<feature version="${camelVersionRange}">camel-jetty9</feature>
......@@ -94,12 +97,13 @@
<feature name="acrepo-exts-ore" version="${project.version}">
<details>Installs the ORE extension</details>
<feature>aries-blueprint</feature>
<feature version="${camelVersionRange}">camel</feature>
<feature version="${camelVersionRange}">camel-blueprint</feature>
<feature version="${camelVersionRange}">camel-http4</feature>
<feature version="${camelVersionRange}">camel-jetty9</feature>
<feature version="${jenaVersionRange}">jena</feature>
<feature version="${project.version}">acrepo-services-ore</feature>
<feature version="${project.version}">acrepo-libs-jena</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-exts-ore/${project.version}</bundle>
......@@ -109,12 +113,13 @@
<feature name="acrepo-exts-pcdm" version="${project.version}">
<details>Installs the PCDM extension</details>
<feature>aries-blueprint</feature>
<feature version="${camelVersionRange}">camel</feature>
<feature version="${camelVersionRange}">camel-blueprint</feature>
<feature version="${camelVersionRange}">camel-jetty9</feature>
<feature version="${camelVersionRange}">camel-http4</feature>
<feature version="${jenaVersionRange}">jena</feature>
<feature version="${project.version}">acrepo-services-pcdm</feature>
<feature version="${project.version}">acrepo-libs-jena</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-exts-pcdm/${project.version}</bundle>
......@@ -124,7 +129,7 @@
<feature name="acrepo-services-entailment" version="${project.version}">
<details>Installs the RDFS entailment service</details>
<feature version="${project.version}">acrepo-libs-jena</feature>
<feature version="${jenaVersionRange}">jena</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-services-entailment/${project.version}</bundle>
......@@ -144,7 +149,7 @@
<feature name="acrepo-services-ore" version="${project.version}">
<details>Installs the ORE Resource service</details>
<feature version="${project.version}">acrepo-libs-jena</feature>
<feature version="${jenaVersionRange}">jena</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-services-ore/${project.version}</bundle>
</feature>
......@@ -152,7 +157,7 @@
<feature name="acrepo-services-pcdm" version="${project.version}">
<details>Installs the PCDM Resource service</details>
<feature version="${project.version}">acrepo-libs-jena</feature>
<feature version="${jenaVersionRange}">jena</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-services-pcdm/${project.version}</bundle>
</feature>
......@@ -160,7 +165,7 @@
<feature name="acrepo-services-inference" version="${project.version}">
<details>Installs the inference service</details>
<feature version="${project.version}">acrepo-libs-jena</feature>
<feature version="${jenaVersionRange}">jena</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-services-inference/${project.version}</bundle>
</feature>
......@@ -168,12 +173,14 @@
<feature name="acrepo-exts-serialize-xml" version="${project.version}">
<details>Installs the MODS/XML and DC/XML serialization service</details>
<feature>aries-blueprint</feature>
<feature version="${camelVersionRange}">camel</feature>
<feature version="${camelVersionRange}">camel-blueprint</feature>
<feature version="${camelVersionRange}">camel-http4</feature>
<feature version="${camelVersionRange}">camel-jetty9</feature>
<feature version="${camelVersionRange}">camel-saxon</feature>
<bundle>mvn:commons-io/commons-io/${commonsIoVersion}</bundle>
<bundle>mvn:edu.amherst.acdc/acrepo-exts-serialize-xml/${project.version}</bundle>
<configfile finalname="/etc/edu.amherst.acdc.exts.serialize.xml.cfg">mvn:edu.amherst.acdc/acrepo-exts-serialize-xml/${project.version}/cfg/configuration</configfile>
......@@ -182,6 +189,7 @@
<feature name="acrepo-exts-template" version="${project.version}">
<details>Installs a sample JSON-based template rendering service</details>
<feature>aries-blueprint</feature>
<feature version="${camelVersionRange}">camel</feature>
<feature version="${camelVersionRange}">camel-blueprint</feature>
<feature version="${camelVersionRange}">camel-mustache</feature>
......@@ -197,6 +205,7 @@
<feature name="acrepo-exts-fits" version="${project.version}">
<details>Installs a FITS RESTful service</details>
<feature>aries-blueprint</feature>
<feature version="${camelVersionRange}">camel</feature>
<feature version="${camelVersionRange}">camel-blueprint</feature>
<feature version="${camelVersionRange}">camel-jetty9</feature>
......@@ -207,23 +216,14 @@
<configfile finalname="/etc/edu.amherst.acdc.exts.fits.cfg">mvn:edu.amherst.acdc/acrepo-exts-fits/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-libs-jena" version="${project.version}">
<details>Installs jena and related dependencies</details>
<feature prerequisite="true">wrap</feature>
<feature version="${jenaVersionRange}">jena</feature>
<!-- transitively required by jena, can be removed with Jena 3.7.0 -->
<bundle dependency="true">wrap:mvn:com.google.errorprone/error_prone_annotations/2.1.1</bundle>
</feature>
<feature name="acrepo-connector-triplestore" version="${project.version}">
<details>Installs the triplestore indexing service</details>
<feature>aries-blueprint</feature>
<feature version="${camelVersionRange}">camel</feature>
<feature version="${camelVersionRange}">camel-blueprint</feature>
<feature version="${camelVersionRange}">camel-http4</feature>
<feature version="${project.version}">acrepo-libs-jena</feature>
<feature version="${jenaVersionRange}">jena</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-connector-triplestore/${project.version}</bundle>
......@@ -233,6 +233,7 @@
<feature name="acrepo-connector-broadcast" version="${project.version}">
<details>Installs the message broadcasting service</details>