Bumping versions, using eventID instead of locally-generated UUID so …

…URIs match external triplestore (FCREPO-1507)
fcrepo-exts · Jun 4, 2015 · 8aabb1b · 8aabb1b
1 parent 5c7912a
commit 8aabb1b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/audit-triplestore-web/pom.xml b/audit-triplestore-web/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fcrepo.camel</groupId>
     <artifactId>fcrepo-camel-toolbox</artifactId>
-    <version>4.1.2-SNAPSHOT</version>
+    <version>4.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>audit-triplestore-web</artifactId>

diff --git a/audit-triplestore/pom.xml b/audit-triplestore/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fcrepo.camel</groupId>
     <artifactId>fcrepo-camel-toolbox</artifactId>
-    <version>4.1.2-SNAPSHOT</version>
+    <version>4.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>audit-triplestore</artifactId>

diff --git a/audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/AuditSparqlProcessor.java b/audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/AuditSparqlProcessor.java
@@ -29,7 +29,6 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.TimeZone;
-import java.util.UUID;
 
 import org.fcrepo.audit.AuditUtils;
 import org.fcrepo.camel.JmsHeaders;
@@ -66,8 +65,8 @@ public class AuditSparqlProcessor implements Processor {
     public void process(final Exchange exchange) throws Exception {
         final Message in = exchange.getIn();
         final String eventURIBase = in.getHeader(AuditHeaders.EVENT_BASE_URI, String.class);
-        final String UUIDString = UUID.randomUUID().toString();
-        final UriRef eventURI = new UriRef(eventURIBase + "/" + UUIDString);
+        final String eventID = in.getHeader(JmsHeaders.EVENT_ID, String.class);
+        final UriRef eventURI = new UriRef(eventURIBase + "/" + eventID);
         final Set<Triple> triples = triplesForMessage(in, eventURI);
 
         // serialize triples

diff --git a/indexing-solr-web/pom.xml b/indexing-solr-web/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fcrepo.camel</groupId>
     <artifactId>fcrepo-camel-toolbox</artifactId>
-    <version>4.1.2-SNAPSHOT</version>
+    <version>4.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>indexing-solr-web</artifactId>

diff --git a/indexing-solr/pom.xml b/indexing-solr/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>fcrepo-camel-toolbox</artifactId>
     <groupId>org.fcrepo.camel</groupId>
-    <version>4.1.2-SNAPSHOT</version>
+    <version>4.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>indexing-solr</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
   <groupId>org.fcrepo.camel</groupId>
   <artifactId>fcrepo-camel-toolbox</artifactId>
   <packaging>pom</packaging>
-  <version>4.1.2-SNAPSHOT</version>
+  <version>4.2.1-SNAPSHOT</version>
 
   <name>Fedora4 Camel workflows</name>
   <description>A collection of camel-based event-driven workflows</description>
@@ -283,50 +283,50 @@
       <dependency>
         <groupId>org.fcrepo</groupId>
         <artifactId>fcrepo-jms</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>org.fcrepo</groupId>
         <artifactId>fcrepo-http-api</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>org.fcrepo</groupId>
         <artifactId>fcrepo-configs</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>org.fcrepo</groupId>
         <artifactId>fcrepo-transform</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>org.fcrepo</groupId>
         <artifactId>fcrepo-auth-common</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>org.fcrepo</groupId>
         <artifactId>fcrepo-http-commons</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.1-SNAPSHOT</version>
         <scope>test</scope>
         <type>test-jar</type>
       </dependency>
 
       <dependency>
         <groupId>org.fcrepo</groupId>
         <artifactId>fcrepo-metrics</artifactId>
-        <version>4.1.2-SNAPSHOT</version>
+        <version>4.2.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>