ReleasePrep (#15)

* Release preparation - correcting dependencies.

* Release preparation - correcting dependencies.

* Release preparation - changing image naming.

* Release preparation - updating release notes.

* Release preparation - dropping duplicate dependency.

* Release preparation - updating to recent release of classification service.

* Release preparation - updating workerframework version.

Author: pcrookshpe

pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.github.cafapi</groupId>
         <artifactId>caf-common</artifactId>
-        <version>1.11.0-218</version>
+        <version>1.12.0-232</version>
         <relativePath />
     </parent>
 
@@ -82,11 +82,14 @@
     </developers>
 
     <properties>
-        <caf.boilerplate.service.version>2.2.0-SNAPSHOT</caf.boilerplate.service.version>
-        <caf.classification.service.version>1.1.0-SNAPSHOT</caf.classification.service.version>
+        <caf.boilerplate.service.version>2.1.0-48</caf.boilerplate.service.version>
+        <caf.classification.service.version>1.1.0-16</caf.classification.service.version>
         <caf.container.policy.admin.name>cafdataprocessing/policy-admin-elasticsearch:1.0.0</caf.container.policy.admin.name>
         <caf.corepolicy.version>1.0.0-4</caf.corepolicy.version>
-        <caf.worker.policy.version>1.2.0-SNAPSHOT</caf.worker.policy.version>
+        <caf.worker.policy.version>1.3.0-48</caf.worker.policy.version>
+        <dockerHubOrganization>cafdataprocessing</dockerHubOrganization>
+        <dockerDataProcessingOrg>${dockerImagePrefix}${dockerHubOrganization}${dockerOrgSeperator}</dockerDataProcessingOrg>
+        <dockerProjectVersion>${dockerVersionSeperator}${project.version}</dockerProjectVersion>
     </properties>
 
     <dependencyManagement>
@@ -147,7 +150,7 @@
             <dependency>
                 <groupId>com.github.workerframework</groupId>
                 <artifactId>worker-framework</artifactId>
-                <version>1.9.0-260</version>
+                <version>2.0.0-279</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

processing-service-container/pom.xml

@@ -31,7 +31,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <caf.container.processing.service.name>cafinternal/prereleases:processing-service-${project.version}</caf.container.processing.service.name>
+        <caf.container.processing.service.name>${dockerDataProcessingOrg}processing-service${dockerProjectVersion}</caf.container.processing.service.name>
 
         <internal.hibernate.connectionstring>jdbc:postgresql://corepolicydb-postgres:5432/&lt;dbname&gt;</internal.hibernate.connectionstring>
         <hibernate.user>postgres</hibernate.user>

release-notes-1.2.0.md

@@ -1,9 +1,18 @@
-!not-ready-for-release!
 
 #### Version Number
 ${version-number}
 
 #### New Features
-* [CAF-3156](https://jira.autonomy.com/browse/CAF-3156): Use latest classification-service libraries which add classificationTarget property to classifications which controls the scope for classification evaluation e.g. root document only, root doc and children that were passed.
+- [CAF-3056](https://jira.autonomy.com/browse/CAF-3056): Create a Family Task Submitter  
+The "Data-Processing-Family-Task-Submitter" has been added which queries Elasticsearch using a family reference for a document that has already been indexed, reconstitutes the document and its attachments to construct a policy message, and sends this to a specified policy worker queue.
+
+- [CAF-3156](https://jira.autonomy.com/browse/CAF-3156): Data Processing Family Classification  
+Uses the latest classification-service libraries which add the classificationTarget property to classifications, allowing control of the scope of classification evaluation e.g. root document only, or root document and children that were passed.
+
+- [CAF-3198](https://jira.autonomy.com/browse/CAF-3198): Extract Workflow Initialization Logic to a separate project  
+The data-processing-initialization library has been added which is a utility project with logic to initialize base data for the Processing and Classification workflows and the Boilerplate expressions and tags.
+
+- [CAF-3290](https://jira.autonomy.com/browse/CAF-3290): Add ability to extend or override default workflow  
+Extended the workflow initialization code with the ability to use an overlay type of file or structure which can then be merged into the base definition. This allows use of the default workflow but with replacements/extensions injected during provisioning, thus simplifying upgrades.
 
 #### Known Issues

utils/data-processing-databases-container/pom.xml

@@ -31,7 +31,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <caf.container.databases.name>cafinternal/prereleases:data-processing-databases-${project.version}</caf.container.databases.name>
+        <caf.container.databases.name>${dockerDataProcessingOrg}data-processing-databases${dockerProjectVersion}</caf.container.databases.name>
         <caf.container.javapostgres.name>cafapi/java-postgres:1.11.0-218</caf.container.javapostgres.name>
     </properties>
 

utils/data-processing-family-task-submitter/pom.xml

@@ -64,15 +64,9 @@
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>com.hp.autonomy.corepolicy</groupId>
-            <artifactId>autonomy-corepolicy</artifactId>
-            <version>3.3.7-SNAPSHOT</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>com.hp.autonomy.corepolicy</groupId>
-            <artifactId>autonomy-corepolicy-policyworker-shared</artifactId>
-            <version>1.11.1</version>
+            <groupId>com.github.cafdataprocessing</groupId>
+            <artifactId>corepolicy-condition-engine</artifactId>
+            <version>1.0.0-4</version>
             <type>jar</type>
         </dependency>
         <dependency>
@@ -94,14 +88,12 @@
             <artifactId>codec-json</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.hpe.caf</groupId>
-            <artifactId>caf-api</artifactId>
-            <version>12.0.0-SNAPSHOT</version>
+            <groupId>com.github.workerframework</groupId>
+            <artifactId>worker-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.hpe.caf.util</groupId>
+            <groupId>com.github.workerframework</groupId>
             <artifactId>util-rabbitmq</artifactId>
-            <version>2.2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

utils/data-processing-family-task-submitter/src/main/java/com/github/cafdataprocessing/utilities/familytasksubmitter/Main.java

@@ -21,7 +21,7 @@
 import com.github.cafdataprocessing.utilities.familytasksubmitter.elasticsearch.ElasticQuery;
 import com.github.cafdataprocessing.utilities.familytasksubmitter.taskmessage.Message;
 import com.google.common.collect.Multimap;
-import com.hp.autonomy.policyworker.shared.Document;
+import com.github.cafdataprocessing.worker.policy.shared.Document;
 import com.hpe.caf.api.CodecException;
 import com.hpe.caf.api.ConfigurationException;
 import java.io.IOException;

utils/data-processing-family-task-submitter/src/main/java/com/github/cafdataprocessing/utilities/familytasksubmitter/document/DocumentExtractor.java

@@ -15,8 +15,8 @@
  */
 package com.github.cafdataprocessing.utilities.familytasksubmitter.document;
 
+import com.github.cafdataprocessing.corepolicy.multimap.utils.CaseInsensitiveMultimap;
 import com.google.common.collect.Multimap;
-import com.hp.autonomy.corepolicy.multimap.utils.CaseInsensitiveMultimap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

utils/data-processing-family-task-submitter/src/main/java/com/github/cafdataprocessing/utilities/familytasksubmitter/document/HierarchyBuilder.java

@@ -17,11 +17,10 @@
 
 import com.github.cafdataprocessing.utilities.familytasksubmitter.FamilyTaskSubmitterConstants;
 import com.google.common.collect.Multimap;
-import com.hp.autonomy.policyworker.shared.Document;
+import com.github.cafdataprocessing.worker.policy.shared.Document;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
-import java.util.Set;
 
 /**
  *

utils/data-processing-family-task-submitter/src/main/java/com/github/cafdataprocessing/utilities/familytasksubmitter/taskmessage/Message.java

@@ -16,8 +16,8 @@
 package com.github.cafdataprocessing.utilities.familytasksubmitter.taskmessage;
 
 import com.github.cafdataprocessing.utilities.familytasksubmitter.FamilyTaskSubmitterConstants;
-import com.hp.autonomy.policyworker.shared.Document;
-import com.hp.autonomy.policyworker.shared.PolicyWorkerConstants;
+import com.github.cafdataprocessing.worker.policy.shared.Document;
+import com.github.cafdataprocessing.worker.policy.shared.PolicyWorkerConstants;
 import com.hpe.caf.api.Codec;
 import com.hpe.caf.api.CodecException;
 import com.hpe.caf.api.worker.TaskMessage;

utils/data-processing-family-task-submitter/src/main/java/com/github/cafdataprocessing/utilities/familytasksubmitter/taskmessage/PolicyTaskMessagesFactory.java

@@ -15,8 +15,9 @@
  */
 package com.github.cafdataprocessing.utilities.familytasksubmitter.taskmessage;
 
-import com.hp.autonomy.policyworker.shared.TaskData;
-import com.hp.autonomy.policyworker.shared.Document;
+import com.github.cafdataprocessing.worker.policy.shared.Document;
+import com.github.cafdataprocessing.worker.policy.shared.TaskData;
+
 import java.util.Objects;
 
 /**