scottk/siembol
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/siembol.git synced 2025-11-02 19:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Config editor rest: cache release and admin config response (#542)

Browse Source 
* adding release and admin config caching

* increasing siembol version
This commit is contained in:
Marian Novotny
2022-02-17 15:19:14 +00:00
committed by GitHub
parent d88e94e833
commit 426d6a6394
28 changed files with 167 additions and 63 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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -35,7 +35,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -23,7 +23,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -51,7 +51,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>

24
config-editor/config-editor-core/src/main/java/uk/co/gresearch/siembol/configeditor/configstore/ConfigRelease.java
View File

@@ -12,6 +12,9 @@ import uk.co.gresearch.siembol.configeditor.model.ConfigEditorResult;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
import static uk.co.gresearch.siembol.configeditor.model.ConfigEditorResult.StatusCode.OK;
public class ConfigRelease {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -19,13 +22,15 @@ public class ConfigRelease {
private static final String PENDING_PR_ERROR_MSG = "Can not release %s because PR %s is pending";
private static final String WRONG_VERSION_ERROR_MSG = "Can not release %s version %d from version %d";
private static final String SUBMIT_COMPLETED_LOG_MSG = "Prepared {} PR in the branch name: {} PR: {}";
private static final String CONFIG_IN_RELEASE= "Config %s is in the current release";
private static final String CONFIG_IN_RELEASE = "Config %s is in the current release";
private static final String NOT_INITIALISED_ERROR_MSG = "The release was not initialised";
private final String directory;
private final GitRepository gitRepository;
private final ConfigInfoProvider configInfoProvider;
private final ReleasePullRequestService pullRequestService;
private final ConfigInfoType configType;
private final AtomicReference<ConfigEditorResult> cacheResult;
public ConfigRelease(GitRepository gitRepository,
ReleasePullRequestService pullRequestService,
@@ -36,12 +41,26 @@ public class ConfigRelease {
this.configInfoProvider = configInfoProvider;
this.pullRequestService = pullRequestService;
this.configType = configInfoProvider.getConfigInfoType();
this.cacheResult = new AtomicReference<>(
ConfigEditorResult.fromMessage(ConfigEditorResult.StatusCode.ERROR, NOT_INITIALISED_ERROR_MSG));
}
public ConfigEditorResult getConfigsReleaseStatus() throws IOException {
return pullRequestService.pendingPullRequest();
}
public void init() throws IOException, GitAPIException {
var current = getConfigsRelease();
if (current.getStatusCode() != OK) {
throw new IllegalStateException(NOT_INITIALISED_ERROR_MSG);
}
}
public ConfigEditorResult getConfigsReleaseFromCache() {
var current = cacheResult.get();
return new ConfigEditorResult(current.getStatusCode(), current.getAttributes());
}
public ConfigEditorResult getConfigsRelease() throws IOException, GitAPIException {
ConfigEditorResult ret = gitRepository.getFiles(directory, configInfoProvider::isReleaseFile);
if (ret.getStatusCode() != ConfigEditorResult.StatusCode.OK) {
@@ -50,6 +69,7 @@ public class ConfigRelease {
int releaseVersion = configInfoProvider.getReleaseVersion(ret.getAttributes().getFiles());
ret.getAttributes().setReleaseVersion(releaseVersion, configType);
cacheResult.set(ret);
return ret;
}
@@ -103,7 +123,7 @@ public class ConfigRelease {
return releaseResult;
}
Optional<ConfigEditorFile> release = releaseResult.getAttributes().getFiles().stream().findFirst();
Optional<ConfigEditorFile> release = releaseResult.getAttributes().getFiles().stream().findFirst();
if (release.isPresent() && configInfoProvider.isConfigInRelease(release.get().getContent(), configName)) {
String message = String.format(CONFIG_IN_RELEASE, configName);
return ConfigEditorResult.fromMessage(ConfigEditorResult.StatusCode.BAD_REQUEST, message);

4
config-editor/config-editor-core/src/main/java/uk/co/gresearch/siembol/configeditor/configstore/ConfigStore.java
View File

@@ -22,12 +22,16 @@ public interface ConfigStore extends HealthCheckable {
ConfigEditorResult getConfigs();
ConfigEditorResult getConfigsReleaseFromCache();
ConfigEditorResult getConfigsRelease();
ConfigEditorResult getConfigsReleaseStatus();
ConfigEditorResult submitConfigsRelease(UserInfo user, String rulesRelease);
ConfigEditorResult getAdminConfigFromCache();
ConfigEditorResult getAdminConfig();
ConfigEditorResult getAdminConfigStatus();

26
config-editor/config-editor-core/src/main/java/uk/co/gresearch/siembol/configeditor/configstore/ConfigStoreImpl.java
View File

@@ -145,6 +145,15 @@ public class ConfigStoreImpl implements ConfigStore {
return configs.getFiles();
}
@Override
public ConfigEditorResult getConfigsReleaseFromCache() {
if (exception.get() != null) {
return ConfigEditorResult.fromException(exception.get());
}
return release.getConfigsReleaseFromCache();
}
@Override
public ConfigEditorResult getConfigsRelease() {
Callable<ConfigEditorResult> command = release::getConfigsRelease;
@@ -163,6 +172,19 @@ public class ConfigStoreImpl implements ConfigStore {
return executeStoreCommand(command, releaseExecutorService);
}
@Override
public ConfigEditorResult getAdminConfigFromCache() {
if (adminConfig == null) {
return ConfigEditorResult.fromMessage(ERROR, ADMIN_CONFIG_UNSUPPORTED_MSG);
}
if (exception.get() != null) {
return ConfigEditorResult.fromException(exception.get());
}
return adminConfig.getConfigsReleaseFromCache();
}
@Override
public ConfigEditorResult getAdminConfig() {
if (adminConfig == null) {
@@ -354,7 +376,8 @@ public class ConfigStoreImpl implements ConfigStore {
pullRequestService,
configInfoProvider,
releaseDirectory);
release.init();
configs = new ConfigItems(gitStoreRepo, configInfoProvider, configStoreDirectory);
configs.init();
@@ -373,6 +396,7 @@ public class ConfigStoreImpl implements ConfigStore {
adminConfigPullRequestService,
ADMIN_CONFIG_INFO_PROVIDER,
adminConfigDirectory);
adminConfig.init();
}
return new ConfigStoreImpl(this);

31
config-editor/config-editor-core/src/test/java/uk/co/gresearch/siembol/configeditor/configstore/ConfigReleaseTest.java
View File

@@ -114,10 +114,19 @@ public class ConfigReleaseTest {
@Test
public void getRelease() throws IOException, GitAPIException {
ConfigEditorResult resultCache = configRelease.getConfigsReleaseFromCache();
Assert.assertEquals(ERROR, resultCache.getStatusCode());
Assert.assertNotNull(resultCache.getAttributes().getMessage());
ConfigEditorResult result = configRelease.getConfigsRelease();
Assert.assertEquals(OK, result.getStatusCode());
Assert.assertNotNull(result.getAttributes().getFiles());
Assert.assertEquals(releaseVersion, result.getAttributes().getRulesVersion());
resultCache = configRelease.getConfigsReleaseFromCache();
Assert.assertEquals(OK, resultCache.getStatusCode());
Assert.assertNotNull(resultCache.getAttributes().getFiles());
Assert.assertEquals(releaseVersion, resultCache.getAttributes().getRulesVersion());
}
@Test
@@ -194,4 +203,26 @@ public class ConfigReleaseTest {
ConfigEditorResult result = configRelease.checkConfigNotInRelease("test_config");
Assert.assertEquals(ERROR, result.getStatusCode());
}
@Test
public void getReleaseFromCacheNotInitialised() {
ConfigEditorResult result = configRelease.getConfigsReleaseFromCache();
Assert.assertEquals(ERROR, result.getStatusCode());
Assert.assertNotNull(result.getAttributes().getMessage());
}
@Test
public void getReleaseFromCacheInitialised() throws GitAPIException, IOException {
configRelease.init();
ConfigEditorResult result = configRelease.getConfigsReleaseFromCache();
Assert.assertEquals(OK, result.getStatusCode());
Assert.assertNotNull(result.getAttributes().getFiles());
Assert.assertEquals(releaseVersion, result.getAttributes().getRulesVersion());
}
@Test(expected = IllegalStateException.class)
public void initReleaseFailed() throws GitAPIException, IOException {
when(gitRepo.getFiles(eq(directory), any())).thenReturn(ConfigEditorResult.fromMessage(ERROR, "error"));
configRelease.init();
}
}

31
config-editor/config-editor-core/src/test/java/uk/co/gresearch/siembol/configeditor/configstore/ConfigStoreImplTest.java
View File

@@ -24,8 +24,8 @@ import static uk.co.gresearch.siembol.configeditor.model.ConfigEditorResult.Stat
public class ConfigStoreImplTest {
private ExecutorService executorService;
private Map<String, String> filesContent = new HashMap<>();
private Map<String, String> filesTestCaseContent = new HashMap<>();
private final Map<String, String> filesContent = new HashMap<>();
private final Map<String, String> filesTestCaseContent = new HashMap<>();
private List<ConfigEditorFile> files;
private ConfigEditorResult getFilesResult;
private List<ConfigEditorFile> filesTestCases;
@@ -278,6 +278,14 @@ public class ConfigStoreImplTest {
Assert.assertEquals(ret, genericResult);
}
@Test
public void getReleaseFromCache() {
when(release.getConfigsReleaseFromCache()).thenReturn(genericResult);
ConfigEditorResult ret = configStore.getConfigsReleaseFromCache();
verify(release).getConfigsReleaseFromCache();
Assert.assertEquals(ret, genericResult);
}
@Test
public void getAdminConfig() throws GitAPIException, IOException {
when(adminConfig.getConfigsRelease()).thenReturn(genericResult);
@@ -286,6 +294,14 @@ public class ConfigStoreImplTest {
Assert.assertEquals(ret, genericResult);
}
@Test
public void getAdminConfigFromCache() {
when(adminConfig.getConfigsReleaseFromCache()).thenReturn(genericResult);
ConfigEditorResult ret = configStore.getAdminConfigFromCache();
verify(adminConfig).getConfigsReleaseFromCache();
Assert.assertEquals(ret, genericResult);
}
@Test
public void getAdminConfigUnsupported() {
builder.adminConfig = null;
@@ -295,6 +311,15 @@ public class ConfigStoreImplTest {
Assert.assertNotNull(ret.getAttributes().getMessage());
}
@Test
public void getAdminConfigFromCacheUnsupported() {
builder.adminConfig = null;
configStore = new ConfigStoreImpl(builder);
ConfigEditorResult ret = configStore.getAdminConfigFromCache();
Assert.assertEquals(ERROR, ret.getStatusCode());
Assert.assertNotNull(ret.getAttributes().getMessage());
}
@Test
public void getReleaseStatus() throws IOException {
when(release.getConfigsReleaseStatus()).thenReturn(genericResult);
@@ -442,7 +467,7 @@ public class ConfigStoreImplTest {
private static ExecutorService currentThreadExecutorService() {
ThreadPoolExecutor.CallerRunsPolicy callerRunsPolicy = new ThreadPoolExecutor.CallerRunsPolicy();
return new ThreadPoolExecutor(0, 1, 0L,
TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), callerRunsPolicy) {
TimeUnit.SECONDS, new SynchronousQueue<>(), callerRunsPolicy) {
@Override
public void execute(Runnable command) {
callerRunsPolicy.rejectedExecution(command, this);

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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencyManagement>
<dependencies>
@@ -56,7 +56,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-services</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-sync</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

4
config-editor/config-editor-rest/src/main/java/uk/co/gresearch/siembol/configeditor/rest/ConfigStoreController.java
View File

@@ -142,7 +142,7 @@ public class ConfigStoreController {
UserInfo user = userInfoProvider.getUserInfo(principal);
return serviceAggregator
.getConfigStore(user, service)
.getConfigsRelease()
.getConfigsReleaseFromCache()
.toResponseEntity();
}
@@ -196,7 +196,7 @@ public class ConfigStoreController {
user.setServiceUserRole(ServiceUserRole.SERVICE_ADMIN);
return serviceAggregator
.getConfigStore(user, service)
.getAdminConfig()
.getAdminConfigFromCache()
.toResponseEntity();
}

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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -41,32 +41,32 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-app</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>responding-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -20,17 +20,17 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-app</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<modules>
<module>config-editor-core</module>

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.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -35,12 +35,12 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -75,7 +75,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -39,12 +39,12 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -45,7 +45,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -75,7 +75,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-app</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -35,12 +35,12 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencyManagement>
<dependencies>
@@ -51,7 +51,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-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.3.1-SNAPSHOT</version>
<version>2.3.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>