Merge pull request #11 from Ericsson/master

SC rulesupdated. POM updated for tomcat (#57)

Author: ned29

pom.xml

@@ -81,7 +81,7 @@
          <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>

src/main/resources/TestSourceChangeObjectRules.json

@@ -7,7 +7,7 @@
     "IdRule": "meta.id",
     "IdentifyRules": "links | [?type=='CHANGE'].target",
     "MatchIdRules": {"_id": "%IdentifyRules_objid%"},
-    "ExtractionRules": "{id : meta.id, submission: {sourceChanges :[{eventId : meta.id, time : meta.time, svnIdentifier:data.svnIdentifier, submitter:data.submitter}]}}",
+    "ExtractionRules": "{id : meta.id, submission: {sourceChanges :[{eventId : meta.id, time : meta.time, gitIdentifier:data.gitIdentifier, svnIdentifier: data.svnIdentifier, ccCompositeIdentifier:data.ccCompositeIdentifier, hgIdentifier: data.hgIdentifier, submitter:data.submitter}]}}",
     "MergeResolverRules": null,
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules": "",

src/test/resources/TestSourceChangeObjectRules.json

@@ -7,7 +7,7 @@
     "IdRule": "meta.id",
     "IdentifyRules": "links | [?type=='CHANGE'].target",
     "MatchIdRules": {"_id": "%IdentifyRules_objid%"},
-    "ExtractionRules": "{id : meta.id, submission: {sourceChanges :[{eventId : meta.id, time : meta.time, svnIdentifier:data.svnIdentifier, submitter:data.submitter}]}}",
+    "ExtractionRules": "{id : meta.id, submission: {sourceChanges :[{eventId : meta.id, time : meta.time, gitIdentifier:data.gitIdentifier, svnIdentifier: data.svnIdentifier, ccCompositeIdentifier:data.ccCompositeIdentifier, hgIdentifier: data.hgIdentifier, submitter:data.submitter}]}}",
     "MergeResolverRules": null,
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules": "",

src/test/resources/aggregatedSourceChangeObject.json

@@ -31,12 +31,15 @@
                   "email":"jane.doe@company.com",
                   "group":"Team Wombats"
                },
+               "gitIdentifier" : null,
                "svnIdentifier":{
                   "repoName":"Mainline",
                   "repoUri":"svn://repohost/mainline",
                   "directory":"trunk",
                   "revision":42
                },
+               "ccCompositeIdentifier" : null,
+               "hgIdentifier" : null,
                "time":1234567890
             }
          ]