scottk/siembol
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/siembol.git synced 2025-11-03 20:07:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

config editor: fixing updating matadata during submitting configuration (#811)

Browse Source 
* config editor: fixing updating matadata during submitting configuration

* adding tests for release

* minor cleaning

* cleaning

* adding exception message

* adding test case test
This commit is contained in:
Marian Novotny
2022-11-22 11:27:59 +00:00
committed by GitHub
parent 37c3675437
commit 661ff6c242
26 changed files with 249 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
alerting/alerting-core/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -35,7 +35,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>

4
alerting/alerting-spark/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -23,7 +23,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>jackson-databind</artifactId>

4
alerting/alerting-storm/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -51,7 +51,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

2
alerting/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<modules>
<module>alerting-core</module>

4
config-editor/config-editor-core/pom.xml
View File

@@ -9,13 +9,13 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>

61
config-editor/config-editor-core/src/main/java/uk/co/gresearch/siembol/configeditor/configinfo/JsonConfigInfoProvider.java
View File

@@ -1,4 +1,7 @@
package uk.co.gresearch.siembol.configeditor.configinfo;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -29,9 +32,11 @@ public class JsonConfigInfoProvider implements ConfigInfoProvider {
private static final String PREFIX_NAME_FORMAT = "%s-%s";
private static final String PREFIX_NAME_CHECK_FORMAT = "%s_%s";
private static final String JSON_PATH_FIELD_SEARCH_FORMAT = "$..%s";
private static final String UNEXPECTED_CONFIGURATION_MSG = "Unexpected configuration format. " +
"Json object is expected.";
private final String configNameField;
private String configNamePrefixField;
private final String configNamePrefixField;
private final String configAuthorField;
private final String configVersionField;
private final String configsVersionField;
@@ -116,17 +121,17 @@ public class JsonConfigInfoProvider implements ConfigInfoProvider {
configInfo.setCommitMessage(commitMsg);
Map<String, Optional<String>> files = new HashMap<>();
String updatedConfig = config.replaceFirst(ruleVersionRegex,
String.format(ruleVersionFormat, newConfigVersion));
StringBuilder sb = new StringBuilder(config);
replaceInJson(sb, configVersionField, ruleVersionRegex, String.format(ruleVersionFormat, newConfigVersion));
if (!configAuthor.equals(configInfo.getCommitter())) {
//NOTE: we consider author to be the last committer,
// auth logic can be added here when needed
updatedConfig = updatedConfig.replaceFirst(ruleAuthorRegex,
replaceInJson(sb, configAuthorField, ruleAuthorRegex,
String.format(ruleAuthorFormat, configInfo.getCommitter()));
}
files.put(String.format(configFilenameFormat, configName), Optional.of(updatedConfig));
files.put(String.format(configFilenameFormat, configName), Optional.of(sb.toString()));
configInfo.setFilesContent(files);
configInfo.setConfigInfoType(configType);
@@ -149,11 +154,12 @@ public class JsonConfigInfoProvider implements ConfigInfoProvider {
configInfo.setCommitMessage(String.format(commitTemplateRelease, newRulesVersion));
String updatedRelease = release.replaceFirst(releaseVersionRegex,
StringBuilder sb = new StringBuilder(release);
replaceInJson(sb, configsVersionField, releaseVersionRegex,
String.format(releaseVersionFormat, newRulesVersion));
Map<String, Optional<String>> files = new HashMap<>();
files.put(releaseFilename, Optional.of(updatedRelease));
files.put(releaseFilename, Optional.of(sb.toString()));
configInfo.setFilesContent(files);
configInfo.setConfigInfoType(configType);
@@ -196,7 +202,7 @@ public class JsonConfigInfoProvider implements ConfigInfoProvider {
.stream()
.filter(x -> x.getFileName().equals(releaseFilename))
.findFirst();
if (!release.isPresent()) {
if (release.isEmpty()) {
LOG.warn(MISSING_FILENAME_MSG, releaseFilename);
return INIT_RELEASE_VERSION;
}
@@ -224,6 +230,38 @@ public class JsonConfigInfoProvider implements ConfigInfoProvider {
return configType;
}
private void replaceInJson(StringBuilder sb, String fieldName, String replacePattern, String replacement) {
int fieldOffset = getFieldOffset(fieldName, sb.toString());
String updatedPart = sb.substring(fieldOffset).replaceFirst(replacePattern, replacement);
sb.setLength(fieldOffset);
sb.append(updatedPart);
}
private int getFieldOffset(String fieldName, String json) {
JsonFactory factory = new JsonFactory();
try(JsonParser parser = factory.createParser(json)) {
if (parser.nextToken() != JsonToken.START_OBJECT) {
throw new IllegalStateException(UNEXPECTED_CONFIGURATION_MSG);
}
while (parser.nextToken() != null) {
if (fieldName.equals(parser.currentName())) {
return Long.valueOf(parser.getTokenLocation().getCharOffset()).intValue();
}
parser.nextToken();
if (parser.currentToken() == JsonToken.START_OBJECT
|| parser.currentToken() == JsonToken.START_ARRAY) {
parser.skipChildren();
}
}
} catch (IOException e) {
throw new IllegalStateException(e);
}
return -1;
}
public static class Builder {
private static final String COMMIT_TEMPLATE_NEW = "Adding new %s: %%s";
private static final String COMMIT_TEMPLATE_UPDATE = "Updating %s: %%s to version: %%d";
@@ -243,14 +281,14 @@ public class JsonConfigInfoProvider implements ConfigInfoProvider {
private String configsVersionField;
private String configFilenameFormat = "%s.json";
private String releaseFilename = "rules.json";
private String jsonFileSuffix = "json";
private final String jsonFileSuffix = "json";
private String ruleVersionRegex;
private String releaseVersionRegex;
private String ruleAuthorRegex;
private String ruleVersionFormat;
private String ruleAuthorFormat;
private String releaseVersionFormat;
private Pattern ruleNamePattern = Pattern.compile("^[a-zA-Z0-9_\\-]+$");
private final Pattern ruleNamePattern = Pattern.compile("^[a-zA-Z0-9_\\-]+$");
private String commitTemplateNew = RULE_COMMIT_TEMPLATE_NEW;
private String commitTemplateUpdate = RULE_COMMIT_TEMPLATE_UPDATE;
private String commitTemplateRelease = RULE_COMMIT_TEMPLATE_RELEASE;
@@ -301,8 +339,7 @@ public class JsonConfigInfoProvider implements ConfigInfoProvider {
|| configVersionField == null
|| configsVersionField == null
|| configFilenameFormat == null
|| releaseFilename == null
|| jsonFileSuffix == null) {
|| releaseFilename == null) {
throw new IllegalArgumentException(MISSING_ARGUMENTS);
}

136
config-editor/config-editor-core/src/test/java/uk/co/gresearch/siembol/configeditor/configinfo/JsonRuleConfigInfoProviderTest.java
View File

@@ -49,6 +49,39 @@ public class JsonRuleConfigInfoProviderTest {
}
""";
private final String releaseWithDuplicateAfter = """
{
"rules_version" : 1,
"rules": [{
"rule_name": "info_provider_test",
"rule_author": "mark",
"rule_version": 12,
"rule_description": "Test rule",
"enrichments": {
"rules_version" : 1
},
"actions": { }
}]
}
""";
private final String releaseWithDuplicateBefore = """
{
"rules": [{
"rule_name": "info_provider_test",
"rule_author": "mark",
"rule_version": 12,
"rule_description": "Test rule",
"enrichments": {
"rules_version" : 1
},
"actions": { }
}],
"rules_version" : 1
}
""";
private final String releaseNoRules = """
{
"rules_version" : 1,
@@ -99,6 +132,35 @@ public class JsonRuleConfigInfoProviderTest {
}
""";
private final String testRuleDuplicateMetadataFieldsAfter = """
{
"rule_name": "info_provider-test",
"rule_author": "john",
"rule_version": 12345,
"rule_description": "Test rule",
"enrichments": {
"rule_name": "duplicate_name",
"rule_author": "josh",
"rule_version": 1
},
"actions": { }
}
""";
private final String testRuleDuplicateMetadataFieldsBefore = """
{
"enrichments": {
"rule_name": "duplicate_name",
"rule_author": "josh",
"rule_version": 1
},
"rule_name": "info_provider-test",
"rule_author": "john",
"rule_version": 12345,
"rule_description": "Test rule",
"actions": { }
}
""";
private final ConfigInfoProvider infoProvider = JsonRuleConfigInfoProvider.create();
private UserInfo steve;
@@ -116,7 +178,7 @@ public class JsonRuleConfigInfoProviderTest {
}
@Test
public void RuleInfoTestChangeAuthor() {
public void ruleInfoTestChangeAuthor() {
ConfigInfo info = infoProvider.getConfigInfo(steve, testRule);
Assert.assertEquals(12345, info.getOldVersion());
Assert.assertEquals(12346, info.getVersion());
@@ -275,4 +337,76 @@ public class JsonRuleConfigInfoProviderTest {
boolean isInRelease = infoProvider.isConfigInRelease(releaseThreeRules, "info_provider");
Assert.assertFalse(isInRelease);
}
@Test
public void ruleInfoTestUnchangedAuthorDuplicateFieldsBefore() {
ConfigInfo info = infoProvider.getConfigInfo(john, testRuleDuplicateMetadataFieldsBefore);
Assert.assertEquals(12345, info.getOldVersion());
Assert.assertEquals("john", info.getCommitter());
Assert.assertEquals("Updating rule: info_provider-test to version: 12346", info.getCommitMessage());
Assert.assertEquals("john@secret.net", info.getCommitterEmail());
Assert.assertEquals(1, info.getFilesContent().size());
Assert.assertTrue(info.getFilesContent().containsKey("info_provider-test.json"));
Assert.assertTrue(info.getFilesContent()
.get("info_provider-test.json").get().indexOf("\"rule_version\": 12346,") > 0);
Assert.assertTrue(info.getFilesContent()
.get("info_provider-test.json").get().indexOf("\"rule_author\": \"john\",") > 0);
Assert.assertFalse(info.isNewConfig());
Assert.assertEquals(ConfigInfoType.RULE, info.getConfigInfoType());
}
@Test
public void ruleInfoTestUnchangedAuthorDuplicateFieldsAfter() {
ConfigInfo info = infoProvider.getConfigInfo(john, testRuleDuplicateMetadataFieldsAfter);
Assert.assertEquals(12345, info.getOldVersion());
Assert.assertEquals("john", info.getCommitter());
Assert.assertEquals("Updating rule: info_provider-test to version: 12346", info.getCommitMessage());
Assert.assertEquals("john@secret.net", info.getCommitterEmail());
Assert.assertEquals(1, info.getFilesContent().size());
Assert.assertTrue(info.getFilesContent().containsKey("info_provider-test.json"));
Assert.assertTrue(info.getFilesContent()
.get("info_provider-test.json").get().indexOf("\"rule_version\": 12346,") > 0);
Assert.assertTrue(info.getFilesContent()
.get("info_provider-test.json").get().indexOf("\"rule_author\": \"john\",") > 0);
Assert.assertFalse(info.isNewConfig());
Assert.assertEquals(ConfigInfoType.RULE, info.getConfigInfoType());
}
@Test
public void releaseTestWithDuplicateAfter() {
ConfigInfo info = infoProvider.getReleaseInfo(steve, releaseWithDuplicateAfter);
Assert.assertEquals(info.getOldVersion(), 1);
Assert.assertEquals(info.getVersion(), 2);
Assert.assertEquals(info.getCommitter(), "steve");
Assert.assertEquals(info.getCommitMessage(), "Rules released to version: 2");
Assert.assertEquals(info.getCommitter(), "steve");
Assert.assertEquals(info.getCommitterEmail(), steve.getEmail());
Assert.assertEquals(info.getFilesContent().size(), 1);
Assert.assertEquals(info.getFilesContent().containsKey("rules.json"), true);
Assert.assertEquals(info.getFilesContent()
.get("rules.json").get().indexOf("\"rules_version\": 2,") > 0, true);
}
@Test
public void releaseTestWithDuplicateBefore() {
ConfigInfo info = infoProvider.getReleaseInfo(steve, releaseWithDuplicateBefore);
Assert.assertEquals(info.getOldVersion(), 1);
Assert.assertEquals(info.getVersion(), 2);
Assert.assertEquals(info.getCommitter(), "steve");
Assert.assertEquals(info.getCommitMessage(), "Rules released to version: 2");
Assert.assertEquals(info.getCommitter(), "steve");
Assert.assertEquals(info.getCommitterEmail(), steve.getEmail());
Assert.assertEquals(info.getFilesContent().size(), 1);
Assert.assertEquals(info.getFilesContent().containsKey("rules.json"), true);
Assert.assertEquals(info.getFilesContent()
.get("rules.json").get().indexOf("\"rules_version\": 2") > 0, true);
}
}

15
config-editor/config-editor-core/src/test/java/uk/co/gresearch/siembol/configeditor/configinfo/TestCaseConfigInfoProviderTest.java
View File

@@ -12,13 +12,9 @@ import java.util.ArrayList;
public class TestCaseConfigInfoProviderTest {
private final String testCase = """
{
"test_case_name": "test_case",
"version": 12345,
"author": "john",
"config_name": "syslog",
"description": "unitest test case",
"test_specification": {
"secret": true
"secret": true,
"version": 1
},
"assertions": [
{
@@ -37,7 +33,12 @@ public class TestCaseConfigInfoProviderTest {
"description": "skipped assertion",
"active": false
}
]
],
"test_case_name": "test_case",
"version": 12345,
"author": "john",
"config_name": "syslog",
"description": "unitest test case"
}
""";

18
config-editor/config-editor-rest/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencyManagement>
<dependencies>
@@ -56,7 +56,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -67,22 +67,22 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-services</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-sync</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -93,7 +93,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-app</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -104,7 +104,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -115,7 +115,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>responding-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

14
config-editor/config-editor-services/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -41,32 +41,32 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-app</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>responding-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>

8
config-editor/config-editor-sync/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -20,17 +20,17 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-app</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

2
config-editor/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<modules>
<module>config-editor-core</module>

4
deployment/siembol-monitoring/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencyManagement>
@@ -37,7 +37,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

4
deployment/storm-topology-manager/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencyManagement>
@@ -43,7 +43,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

6
enriching/enriching-core/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -35,12 +35,12 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>

4
enriching/enriching-storm/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -75,7 +75,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

2
enriching/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<modules>
<module>enriching-core</module>

6
parsing/parsing-app/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -39,12 +39,12 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>

4
parsing/parsing-core/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -50,7 +50,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>

4
parsing/parsing-storm/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -75,7 +75,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-app</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

2
parsing/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<modules>
<module>parsing-core</module>

2
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<name>siembol</name>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<description>A scalable, advanced security analytics framework based on open-source big data technologies.</description>
<inceptionYear>2019</inceptionYear>
<url>https://siembol.io/</url>

2
responding/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<modules>
<module>responding-core</module>

6
responding/responding-core/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>responding</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -35,12 +35,12 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>

6
responding/responding-stream/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>responding</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencyManagement>
<dependencies>
@@ -51,7 +51,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -62,7 +62,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>responding-core</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>

2
siembol-common/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.6.6-SNAPSHOT</version>
<version>2.6.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>