Commit 70f93a34 authored by bseeger's avatar bseeger
Browse files

Merge branch 'cleanup_karaf' into 'master'

use sesame's OSGi artifact

Rather than using all those gross wrapped Sesame artifacts, we can, instead, use a single OSGi artifact. Also, cleanup other wrapped bundle dependencies.

See merge request !61
parents c5e763c6 d0391b06
......@@ -51,7 +51,6 @@ sets of related bundles in an OSGi container.
* `acrepo-libs-jena`: The [Jena 3.x](http://jena.apache.org/) libraries
* `acrepo-libs-jsonld`: The [JSON-LD](https://github.com/jsonld-java/jsonld-java) libraries
* `acrepo-libs-marmotta`: The [Marmotta](http://marmotta.apache.org) libraries
* `acrepo-libs-sesame`: The [Sesame 2.x](http://rdf4j.org/) libraries
Building
--------
......
......@@ -10,15 +10,9 @@
</parent>
<artifactId>acrepo-itests</artifactId>
<packaging>bundle</packaging>
<name>Karaf Integration tests for repository services</name>
<properties>
<!-- osgi bundle configuration -->
<osgi.import.packages>*</osgi.import.packages>
</properties>
<dependencies>
<dependency>
<groupId>org.fcrepo.camel</groupId>
......@@ -381,12 +375,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<!-- to generate the MANIFEST-FILE of the bundle -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
<!--Bring in fcrepo webapp for integration testing-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......
......@@ -84,7 +84,7 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
"acrepo-exts-fits", "acrepo-exts-image", "acrepo-exts-jsonld", "acrepo-exts-pcdm",
"acrepo-exts-serialize-xml", "acrepo-exts-template",
"acrepo-libs-jena", "acrepo-libs-sesame", "acrepo-libs-jsonld",
"acrepo-libs-jena", "acrepo-libs-jsonld",
"acrepo-libs-jackson", "acrepo-libs-marmotta",
"acrepo-services-activemq", "acrepo-services-inference", "acrepo-services-jsonld",
......@@ -120,7 +120,6 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jena")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jsonld")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-marmotta")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-sesame")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-activemq")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-inference")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-jsonld")));
......
......@@ -207,53 +207,10 @@
<bundle dependency="true">mvn:com.github.andrewoma.dexx/collection/${dexx.version}</bundle>
</feature>
<feature name="acrepo-libs-sesame" version="${project.version}">
<details>Installs the OpenRDF libraries</details>
<feature prerequisite="true" dependency="false">wrap</feature>
<feature version="${project.version}" dependency="true">acrepo-libs-jackson</feature>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-event/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-sail-memory/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-model/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-util/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-api/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-api/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-query/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-queryresultio-api/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-rdfjson/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-rdfxml/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-turtle/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-n3/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-sail/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-queryparser-api/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-queryalgebra-model/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-trig/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-sail-api/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-sail-nativerdf/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-sail-inferencer/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-queryalgebra-evaluation/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-sparql/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-queryparser-sparql/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-queryresultio-sparqlxml/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-http-client/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-http-protocol/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-ntriples/${sesame.version}</bundle>
<bundle>mvn:com.github.jsonld-java/jsonld-java-sesame/${jsonld-sesame.version}</bundle>
<bundle>mvn:com.github.jsonld-java/jsonld-java/${jsonld-sesame.version}</bundle>
<bundle dependency="true">${wrapped.bundle.location}/commons-httpclient.commons-httpclient-${commons-httpclient.version}.jar</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore.version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
</feature>
<feature name="acrepo-libs-marmotta" version="${project.version}">
<details>Installs the Marmotta libraries</details>
<feature version="${project.version}" dependency="true">acrepo-libs-sesame</feature>
<feature prerequisite="true" dependency="false">wrap</feature>
<feature version="${project.version}" dependency="true">acrepo-libs-jsonld</feature>
<feature version="${project.version}" dependency="true">acrepo-libs-jackson</feature>
......@@ -268,6 +225,13 @@
<bundle>${wrapped.bundle.location}/org.apache.marmotta.ldclient-provider-rdfa-${marmotta.version}.jar</bundle>
<bundle>${wrapped.bundle.location}/org.apache.marmotta.ldclient-provider-xml-${marmotta.version}.jar</bundle>
<bundle dependency="true">mvn:org.openrdf.sesame/sesame-runtime-osgi/${sesame.version}</bundle>
<bundle dependency="true">mvn:com.github.jsonld-java/jsonld-java-sesame/${jsonld-sesame.version}</bundle>
<bundle dependency="true">mvn:com.github.jsonld-java/jsonld-java/${jsonld-sesame.version}</bundle>
<bundle dependency="true">wrap:mvn:au.com.bytecode/opencsv/${opencsv.version}</bundle>
<bundle dependency="true">mvn:ch.qos.logback/logback-classic/${sesame-logback.version}</bundle>
<bundle dependency="true">mvn:ch.qos.logback/logback-core/${sesame-logback.version}</bundle>
<bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/${guava16.version}</bundle>
<bundle dependency="true">mvn:joda-time/joda-time/${joda-time.version}</bundle>
......@@ -280,17 +244,17 @@
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore.version}</bundle>
<bundle dependency="true">mvn:jaxen/jaxen/${jaxen.version}</bundle>
<bundle dependency="true">${wrapped.bundle.location}/commons-digester.commons-digester-${commons-digester.version}.jar</bundle>
<bundle dependency="true">${wrapped.bundle.location}/org.apache.httpcomponents.fluent-hc-${fluent-hc.version}.jar</bundle>
<bundle dependency="true">${wrapped.bundle.location}/org.apache.httpcomponents.httpclient-cache-${httpclient-cache.version}.jar</bundle>
<bundle dependency="true">${wrapped.bundle.location}/org.apache.httpcomponents.httpcore-nio-${httpcore-nio.version}.jar</bundle>
<bundle dependency="true">${wrapped.bundle.location}/org.apache.httpcomponents.httpmime-${httpmime.version}.jar</bundle>
<bundle dependency="true">${wrapped.bundle.location}/org.jdom.jdom2-${jdom2.version}.jar</bundle>
<bundle dependency="true">${wrapped.bundle.location}/org.semarglproject.semargl-rdfa-${semargl.version}.jar</bundle>
<bundle dependency="true">${wrapped.bundle.location}/org.semarglproject.semargl-core-${semargl.version}.jar</bundle>
<bundle dependency="true">${wrapped.bundle.location}/org.semarglproject.semargl-rdf-${semargl.version}.jar</bundle>
<bundle dependency="true">${wrapped.bundle.location}/org.semarglproject.semargl-sesame-${semargl.version}.jar</bundle>
<bundle dependency="true">wrap:mvn:commons-digester/commons-digester/${commons-digester.version}</bundle>
<bundle dependency="true">wrap:mvn:org.apache.httpcomponents/fluent-hc/${fluent-hc.version}</bundle>
<bundle dependency="true">wrap:mvn:org.apache.httpcomponents/httpclient-cache/${httpclient-cache.version}</bundle>
<bundle dependency="true">wrap:mvn:org.apache.httpcomponents/httpcore-nio/${httpcore-nio.version}</bundle>
<bundle dependency="true">wrap:mvn:org.apache.httpcomponents/httpmime/${httpmime.version}</bundle>
<bundle dependency="true">wrap:mvn:org.jdom/jdom2/${jdom2.version}</bundle>
<bundle dependency="true">wrap:mvn:org.semarglproject/semargl-rdfa/${semargl.version}</bundle>
<bundle dependency="true">wrap:mvn:org.semarglproject/semargl-core/${semargl.version}</bundle>
<bundle dependency="true">wrap:mvn:org.semarglproject/semargl-rdf/${semargl.version}</bundle>
<bundle dependency="true">wrap:mvn:org.semarglproject/semargl-sesame/${semargl.version}</bundle>
</feature>
<feature name="acrepo-libs-jsonld" version="${project.version}">
......
......@@ -86,6 +86,8 @@
<httpcore-nio.version>4.4.4</httpcore-nio.version>
<httpmime.version>4.5.2</httpmime.version>
<jdom2.version>2.0.5</jdom2.version>
<sesame-logback.version>0.9.30</sesame-logback.version>
<opencsv.version>2.4</opencsv.version>
<wrapped.bundle.location>http://www.ats.amherst.edu/bundles</wrapped.bundle.location>
<!-- test gear -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment