diff --git a/ncds-sdk/pom.xml b/ncds-sdk/pom.xml index 894579e..322d51b 100644 --- a/ncds-sdk/pom.xml +++ b/ncds-sdk/pom.xml @@ -7,7 +7,7 @@ com.nasdaq.ncds ncds - 0.8.5 + 0.9.0 ncds-sdk @@ -56,12 +56,6 @@ slf4j-simple test - - - io.strimzi - kafka-oauth-common - - diff --git a/ncds-sdk/src/main/java/com/nasdaq/ncdsclient/consumer/NasdaqKafkaAvroConsumer.java b/ncds-sdk/src/main/java/com/nasdaq/ncdsclient/consumer/NasdaqKafkaAvroConsumer.java index 49f4e76..23ae794 100644 --- a/ncds-sdk/src/main/java/com/nasdaq/ncdsclient/consumer/NasdaqKafkaAvroConsumer.java +++ b/ncds-sdk/src/main/java/com/nasdaq/ncdsclient/consumer/NasdaqKafkaAvroConsumer.java @@ -7,7 +7,6 @@ import com.nasdaq.ncdsclient.internal.utils.IsItJunit; import com.nasdaq.ncdsclient.internal.utils.KafkaConfigLoader; import com.nasdaq.ncdsclient.news.NewsUtil; -import io.strimzi.kafka.oauth.common.ConfigProperties; import org.apache.avro.Schema; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -216,14 +215,6 @@ public KafkaConsumer getNewsConsumer(String topic) throws Exception { } } - private String getDate(){ - // Get Today's EST date - DateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd"); - dateformat.setTimeZone(TimeZone.getTimeZone("America/New_York")); - String date = dateformat.format(new Date()); - return date; - } - private KafkaConsumer seekToMidNight(TopicPartition topicPartition){ Map timestmaps = new HashMap(); timestmaps.put(topicPartition , getTodayMidNightTimeStamp()); diff --git a/ncds-sdk/src/main/java/com/nasdaq/ncdsclient/internal/ReadSchemaTopic.java b/ncds-sdk/src/main/java/com/nasdaq/ncdsclient/internal/ReadSchemaTopic.java index 077c57c..c2faf3c 100644 --- a/ncds-sdk/src/main/java/com/nasdaq/ncdsclient/internal/ReadSchemaTopic.java +++ b/ncds-sdk/src/main/java/com/nasdaq/ncdsclient/internal/ReadSchemaTopic.java @@ -2,7 +2,6 @@ import com.nasdaq.ncdsclient.internal.utils.IsItJunit; import com.nasdaq.ncdsclient.internal.utils.KafkaConfigLoader; -import io.strimzi.kafka.oauth.common.ConfigProperties; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.apache.kafka.clients.consumer.*; @@ -121,9 +120,9 @@ private KafkaAvroConsumer getConsumer(String cleindId) throws Exception { //Properties kafkaProps = null; try { - if(!IsItJunit.isJUnitTest()) { - ConfigProperties.resolveAndExportToSystemProperties(securityProps); - } +// if(!IsItJunit.isJUnitTest()) { +// ConfigProperties.resolveAndExportToSystemProperties(securityProps); +// } Schema.Parser parser = new Schema.Parser(); //controlMessageSchema = parser.parse(ClassLoader.getSystemResourceAsStream("ControlMessageSchema.avsc")); @@ -137,7 +136,7 @@ private KafkaAvroConsumer getConsumer(String cleindId) throws Exception { kafkaProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, OffsetResetStrategy.EARLIEST.toString().toLowerCase()); kafkaProps.put(ConsumerConfig.GROUP_ID_CONFIG, cleindId); kafkaProps.put(ConsumerConfig.MAX_PARTITION_FETCH_BYTES_CONFIG, "5048576"); - ConfigProperties.resolve(kafkaProps); +// ConfigProperties.resolve(kafkaProps); } catch (Exception e) { throw e; diff --git a/ncds-sdk/src/test/resources/log4j2.xml b/ncds-sdk/src/test/resources/log4j2.xml new file mode 100644 index 0000000..8e910f9 --- /dev/null +++ b/ncds-sdk/src/test/resources/log4j2.xml @@ -0,0 +1,15 @@ + + + + + + %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n + + + + + + + + + diff --git a/ncdssdk-client/pom.xml b/ncdssdk-client/pom.xml index 51343ee..3ee442b 100644 --- a/ncdssdk-client/pom.xml +++ b/ncdssdk-client/pom.xml @@ -7,7 +7,7 @@ com.nasdaq.ncds ncds - 0.8.5 + 0.9.0 ncdssdk-client diff --git a/pom.xml b/pom.xml index 27a59ea..6a94759 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.nasdaq.ncds ncds - 0.8.5 + 0.9.0 pom Nasdaq Cloud Data Service @@ -23,7 +23,6 @@ 2.20.0 4.1.94.Final 1.7.36 - 0.12.0 true 5.7.2 1.3.2 @@ -116,18 +115,6 @@ ${kafka.version} - - - io.strimzi - kafka-oauth-client - ${strimzi.oauth.version} - - - io.strimzi - kafka-oauth-common - ${strimzi.oauth.version} - - org.slf4j slf4j-log4j12