Commit 9b0c4d29 authored by Aaron Coburn's avatar Aaron Coburn
Browse files

Update dependencies

parent 96d848e0
......@@ -45,7 +45,7 @@ public class EntailmentRouter extends RouteBuilder {
public void configure() throws Exception {
from("jetty:http://{{rest.host}}:{{rest.port}}{{rest.prefix}}?" +
"sendServerVersion=false&httpMethodRestrict=GET,OPTIONS")
"sendServerVersion=false&optionsEnabled=true&httpMethodRestrict=GET,OPTIONS")
.routeId("EntailmentRouter")
.removeHeader("User-Agent")
.process(e -> e.getIn().setHeader(FCREPO_URI,
......@@ -56,7 +56,8 @@ public class EntailmentRouter extends RouteBuilder {
.when(header(HTTP_METHOD).isEqualTo("OPTIONS"))
.setHeader(CONTENT_TYPE).constant("text/turtle")
.setHeader("Allow").constant("GET,OPTIONS")
.to("language:simple:resource:classpath:options.ttl")
.transform().simple("resource:classpath:options.ttl")
.endChoice()
.when(header(HTTP_QUERY_CONTEXT).startsWith(header(FCREPO_BASE_URL)))
.process(exchange -> {
final String contentType = exchange.getIn().getHeader("Accept", String.class);
......
......@@ -46,7 +46,7 @@ public class OreRouter extends RouteBuilder {
public void configure() throws Exception {
from("jetty:http://{{rest.host}}:{{rest.port}}{{rest.prefix}}?" +
"sendServerVersion=false&httpMethodRestrict=GET,OPTIONS")
"sendServerVersion=false&optionsEnabled=true&httpMethodRestrict=GET,OPTIONS")
.routeId("OreRouter")
.removeHeader("User-Agent")
.process(e -> e.getIn().setHeader(FCREPO_URI,
......
......@@ -46,7 +46,7 @@ public class PcdmRouter extends RouteBuilder {
public void configure() throws Exception {
from("jetty:http://{{rest.host}}:{{rest.port}}{{rest.prefix}}?" +
"sendServerVersion=false&httpMethodRestrict=GET,OPTIONS")
"sendServerVersion=false&optionsEnabled=true&httpMethodRestrict=GET,OPTIONS")
.routeId("PcdmRouter")
.removeHeader("User-Agent")
.process(e -> e.getIn().setHeader(FCREPO_URI,
......
......@@ -39,7 +39,7 @@ public class XmlSerializationRouter extends RouteBuilder {
public void configure() throws Exception {
from("jetty:http://{{rest.host}}:{{rest.port}}{{rest.prefix}}?" +
"httpMethodRestrict=GET,OPTIONS&sendServerVersion=false")
"httpMethodRestrict=GET,OPTIONS&optionsEnabled=true&sendServerVersion=false")
.routeId("XmlAccept")
.process(e -> e.getIn().setHeader(FCREPO_URI,
e.getIn().getHeader(HTTP_QUERY_CONTEXT,
......
......@@ -55,7 +55,7 @@ public class TemplateRouter extends RouteBuilder {
.log("Event Routing Error: ${routeId}");
from("jetty:http://{{rest.host}}:{{rest.port}}/template?" +
"httpMethodRestrict=GET,OPTIONS&sendServerVersion=false")
"httpMethodRestrict=GET,OPTIONS&optionsEnabled=true&sendServerVersion=false")
.routeId("TemplateTransformation")
.process(e -> e.getIn().setHeader(FEDORA_URI,
e.getIn().getHeader(HTTP_QUERY_CONTEXT,
......
......@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath 'org.akhikhl.gretty:gretty:1.4.0'
classpath 'org.akhikhl.gretty:gretty:2.0.0'
}
}
......@@ -62,8 +62,8 @@ dependencies {
testCompile project(':acrepo-exts-template')
testCompile project(':acrepo-karaf')
testCompile group: 'org.osgi', name: 'org.osgi.core', version: osgiVersion
testCompile group: 'org.osgi', name: 'org.osgi.compendium', version: osgiVersion
testCompile group: 'org.osgi', name: 'org.osgi.core', version: osgiCoreVersion
testCompile group: 'org.osgi', name: 'org.osgi.compendium', version: osgiCompendiumVersion
testCompile group: 'org.apache.jena', name: 'jena-osgi', version: jenaVersion
testCompile group: 'org.glassfish.hk2.external', name: 'javax.inject', version: hk2Version
......@@ -138,6 +138,7 @@ task integrationTest(type: Test) {
test {
systemProperty 'karaf.version', karafVersion
systemProperty 'karaf.commonsIo.version', commonsIoVersion
systemProperty 'karaf.jena.version', jenaVersion
systemProperty 'karaf.ssh.port', randomPort()
systemProperty 'karaf.rmiServer.port', randomPort()
......@@ -158,7 +159,7 @@ test {
}
farm {
port = fcrepoWebPort
httpPort = fcrepoWebPort
integrationTestTask = 'integrationTest'
systemProperty 'fcrepo.home', 'build/tmp/fcrepo-data'
systemProperty 'fcrepo.modeshape.configuration', 'classpath:/config/file-simple/repository.json'
......
......@@ -75,6 +75,7 @@ public class AcrepoEntailmentIT extends AbstractOSGiIT {
final String fcrepoBaseUrl = "http://localhost:" + fcrepoPort + "/fcrepo/rest";
final String sshPort = cm.getProperty("karaf.ssh.port");
final String commonIoVersion = cm.getProperty("karaf.commonsIo.version");
final String jenaVersion = cm.getProperty("karaf.jena.version");
final List<String> ontologies = Arrays.asList("http://purl.org/dc/terms/",
"http://purl.org/dc/elements/1.1/", "http://id.loc.gov/ontologies/bibframe/",
......@@ -92,6 +93,8 @@ public class AcrepoEntailmentIT extends AbstractOSGiIT {
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("org.apache.camel.karaf").artifactId("apache-camel")
.type("xml").classifier("features").versionAsInProject()),
features(maven().groupId("org.fcrepo.camel").artifactId("fcrepo-camel")
......
......@@ -54,6 +54,7 @@ public class AcrepoJenaLibsIT extends AbstractOSGiIT {
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()
......@@ -66,6 +67,8 @@ public class AcrepoJenaLibsIT extends AbstractOSGiIT {
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"),
......@@ -78,6 +81,5 @@ public class AcrepoJenaLibsIT extends AbstractOSGiIT {
@Test
public void testInstallation() throws Exception {
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jena")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jsonld")));
}
}
/*
* 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 AcrepoJsonLdLibsIT extends AbstractOSGiIT {
private static Logger LOGGER = getLogger(AcrepoJsonLdLibsIT.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");
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("edu.amherst.acdc").artifactId("acrepo-karaf")
.type("xml").classifier("features").versionAsInProject(), "acrepo-libs-jsonld"),
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-jsonld")));
}
}
......@@ -67,6 +67,7 @@ public class AcrepoOreIT extends AbstractOSGiIT {
final String rmiServerPort = cm.getProperty("karaf.rmiServer.port");
final String fcrepoBaseUrl = "http://localhost:" + fcrepoPort + "/fcrepo/rest";
final String sshPort = cm.getProperty("karaf.ssh.port");
final String jenaVersion = cm.getProperty("karaf.jena.version");
return new Option[] {
karafDistributionConfiguration()
......@@ -79,6 +80,8 @@ public class AcrepoOreIT extends AbstractOSGiIT {
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("org.apache.camel.karaf").artifactId("apache-camel")
.type("xml").classifier("features").versionAsInProject()),
features(maven().groupId("org.fcrepo.camel").artifactId("fcrepo-camel")
......
......@@ -67,6 +67,7 @@ public class AcrepoPcdmIT extends AbstractOSGiIT {
final String rmiServerPort = cm.getProperty("karaf.rmiServer.port");
final String fcrepoBaseUrl = "http://localhost:" + fcrepoPort + "/fcrepo/rest";
final String sshPort = cm.getProperty("karaf.ssh.port");
final String jenaVersion = cm.getProperty("karaf.jena.version");
return new Option[] {
karafDistributionConfiguration()
......@@ -81,6 +82,8 @@ public class AcrepoPcdmIT extends AbstractOSGiIT {
.versionAsInProject().classifier("features").type("xml"), "scr"),
features(maven().groupId("org.apache.camel.karaf").artifactId("apache-camel")
.type("xml").classifier("features").versionAsInProject()),
features(maven().groupId("org.apache.jena").artifactId("jena-osgi-features")
.version(jenaVersion).classifier("features").type("xml")),
features(maven().groupId("org.fcrepo.camel").artifactId("fcrepo-camel")
.type("xml").classifier("features").versionAsInProject()),
features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf")
......
......@@ -63,6 +63,7 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
final String ldpathPort = cm.getProperty("karaf.ldpath.port");
final String fitsPort = cm.getProperty("karaf.fits.port");
final String entailmentPort = cm.getProperty("karaf.entailment.port");
final String jenaVersion = cm.getProperty("karaf.jena.version");
return new Option[] {
karafDistributionConfiguration()
......@@ -77,6 +78,8 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
.versionAsInProject().classifier("features").type("xml"), "scr"),
features(maven().groupId("org.apache.camel.karaf").artifactId("apache-camel")
.type("xml").classifier("features").versionAsInProject(), "camel-blueprint"),
features(maven().groupId("org.apache.jena").artifactId("jena-osgi-features")
.version(jenaVersion).classifier("features").type("xml")),
features(maven().groupId("org.apache.activemq").artifactId("activemq-karaf")
.type("xml").classifier("features").versionAsInProject(), "activemq-camel"),
features(maven().groupId("org.apache.camel.karaf").artifactId("apache-camel")
......@@ -100,8 +103,6 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
"acrepo-exts-template",
"acrepo-libs-jena",
"acrepo-libs-jsonld",
"acrepo-libs-jackson",
"acrepo-services-entailment",
"acrepo-services-inference",
......@@ -139,9 +140,7 @@ 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-jackson")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jena")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jsonld")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-entailment")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-inference")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-mint")));
......
......@@ -210,35 +210,11 @@
<feature name="acrepo-libs-jena" version="${project.version}">
<details>Installs jena and related dependencies</details>
<feature version="${project.version}" dependency="true">acrepo-libs-jsonld</feature>
<feature prerequisite="true">wrap</feature>
<feature version="${jenaVersionRange}">jena</feature>
<bundle>mvn:org.apache.jena/jena-osgi/${jenaVersion}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commonsLangVersion}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-csv/${commonsCsvVersion}</bundle>
<bundle dependency="true">mvn:org.apache.thrift/libthrift/${thriftVersion}</bundle>
<bundle dependency="true">mvn:com.github.andrewoma.dexx/collection/${dexxVersion}</bundle>
</feature>
<feature name="acrepo-libs-jsonld" version="${project.version}">
<details>Installs the JSON-LD related bundles</details>
<bundle>mvn:com.github.jsonld-java/jsonld-java/${jsonldVersion}</bundle>
<feature version="${project.version}" dependency="true">acrepo-libs-jackson</feature>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclientVersion}</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcoreVersion}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commonsCodecVersion}</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/${commonsIoVersion}</bundle>
</feature>
<feature name="acrepo-libs-jackson" version="${project.version}">
<details>Installs the Jackson Libraries</details>
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jacksonVersion}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jacksonVersion}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jacksonVersion}</bundle>
<!-- 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}">
......
plugins {
id 'com.github.hierynomus.license' version '0.13.1'
id 'net.researchgate.release' version '2.4.0'
id 'org.sonarqube' version '2.2.1'
id 'com.github.hierynomus.license' version '0.14.0'
id 'net.researchgate.release' version '2.6.0'
id 'com.github.ben-manes.versions' version '0.17.0'
}
allprojects {
......@@ -10,11 +10,15 @@ allprojects {
group = 'edu.amherst.acdc'
repositories {
jcenter()
mavenCentral()
jcenter()
mavenLocal()
}
ext {
jacocoVersion = '0.8.1'
}
gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
......@@ -23,6 +27,9 @@ allprojects {
release {
tagTemplate = '$name-$version'
git {
signTag = true
}
}
}
......@@ -45,31 +52,31 @@ subprojects {
license = 'Apache 2'
camelVersionRange = '[2.18,3)'
jenaVersionRange = '[3.6,4)'
activemqVersionRange = '[5.14,6)'
fcrepoCamelVersionRange = '[4.5,5)'
fcrepoCamelToolboxVersionRange = '[4.7.1,5)'
/* Dependencies */
activemqVersion = '5.14.4'
camelVersion = '2.18.2'
commonsIoVersion = '2.5'
commonsLangVersion = '3.4'
derbyVersion = '10.12.1.1'
activemqVersion = '5.15.3'
camelVersion = '2.21.0'
commonsIoVersion = '2.6'
commonsLangVersion = '3.7'
derbyVersion = '10.14.1.0'
fcrepoCamelVersion = '4.5.0'
fcrepoCamelToolboxVersion = '4.7.1'
fcrepoCamelToolboxVersion = '4.7.2'
hk2Version = '2.4.0'
httpclientVersion = '4.5.2'
httpcoreVersion = '4.4.5'
jacksonVersion = '2.7.5'
jenaVersion = '3.1.1'
httpclientVersion = '4.5.5'
httpcoreVersion = '4.4.9'
jacksonVersion = '2.9.5'
jenaVersion = '3.6.0'
junitVersion = '4.12'
jsonldVersion = '0.8.3'
logbackVersion = '1.1.7'
logbackVersion = '1.2.3'
marmottaVersion = '3.3.0'
postgresqlVersion = '9.4.1208'
saxonVersion = '9.6.0-7'
slf4jVersion = '1.7.21'
springVersion = '4.1.7.RELEASE'
slf4jVersion = '1.7.25'
woodstoxVersion = '4.4.1'
xercesVersion = '2.11.0'
......@@ -86,7 +93,7 @@ subprojects {
fluentHcVersion = '4.5.2'
fcrepoClientVersion = '0.2.1'
httpclientCacheVersion = '4.3.5'
httpmimeVersion = '4.5.2'
httpmimeVersion = '4.5.5'
httpcoreNioVersion = '4.4.4'
jaxenVersion = '1.1.6'
jdom2Version = '2.0.5'
......@@ -98,12 +105,13 @@ subprojects {
wrappedBundleLocation = 'http://www.ats.amherst.edu/bundles'
/* Testing */
paxExamVersion = '4.9.1'
karafVersion = '4.0.5'
fcrepoVersion = '4.7.1'
fusekiVersion = '2.3.1'
paxExamVersion = '4.11.0'
karafVersion = '4.1.5'
fcrepoVersion = '4.7.5'
fusekiVersion = '3.6.0'
xercesVersion = '2.11.0'
osgiVersion = '4.3.1'
osgiCompendiumVersion = '5.0.0'
osgiCoreVersion = '6.0.0'
/* OSGi */
defaultOsgiImports = 'org.osgi.service.blueprint;version="[1,2)",*'
......@@ -143,7 +151,7 @@ subprojects {
}
jacoco {
toolVersion = "0.7.6.201602180812"
toolVersion = jacocoVersion
}
license {
......@@ -263,13 +271,6 @@ task processBuildTools(type: Copy) {
into 'build'
}
sonarqube {
properties {
property "sonar.projectName", "Amherst College Repository Extension Services"
property "sonar.projectKey", "edu.amherst.acdc:repository-services"
}
}
task docs(type: Javadoc) {
outputs.upToDateWhen { false }
source subprojects.collect {project -> project.sourceSets.main.allJava }
......
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