Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DXLS-2202 DXL Tiered Storage #29

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open

DXLS-2202 DXL Tiered Storage #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a9eb28d
Add consumer tier storage capability
hugovillalbareisch Mar 17, 2020
6efee78
Add producer and consumer with tier storage capability. Add S3 Mock f…
hugovillalbareisch Mar 19, 2020
1650cc5
DXL Tiered Stora: Add UT, code grooming, javadoc
hugovillalbareisch Mar 26, 2020
f20ae2e
Update dependency versions, fix example
hugovillalbareisch Apr 23, 2020
94ad6cd
Add sphinx doc for Tiered Storage example
hugovillalbareisch Apr 23, 2020
d81c0d4
Added changes to build gradle for dep check issues
May 5, 2020
cd0ff4b
Added changes to support fix in dep check
May 6, 2020
cc98eaa
Added changes to support build gradle and version
May 6, 2020
24fda2a
fix way to add lib versions
May 7, 2020
24cd8d0
Merge pull request #30 from opendxl/depcheck-issues
rodliber May 7, 2020
a86398e
Updated to version 2.4.2
opendxl-integrations May 18, 2020
1cf0f48
Updated to next snapshot
chrissmith-mcafee May 18, 2020
60d2e11
Fix DatabusPushConsumer when a rebalance scenario occurs
hugovillalbareisch Jul 7, 2020
1b7af1b
Change methods order
hugovillalbareisch Jul 7, 2020
255f546
Add consumer tier storage capability
hugovillalbareisch Mar 17, 2020
92988c1
Add producer and consumer with tier storage capability. Add S3 Mock f…
hugovillalbareisch Mar 19, 2020
9d1def1
DXL Tiered Stora: Add UT, code grooming, javadoc
hugovillalbareisch Mar 26, 2020
9577c78
Update dependency versions, fix example
hugovillalbareisch Apr 23, 2020
a46bbbd
Add sphinx doc for Tiered Storage example
hugovillalbareisch Apr 23, 2020
787ff34
Fix DatabusPushConsumer when a rebalance scenario occurs
hugovillalbareisch Jul 7, 2020
a4a6c96
Change methods order
hugovillalbareisch Jul 7, 2020
70b51f9
Rebase build.gradle
hugovillalbareisch Jul 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ Maven:
<dependency>
<groupId>com.opendxl</groupId>
<artifactId>dxldatabusclient</artifactId>
<version>2.4.1</version>
<version>2.4.2</version>
</dependency>
```
or Gradle:
```groovy
compile 'com.opendxl:dxldatabusclient:2.4.1'
compile 'com.opendxl:dxldatabusclient:2.4.2'
```

## Bugs and Feedback
Expand Down
1 change: 1 addition & 0 deletions broker/src/broker/ClusterHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ private Properties getConfig(final int port) {
config.setProperty("num.partitions", String.valueOf(6));
config.setProperty("transaction.state.log.replication.factor", String.valueOf(1));
config.setProperty("transaction.state.log.min.isr", String.valueOf(1));
config.setProperty("log.message.format.version", "2.3.0");
} catch (Exception e) {
e.printStackTrace();
}
Expand Down
40 changes: 30 additions & 10 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'org.owasp:dependency-check-gradle:5.2.1'
classpath 'org.owasp:dependency-check-gradle:5.3.2.1'
}
}

Expand All @@ -19,7 +19,7 @@ plugins {
id "com.github.johnrengelman.shadow" version "4.0.3"
id "kr.motd.sphinx" version "2.3.1"
id "jacoco"
id "org.owasp.dependencycheck" version "5.2.1"
id "org.owasp.dependencycheck" version "5.3.2.1"
}

group 'com.opendxl'
Expand Down Expand Up @@ -57,23 +57,43 @@ configurations {
}

dependencies {
implementation 'org.apache.kafka:kafka-clients:2.3.1'
implementation 'org.apache.kafka:kafka-streams:2.3.1'
implementation 'org.apache.avro:avro:1.9.0'
implementation 'com.google.code.gson:gson:2.8.5'
implementation ('org.apache.kafka:kafka-clients:2.3.1') {
exclude group: 'org.scala-lang', module: 'scala-reflect'
}
implementation ('org.apache.kafka:kafka-streams:2.3.1') {
exclude group: 'org.scala-lang', module: 'scala-reflect'
}
implementation 'org.scala-lang:scala-reflect:2.12.11'
implementation 'org.apache.avro:avro:1.9.2'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'org.apache.commons:commons-configuration2:2.7'
implementation 'commons-lang:commons-lang:2.6'
implementation 'org.slf4j:slf4j-api:1.7.30'
implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
testImplementation 'org.apache.kafka:kafka_2.12:2.3.1'
implementation 'commons-io:commons-io:2.6'
implementation 'software.amazon.awssdk:bom:2.13.1'
implementation 'com.amazonaws:aws-java-sdk-s3:1.11.766'
testImplementation 'org.apache.zookeeper:zookeeper:3.5.5'
testImplementation('io.netty:netty-all:4.1.43.Final') {
testImplementation('org.apache.kafka:kafka_2.12:2.3.1') {
exclude group: 'org.scala-lang', module: 'scala-reflect'
}
testImplementation 'org.scala-lang:scala-reflect:2.12.11'

testImplementation('io.netty:netty-all:4.1.48.Final') {
force = true
}
testImplementation 'commons-io:commons-io:2.6'
testImplementation 'junit:junit:4.12'
testImplementation 'com.github.stefanbirkner:system-rules:1.19.0'
kafkaInMemory 'org.apache.kafka:kafka_2.12:2.3.1'

kafkaInMemory ('org.apache.kafka:kafka_2.12:2.3.1') {
exclude group: 'org.scala-lang', module: 'scala-reflect'
}
kafkaInMemory 'org.scala-lang:scala-reflect:2.12.11'
testImplementation 'io.findify:s3mock_2.12:0.2.5'
testImplementation 'io.findify:s3mock_2.12:0.2.5'
testImplementation 'com.e-movimento.tinytools:privilegedaccessor:1.2.2'

kafkaInMemory 'commons-io:commons-io:2.6'

// This following section mitigates OWASP vulnerabilities report.
Expand Down Expand Up @@ -318,4 +338,4 @@ check.dependsOn dependencyCheckAnalyze
distZip.dependsOn javadocJar
distZip.dependsOn sourceJar
sphinx.dependsOn(versionFile)
assemble.dependsOn(replaceVersionInREADME)
assemble.dependsOn(replaceVersionInREADME)