Upstream updates

Author: acoburn

pom.xml

@@ -40,7 +40,7 @@
 
     <cassandra.test.version>3.11.3</cassandra.test.version>
     <cassandra.driver.version>3.7.0</cassandra.driver.version>
-    <jena.version>3.11.0</jena.version>
+    <jena.version>3.12.0</jena.version>
     <commons.rdf.version>0.5.0</commons.rdf.version>
     <thorntail.version>2.4.0.Final</thorntail.version>
     <tamaya.version>0.4-incubating-SNAPSHOT</tamaya.version>

webapp/src/main/java/edu/si/trellis/CassandraServiceBundler.java

@@ -2,10 +2,14 @@
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 
 import org.trellisldp.api.*;
+import org.trellisldp.http.core.EtagGenerator;
+import org.trellisldp.http.core.ServiceBundler;
+import org.trellisldp.http.core.TimemapGenerator;
 import org.trellisldp.io.JenaIOService;
 
 /**
@@ -30,8 +34,9 @@ public class CassandraServiceBundler implements ServiceBundler {
     @Inject
     private AgentService agentService;
 
-    @Inject
-    private NamespaceService namespaceService;
+    @Produces
+    @ApplicationScoped
+    private NamespaceService namespaceService = new NoopNamespaceService();
 
     @Produces
     @ApplicationScoped
@@ -43,6 +48,15 @@ public class CassandraServiceBundler implements ServiceBundler {
     @Inject
     private CacheService<String, String> cacheService;
 
+    @Inject
+    private TimemapGenerator timemapGenerator;
+
+    @Inject
+    private EtagGenerator etagGenerator;
+
+    @Inject
+    private Instance<ConstraintService> constraintServices;
+
     @PostConstruct
     void init() {
         this.ioService = new JenaIOService(namespaceService, null, cacheService, "", "");
@@ -82,4 +96,19 @@ public MementoService getMementoService() {
     public EventService getEventService() {
         return eventService;
     }
+
+    @Override
+    public EtagGenerator getEtagGenerator() {
+        return etagGenerator;
+    }
+
+    @Override
+    public TimemapGenerator getTimemapGenerator() {
+        return timemapGenerator;
+    }
+
+    @Override
+    public Iterable<ConstraintService> getConstraintServices() {
+        return constraintServices;
+    }
 }