Add build/test support for JDK 10 and 11, add AMN metadata

acrepo-connector-broadcast/build.gradle

 apply plugin: 'osgi'
 
 description = 'Message Broadcaster'
+
+ext {
+    moduleName = 'edu.amherst.acdc.connector.broadcast'
+}
+
 dependencies {
     compile group: 'org.apache.camel', name: 'camel-core', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-blueprint', version: camelVersion
-    testCompile group: 'org.apache.camel', name: 'camel-test-blueprint', version: camelVersion
+
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
+    testCompile group: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
+    testCompile group: 'org.apache.camel', name: 'camel-test-blueprint', version: camelVersion
 }
 
 jar {
@@ -15,8 +23,9 @@ jar {
         vendor project.vendor
         license project.license
 
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', "org.apache.camel,${defaultOsgiImports}"
-        instruction 'Export-Package', "edu.amherst.acdc.connector.broadcast;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-connector-idiomatic/build.gradle

@@ -2,6 +2,10 @@ apply plugin: 'osgi'
 
 description = 'Camel-based service for mapping public IDs to Fedora IDs'
 
+ext {
+    moduleName = 'edu.amherst.acdc.connector.idiomatic'
+}
+
 dependencies {
     compile group: 'org.apache.camel', name: 'camel-core', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-sql', version: camelVersion
@@ -12,6 +16,8 @@ dependencies {
     compile group: 'org.codehaus.woodstox', name: 'woodstox-core-asl', version: woodstoxVersion
 
     testCompile project(':acrepo-services-mint')
+    testCompile group: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
     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
@@ -25,8 +31,10 @@ jar {
         docURL project.docURL
         vendor project.vendor
         license project.license
+
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', "org.apache.camel,org.apache.camel.component.sql,javax.sql,${defaultOsgiImports}"
-        instruction 'Export-Package', "edu.amherst.acdc.connector.idiomatic;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-connector-triplestore/build.gradle

 apply plugin: 'osgi'
 
 description = 'Triplestore Indexer'
+
+ext {
+    moduleName = 'edu.amherst.acdc.connector.triplestore'
+}
+
 dependencies {
     compile group: 'org.apache.camel', name: 'camel-core', version: camelVersion
     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: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
     testCompile group: 'org.apache.commons', name: 'commons-compress', version: commonsCompressVersion
 }
 
@@ -17,8 +24,9 @@ jar {
         vendor project.vendor
         license project.license
 
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', "org.apache.camel,${defaultOsgiImports}"
-        instruction 'Export-Package', "edu.amherst.acdc.connector.triplestore;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-exts-entailment/build.gradle

 apply plugin: 'osgi'
 
 description = 'Entailed Triple Builder'
+
+ext {
+    moduleName = 'edu.amherst.acdc.exts.entailment'
+}
+
 dependencies {
     compile group: 'org.apache.camel', name: 'camel-core', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-blueprint', version: camelVersion
@@ -9,6 +14,8 @@ dependencies {
 
     compile project(':acrepo-services-entailment')
 
+    testCompile group: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
     testCompile group: 'org.apache.commons', name: 'commons-compress', version: commonsCompressVersion
 }
 
@@ -19,8 +26,9 @@ jar {
         vendor project.vendor
         license project.license
 
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', "org.apache.camel,edu.amherst.acdc.services.entailment,${defaultOsgiImports}"
-        instruction 'Export-Package', "edu.amherst.acdc.exts.entailment;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-exts-fits/build.gradle

 apply plugin: 'osgi'
 
 description = 'FITS service bundle'
+
+ext {
+    moduleName = 'edu.amherst.acdc.exts.fits'
+}
+
 dependencies {
     compile group: 'org.apache.camel', name: 'camel-core', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-jetty9', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-blueprint', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-http4', version: camelVersion
-    compile group: 'org.apache.httpcomponents', name: 'httpmime', version: httpmimeVersion
     compile group: 'org.apache.httpcomponents', name: 'httpcore', version: httpcoreVersion
+    compile group: 'org.apache.httpcomponents', name: 'httpmime', version: httpclientVersion
     compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
+
+    testCompile group: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
     testCompile group: 'junit', name: 'junit', version: junitVersion
     testCompile group: 'org.apache.camel', name: 'camel-test-blueprint', version: camelVersion
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
@@ -21,8 +29,9 @@ jar {
         vendor project.vendor
         license project.license
 
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', "org.apache.camel,${defaultOsgiImports}"
-        instruction 'Export-Package', "edu.amherst.acdc.exts.fits;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-exts-image/build.gradle

 apply plugin: 'osgi'
 
 description = 'Image manipulation service'
+
+ext {
+    moduleName = 'edu.amherst.acdc.exts.image'
+}
+
 dependencies {
     compile group: 'org.apache.camel', name: 'camel-core', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-blueprint', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-jetty9', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-exec', version: camelVersion
 
+    testCompile group: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
     testCompile group: 'junit', name: 'junit', version: junitVersion
     testCompile group: 'org.apache.camel', name: 'camel-test-blueprint', version: camelVersion
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
@@ -19,8 +26,9 @@ jar {
         vendor project.vendor
         license project.license
 
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', "org.apache.camel,${defaultOsgiImports}"
-        instruction 'Export-Package', "edu.amherst.acdc.exts.image;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-exts-ldpath/build.gradle

 apply plugin: 'osgi'
 
 description = 'LDPath service'
+
+ext {
+    moduleName = 'edu.amherst.acdc.exts.ldpath'
+}
+
 dependencies {
     compile group: 'org.apache.camel', name: 'camel-core', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-blueprint', version: camelVersion
@@ -13,6 +18,9 @@ dependencies {
     compile group: 'org.apache.httpcomponents', name:  'httpclient-osgi', version: httpclientVersion
     compile group: 'org.apache.httpcomponents', name:  'httpcore-osgi', version: httpcoreVersion
     compile group: 'org.fcrepo.camel', name: 'fcrepo-ldpath', version: fcrepoCamelToolboxVersion
+
+    testCompile group: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
     testCompile group: 'junit', name: 'junit', version: junitVersion
     testCompile group: 'org.apache.camel', name: 'camel-test-blueprint', version: camelVersion
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
@@ -34,6 +42,7 @@ jar {
         vendor project.vendor
         license project.license
 
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', """
             org.apache.camel,
             org.apache.http.auth,
@@ -48,7 +57,7 @@ jar {
             org.fcrepo.client,
             org.fcrepo.camel.ldpath,
             ${defaultOsgiImports}"""
-        instruction 'Export-Package', "edu.amherst.acdc.exts.ldpath;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-exts-ore/build.gradle

 apply plugin: 'osgi'
 
 description = 'ORE Object builder'
+
+ext {
+    moduleName = 'edu.amherst.acdc.exts.org'
+}
+
 dependencies {
     compile group: 'org.apache.camel', name: 'camel-core', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-blueprint', version: camelVersion
@@ -8,6 +13,8 @@ dependencies {
     compile group: 'org.apache.jena', name: 'jena-osgi', version: jenaVersion
     compile project(':acrepo-services-ore')
 
+    testCompile group: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
     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
@@ -21,8 +28,9 @@ jar {
         vendor project.vendor
         license project.license
 
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', "org.apache.camel,edu.amherst.acdc.services.ore,${defaultOsgiImports}"
-        instruction 'Export-Package', "edu.amherst.acdc.exts.ore;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-exts-pcdm/build.gradle

 apply plugin: 'osgi'
 
 description = 'PCDM Object builder'
+
+ext {
+    moduleName = 'edu.amherst.acdc.exts.pcdm'
+}
+
 dependencies {
     compile group: 'org.apache.camel', name: 'camel-core', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-blueprint', version: camelVersion
@@ -10,6 +15,8 @@ dependencies {
 
     compile project(':acrepo-services-pcdm')
 
+    testCompile group: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
     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
@@ -23,8 +30,9 @@ jar {
         vendor project.vendor
         license project.license
 
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', "org.apache.camel,edu.amherst.acdc.services.pcdm,${defaultOsgiImports}"
-        instruction 'Export-Package', "edu.amherst.acdc.exts.pcdm;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-exts-serialize-xml/build.gradle

 apply plugin: 'osgi'
 
 description = 'RDF to XML (MODS and DC) serialization service'
+
+ext {
+    moduleName = 'edu.amherst.acdc.exts.serialize.xml'
+}
+
 dependencies {
     compile group: 'org.apache.camel', name: 'camel-core', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-http4', version: camelVersion
@@ -8,6 +13,9 @@ dependencies {
     compile group: 'org.apache.camel', name: 'camel-blueprint', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-saxon', version: camelVersion
     compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
+
+    testCompile group: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
     testCompile group: 'junit', name: 'junit', version: junitVersion
     testCompile group: 'commons-io', name: 'commons-io', version: commonsIoVersion
     testCompile group: 'org.apache.camel', name: 'camel-test-blueprint', version: camelVersion
@@ -21,8 +29,9 @@ jar {
         vendor project.vendor
         license project.license
 
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', "org.apache.camel,${defaultOsgiImports}"
-        instruction 'Export-Package', "edu.amherst.acdc.exts.serialize.xml;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-exts-template/build.gradle

 apply plugin: 'osgi'
 
 description = 'A template rendering service, based on JSON-LD documents'
+
+ext {
+    moduleName = 'edu.amherst.acdc.exts.template'
+}
+
 dependencies {
     compile group: 'org.apache.camel', name: 'camel-core', version: camelVersion
     compile group: 'org.apache.camel', name: 'camel-jetty9', version: camelVersion
@@ -10,6 +15,8 @@ dependencies {
     compile group: 'org.apache.camel', name: 'camel-mustache', version: camelVersion
     compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
 
+    testCompile group: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
     testCompile group: 'junit', name: 'junit', version: junitVersion
     testCompile group: 'org.apache.camel', name: 'camel-test-blueprint', version: camelVersion
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
@@ -22,8 +29,9 @@ jar {
         vendor project.vendor
         license project.license
 
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', "org.apache.camel,${defaultOsgiImports}"
-        instruction 'Export-Package', "edu.amherst.acdc.exts.template;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-itests/build.gradle

@@ -149,6 +149,7 @@ test {
 farm {
     httpPort = fcrepoWebPort
     integrationTestTask = 'integrationTest'
+
     systemProperty 'fcrepo.home', 'build/tmp/fcrepo-data'
     systemProperty 'fcrepo.modeshape.configuration', 'classpath:/config/file-simple/repository.json'
     systemProperty 'fcrepo.dynamic.test.port', fcrepoWebPort

acrepo-services-entailment/build.gradle

 apply plugin: 'osgi'
 
 description = 'RDF simple entailment service bundle'
+
+ext {
+    moduleName = 'edu.amherst.acdc.services.entailment'
+}
+
 dependencies {
     compile group: 'org.apache.jena', name: 'jena-osgi', version: jenaVersion
     compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
 
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
     testCompile group: 'commons-io', name: 'commons-io', version: commonsIoVersion
+    testCompile group: 'javax.activation', name: 'javax.activation-api', version: activationApiVersion
+    testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: jaxbVersion
     testCompile group: 'junit', name: 'junit', version: junitVersion
     testCompile group: 'org.apache.commons', name: 'commons-compress', version: commonsCompressVersion
 }
@@ -18,8 +25,9 @@ jar {
         vendor project.vendor
         license project.license
 
+        instruction 'Automatic-Module-Name', moduleName
         instruction 'Import-Package', "org.apache.camel,${defaultOsgiImports}"
-        instruction 'Export-Package', "edu.amherst.acdc.services.entailment;version=${projectOsgiVersion}"
+        instruction 'Export-Package', "${moduleName};version=${projectOsgiVersion}"
     }
 }
 

acrepo-services-inference/build.gradle

 apply plugin: 'osgi'
 
 description = 'RDF inference service bundle'
+
+ext {
+    moduleName = 'edu.amherst.acdc.services.inference'
+}
+
 dependencies {
     compile group: 'org.apache.jena', name: 'jena-osgi', version: jenaVersion
     compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
 
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion