From 74995017110773c7fc02ac4b0768115438a16516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Vonheiden?= <bjoern.vonheiden@hotmail.de>
Date: Sun, 26 Jul 2020 14:39:39 +0200
Subject: [PATCH] Fix gradle dependencies and duplicate property in class to
enable build.
Due to the merge the project was not possible to build with gradle.
Because both projects changed the gradle build file some properties
were not added to the correct places in the file.
Further in one configuration class the same property existed twice.
diff --git a/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java b/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java
index 61fb135..260dbba 100644
--- a/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java
+++ b/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java
@@ -15,10 +15,6 @@ public final class ConfigurationKeys {
public static final String CACHE_MAX_BYTES_BUFFERING = "cache.max.bytes.buffering";
- public static final String APPLICATION_NAME = "application.name";
-
- public static final String APPLICATION_VERSION = "application.version";
-
public static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
public static final String SCHEMA_REGISTRY_URL = "schema.registry.url";
diff --git a/build.gradle b/build.gradle
index 1caf1b6..797d103 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,9 +69,6 @@ configure(useCaseApplications) {
implementation 'org.slf4j:slf4j-simple:1.6.1'
implementation project(':application-kafkastreams-commons')
- // These dependencies are used for the workload-generator-commmon
- implementation project(':workload-generator-commons')
-
// Use JUnit test framework
testImplementation 'junit:junit:4.12'
}
@@ -82,10 +79,13 @@ configure(useCaseGenerators) {
dependencies {
// These dependencies are used internally, and not exposed to consumers on their own compile classpath.
// implementation('org.industrial-devops:titan-ccp-common:0.1.0-SNAPSHOT') { changing = true }
- implementation('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') { changing = true }
+ // implementation('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') { changing = true }
implementation 'com.google.guava:guava:24.1-jre'
implementation 'org.jctools:jctools-core:2.1.1'
implementation 'org.slf4j:slf4j-simple:1.6.1'
+
+ // These dependencies are used for the workload-generator-commmon
+ implementation project(':workload-generator-commons')
// maintain build of generators
implementation 'net.kieker-monitoring:kieker:1.14'
@@ -102,12 +102,12 @@ configure(commonProjects) {
// These dependencies is exported to consumers, that is to say found on their compile classpath.
api 'org.apache.kafka:kafka-clients:2.4.0'
api('org.industrial-devops:titan-ccp-common:0.0.3-SNAPSHOT') { changing = true }
- api 'net.kieker-monitoring:kieker:1.14-SNAPSHOT'
+ api 'net.kieker-monitoring:kieker:1.14'
// These dependencies are used internally, and not exposed to consumers on their own compile classpath.
implementation 'org.slf4j:slf4j-simple:1.6.1'
- implementation('org.industrial-devops:titan-ccp-common:0.1.0-SNAPSHOT') { changing = true }
- implementation('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') { changing = true }
+ // implementation('org.industrial-devops:titan-ccp-common:0.1.0-SNAPSHOT') { changing = true }
+ // implementation('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') { changing = true }
// Use JUnit test framework
testImplementation 'junit:junit:4.12'
---
.../commons/kafkastreams/ConfigurationKeys.java | 4 ----
build.gradle | 14 +++++++-------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java b/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java
index 61fb135f0..260dbba9c 100644
--- a/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java
+++ b/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java
@@ -15,10 +15,6 @@ public final class ConfigurationKeys {
public static final String CACHE_MAX_BYTES_BUFFERING = "cache.max.bytes.buffering";
- public static final String APPLICATION_NAME = "application.name";
-
- public static final String APPLICATION_VERSION = "application.version";
-
public static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
public static final String SCHEMA_REGISTRY_URL = "schema.registry.url";
diff --git a/build.gradle b/build.gradle
index 1caf1b616..797d1039b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,9 +69,6 @@ configure(useCaseApplications) {
implementation 'org.slf4j:slf4j-simple:1.6.1'
implementation project(':application-kafkastreams-commons')
- // These dependencies are used for the workload-generator-commmon
- implementation project(':workload-generator-commons')
-
// Use JUnit test framework
testImplementation 'junit:junit:4.12'
}
@@ -82,10 +79,13 @@ configure(useCaseGenerators) {
dependencies {
// These dependencies are used internally, and not exposed to consumers on their own compile classpath.
// implementation('org.industrial-devops:titan-ccp-common:0.1.0-SNAPSHOT') { changing = true }
- implementation('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') { changing = true }
+ // implementation('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') { changing = true }
implementation 'com.google.guava:guava:24.1-jre'
implementation 'org.jctools:jctools-core:2.1.1'
implementation 'org.slf4j:slf4j-simple:1.6.1'
+
+ // These dependencies are used for the workload-generator-commmon
+ implementation project(':workload-generator-commons')
// maintain build of generators
implementation 'net.kieker-monitoring:kieker:1.14'
@@ -102,12 +102,12 @@ configure(commonProjects) {
// These dependencies is exported to consumers, that is to say found on their compile classpath.
api 'org.apache.kafka:kafka-clients:2.4.0'
api('org.industrial-devops:titan-ccp-common:0.0.3-SNAPSHOT') { changing = true }
- api 'net.kieker-monitoring:kieker:1.14-SNAPSHOT'
+ api 'net.kieker-monitoring:kieker:1.14'
// These dependencies are used internally, and not exposed to consumers on their own compile classpath.
implementation 'org.slf4j:slf4j-simple:1.6.1'
- implementation('org.industrial-devops:titan-ccp-common:0.1.0-SNAPSHOT') { changing = true }
- implementation('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') { changing = true }
+ // implementation('org.industrial-devops:titan-ccp-common:0.1.0-SNAPSHOT') { changing = true }
+ // implementation('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') { changing = true }
// Use JUnit test framework
testImplementation 'junit:junit:4.12'
--
GitLab