Removes dependency frepo-kernel-api

acrepo-idiomatic/pom.xml

@@ -58,10 +58,6 @@
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-camel</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.fcrepo</groupId>
-      <artifactId>fcrepo-kernel-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.fcrepo.camel</groupId>
       <artifactId>fcrepo-camel</artifactId>

acrepo-idiomatic/src/main/resources/OSGI-INF/blueprint/blueprint.xml

@@ -24,7 +24,7 @@
 
   <reference id="dataSource" interface="javax.sql.DataSource" filter="(osgi.jndi.service.name=idiomaticds)"/>
 
-  <reference id="minterService" interface="org.fcrepo.kernel.api.services.functions.UniqueValueSupplier" filter="(osgi.jndi.service.name=minter)" />
+  <reference id="minterService" interface="java.util.function.Supplier" filter="(osgi.jndi.service.name=minter)" />
 
   <!-- component-wide configuration of jdbc -->
   <bean id="sql" class="org.apache.camel.component.sql.SqlComponent">

acrepo-idiomatic/src/test/java/edu/amherst/acdc/idiomatic/RouteTest.java

@@ -26,7 +26,7 @@ import java.util.Properties;
 import javax.sql.DataSource;
 
 import edu.amherst.acdc.mint.MinterService;
-import org.fcrepo.kernel.api.services.functions.UniqueValueSupplier;
+import java.util.function.Supplier;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
@@ -84,7 +84,7 @@ public class RouteTest extends CamelBlueprintTestSupport {
     protected void addServicesOnStartup(final Map<String, KeyValueHolder<Object, Dictionary>> services) {
         services.put(DataSource.class.getName(),
                 asService(new EmbeddedDataSource(), "osgi.jndi.service.name", "idiomaticds"));
-        services.put(UniqueValueSupplier.class.getName(),
+        services.put(Supplier.class.getName(),
                 asService(new MinterService(MINT_LENGTH), "osgi.jndi.service.name", "minter"));
     }
 

acrepo-karaf/src/main/resources/features.xml

@@ -4,7 +4,6 @@
   <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
   <repository>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</repository>
   <repository>mvn:org.ops4j.pax.jdbc/pax-jdbc-features/${pax-jdbc.version}/xml/features</repository>
-  <repository>mvn:org.fcrepo/fcrepo-karaf/${fcrepo.version}/xml/features</repository>
 
   <feature name="acrepo-idiomatic" version="${project.version}" resolver="(obr)" start-level="50">
     <details>Installs the id mapping service</details>
@@ -19,8 +18,6 @@
     <feature version="${activemq.version}">activemq-camel</feature>
     <feature version="${fcrepo-camel.version}">fcrepo-camel</feature>
 
-    <feature version="${fcrepo.version}">fcrepo-kernel-api</feature>
-
     <bundle dependency="true">mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox.version}</bundle>
 
     <bundle>mvn:edu.amherst.acdc/acrepo-idiomatic/${project.version}</bundle>
@@ -45,8 +42,6 @@
   <feature name="acrepo-mint-service" version="${project.version}" resolver="(obr)" start-level="50">
     <details>Installs the id minter</details>
 
-    <feature version="${fcrepo.version}">fcrepo-kernel-api</feature>
-
     <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang.version}</bundle>
 
     <bundle>mvn:edu.amherst.acdc/acrepo-mint-service/${project.version}</bundle>

acrepo-mint-service/pom.xml

@@ -37,10 +37,6 @@
     </properties>
 
     <dependencies>
-      <dependency>
-        <groupId>org.fcrepo</groupId>
-        <artifactId>fcrepo-kernel-api</artifactId>
-      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>

acrepo-mint-service/src/main/java/edu/amherst/acdc/mint/MinterService.java

@@ -17,13 +17,13 @@ package edu.amherst.acdc.mint;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
 
-import org.fcrepo.kernel.api.services.functions.UniqueValueSupplier;
+import java.util.function.Supplier;
 
 /**
  * @author acoburn
  * @since 9/14/15
  */
-public class MinterService implements UniqueValueSupplier {
+public class MinterService implements Supplier {
 
     private int length;
 

acrepo-mint-service/src/main/resources/OSGI-INF/blueprint/minter-service.xml

@@ -35,7 +35,7 @@
     <argument value="${minter.length}"/>
   </bean>
 
-  <service ref="minterServiceBean" interface="org.fcrepo.kernel.api.services.functions.UniqueValueSupplier">
+  <service ref="minterServiceBean" interface="java.util.function.Supplier">
     <service-properties>
       <entry key="osgi.jndi.service.name" value="minter"/>
     </service-properties>

pom.xml

@@ -40,7 +40,6 @@
     <commons-io.version>2.5</commons-io.version>
     <derby.version>10.12.1.1</derby.version>
     <fcrepo-camel.version>4.4.2</fcrepo-camel.version>
-    <fcrepo.version>4.5.1</fcrepo.version>
     <junit.version>4.12</junit.version>
     <jsonld.version>0.8.3</jsonld.version>
     <logback.version>1.1.7</logback.version>
@@ -130,11 +129,6 @@
         <artifactId>jsonld-java</artifactId>
         <version>${jsonld.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.fcrepo</groupId>
-        <artifactId>fcrepo-kernel-api</artifactId>
-        <version>${fcrepo.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.fcrepo.camel</groupId>
         <artifactId>fcrepo-camel</artifactId>