From 563454c2fe5330aec8fe870a8c5c42d2c6201a78 Mon Sep 17 00:00:00 2001 From: Schalk Cronje Date: Thu, 1 Oct 2020 21:21:27 +0200 Subject: [PATCH 1/8] Rename telemetry_core to telemetry-core --- settings.gradle | 3 --- {telemetry_core => telemetry-core}/README.md | 0 {telemetry_core => telemetry-core}/build.gradle.kts | 0 .../src/main/java/com/newrelic/telemetry/Attributes.java | 0 .../src/main/java/com/newrelic/telemetry/BaseConfig.java | 0 .../java/com/newrelic/telemetry/EventBatchSenderFactory.java | 0 .../java/com/newrelic/telemetry/LogBatchSenderFactory.java | 0 .../java/com/newrelic/telemetry/MetricBatchSenderFactory.java | 0 .../src/main/java/com/newrelic/telemetry/Response.java | 0 .../main/java/com/newrelic/telemetry/SenderConfiguration.java | 0 .../java/com/newrelic/telemetry/SpanBatchSenderFactory.java | 0 .../src/main/java/com/newrelic/telemetry/Telemetry.java | 0 .../src/main/java/com/newrelic/telemetry/TelemetryBatch.java | 0 .../src/main/java/com/newrelic/telemetry/events/Event.java | 0 .../main/java/com/newrelic/telemetry/events/EventBatch.java | 0 .../java/com/newrelic/telemetry/events/EventBatchSender.java | 0 .../main/java/com/newrelic/telemetry/events/EventBuffer.java | 0 .../newrelic/telemetry/events/json/EventBatchMarshaller.java | 0 .../java/com/newrelic/telemetry/events/json/EventToJson.java | 0 .../newrelic/telemetry/exceptions/DiscardBatchException.java | 0 .../com/newrelic/telemetry/exceptions/ResponseException.java | 0 .../telemetry/exceptions/RetryWithBackoffException.java | 0 .../telemetry/exceptions/RetryWithRequestedWaitException.java | 0 .../newrelic/telemetry/exceptions/RetryWithSplitException.java | 0 .../src/main/java/com/newrelic/telemetry/http/HttpPoster.java | 0 .../main/java/com/newrelic/telemetry/http/HttpResponse.java | 0 .../main/java/com/newrelic/telemetry/json/AttributesJson.java | 0 .../src/main/java/com/newrelic/telemetry/logs/Log.java | 0 .../src/main/java/com/newrelic/telemetry/logs/LogBatch.java | 0 .../main/java/com/newrelic/telemetry/logs/LogBatchSender.java | 0 .../com/newrelic/telemetry/logs/json/LogBatchMarshaller.java | 0 .../newrelic/telemetry/logs/json/LogJsonCommonBlockWriter.java | 0 .../telemetry/logs/json/LogJsonTelemetryBlockWriter.java | 0 .../newrelic/telemetry/metrics/CommonAttributesBuilder.java | 0 .../src/main/java/com/newrelic/telemetry/metrics/Count.java | 0 .../src/main/java/com/newrelic/telemetry/metrics/Gauge.java | 0 .../src/main/java/com/newrelic/telemetry/metrics/Metric.java | 0 .../main/java/com/newrelic/telemetry/metrics/MetricBatch.java | 0 .../java/com/newrelic/telemetry/metrics/MetricBatchSender.java | 0 .../newrelic/telemetry/metrics/MetricBatchSenderBuilder.java | 0 .../main/java/com/newrelic/telemetry/metrics/MetricBuffer.java | 0 .../src/main/java/com/newrelic/telemetry/metrics/Summary.java | 0 .../metrics/json/MetricBatchJsonCommonBlockWriter.java | 0 .../metrics/json/MetricBatchJsonTelemetryBlockWriter.java | 0 .../newrelic/telemetry/metrics/json/MetricBatchMarshaller.java | 0 .../java/com/newrelic/telemetry/metrics/json/MetricToJson.java | 0 .../src/main/java/com/newrelic/telemetry/spans/Span.java | 0 .../src/main/java/com/newrelic/telemetry/spans/SpanBatch.java | 0 .../java/com/newrelic/telemetry/spans/SpanBatchSender.java | 0 .../com/newrelic/telemetry/spans/SpanBatchSenderBuilder.java | 0 .../com/newrelic/telemetry/spans/json/SpanBatchMarshaller.java | 0 .../telemetry/spans/json/SpanJsonCommonBlockWriter.java | 0 .../telemetry/spans/json/SpanJsonTelemetryBlockWriter.java | 0 .../java/com/newrelic/telemetry/transport/BatchDataSender.java | 0 .../src/main/java/com/newrelic/telemetry/util/Utils.java | 0 .../src/test/java/com/newrelic/telemetry/AttributesTest.java | 0 .../src/test/java/com/newrelic/telemetry/BaseConfigTest.java | 0 .../com/newrelic/telemetry/EventBatchSenderFactoryTest.java | 0 .../java/com/newrelic/telemetry/LogBatchSenderFactoryTest.java | 0 .../com/newrelic/telemetry/MetricBatchSenderFactoryTest.java | 0 .../src/test/java/com/newrelic/telemetry/ResponseTest.java | 0 .../com/newrelic/telemetry/SpanBatchSenderFactoryTest.java | 0 .../test/java/com/newrelic/telemetry/TelemetryBatchTest.java | 0 .../com/newrelic/telemetry/events/EventBatchSenderTest.java | 0 .../java/com/newrelic/telemetry/events/EventBufferTest.java | 0 .../src/test/java/com/newrelic/telemetry/events/EventTest.java | 0 .../telemetry/events/json/EventBatchMarshallerTest.java | 0 .../com/newrelic/telemetry/events/json/EventToJsonTest.java | 0 .../java/com/newrelic/telemetry/json/AttributesJsonTest.java | 0 .../telemetry/json/MetricBatchJsonCommonBlockWriterTest.java | 0 .../json/MetricBatchJsonTelemetryBlockWriterTest.java | 0 .../java/com/newrelic/telemetry/logs/LogBatchSenderTest.java | 0 .../telemetry/logs/json/LogJsonCommonBlockWriterTest.java | 0 .../telemetry/logs/json/LogJsonTelemetryBlockWriterTest.java | 0 .../telemetry/metrics/CommonAttributesBuilderTest.java | 0 .../test/java/com/newrelic/telemetry/metrics/CountTest.java | 0 .../test/java/com/newrelic/telemetry/metrics/GaugeTest.java | 0 .../com/newrelic/telemetry/metrics/MetricBatchSenderTest.java | 0 .../java/com/newrelic/telemetry/metrics/MetricBatchTest.java | 0 .../java/com/newrelic/telemetry/metrics/MetricBufferTest.java | 0 .../java/com/newrelic/telemetry/metrics/MetricToJsonTest.java | 0 .../newrelic/telemetry/metrics/MetricsBatchMarshallerTest.java | 0 .../test/java/com/newrelic/telemetry/metrics/SummaryTest.java | 0 .../newrelic/telemetry/spans/SpanBatchSenderBuilderTest.java | 0 .../java/com/newrelic/telemetry/spans/SpanBatchSenderTest.java | 0 .../test/java/com/newrelic/telemetry/spans/SpanBatchTest.java | 0 .../java/com/newrelic/telemetry/spans/SpanBuilderTest.java | 0 .../src/test/java/com/newrelic/telemetry/spans/SpanTest.java | 0 .../telemetry/spans/json/SpanJsonCommonBlockWriterTest.java | 0 .../telemetry/spans/json/SpanJsonTelemetryBlockWriterTest.java | 0 .../com/newrelic/telemetry/transport/BatchDataSenderTest.java | 0 91 files changed, 3 deletions(-) rename {telemetry_core => telemetry-core}/README.md (100%) rename {telemetry_core => telemetry-core}/build.gradle.kts (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/Attributes.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/BaseConfig.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/EventBatchSenderFactory.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/LogBatchSenderFactory.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/MetricBatchSenderFactory.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/Response.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/SenderConfiguration.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/SpanBatchSenderFactory.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/Telemetry.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/TelemetryBatch.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/events/Event.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/events/EventBatch.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/events/EventBatchSender.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/events/EventBuffer.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/events/json/EventBatchMarshaller.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/events/json/EventToJson.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/exceptions/DiscardBatchException.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/exceptions/ResponseException.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/exceptions/RetryWithBackoffException.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/exceptions/RetryWithRequestedWaitException.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/exceptions/RetryWithSplitException.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/http/HttpPoster.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/http/HttpResponse.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/json/AttributesJson.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/logs/Log.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/logs/LogBatch.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/logs/LogBatchSender.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/logs/json/LogBatchMarshaller.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/logs/json/LogJsonCommonBlockWriter.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/logs/json/LogJsonTelemetryBlockWriter.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/CommonAttributesBuilder.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/Count.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/Gauge.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/Metric.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/MetricBatch.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/MetricBatchSender.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/MetricBatchSenderBuilder.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/MetricBuffer.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/Summary.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchJsonCommonBlockWriter.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchJsonTelemetryBlockWriter.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchMarshaller.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/metrics/json/MetricToJson.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/spans/Span.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/spans/SpanBatch.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/spans/SpanBatchSender.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/spans/SpanBatchSenderBuilder.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/spans/json/SpanBatchMarshaller.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/spans/json/SpanJsonCommonBlockWriter.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/spans/json/SpanJsonTelemetryBlockWriter.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/transport/BatchDataSender.java (100%) rename {telemetry_core => telemetry-core}/src/main/java/com/newrelic/telemetry/util/Utils.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/AttributesTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/BaseConfigTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/EventBatchSenderFactoryTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/LogBatchSenderFactoryTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/MetricBatchSenderFactoryTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/ResponseTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/SpanBatchSenderFactoryTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/TelemetryBatchTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/events/EventBatchSenderTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/events/EventBufferTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/events/EventTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/events/json/EventBatchMarshallerTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/events/json/EventToJsonTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/json/AttributesJsonTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/json/MetricBatchJsonCommonBlockWriterTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/json/MetricBatchJsonTelemetryBlockWriterTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/logs/LogBatchSenderTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/logs/json/LogJsonCommonBlockWriterTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/logs/json/LogJsonTelemetryBlockWriterTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/metrics/CommonAttributesBuilderTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/metrics/CountTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/metrics/GaugeTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/metrics/MetricBatchSenderTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/metrics/MetricBatchTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/metrics/MetricBufferTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/metrics/MetricToJsonTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/metrics/MetricsBatchMarshallerTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/metrics/SummaryTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/spans/SpanBatchSenderBuilderTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/spans/SpanBatchSenderTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/spans/SpanBatchTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/spans/SpanBuilderTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/spans/SpanTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/spans/json/SpanJsonCommonBlockWriterTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/spans/json/SpanJsonTelemetryBlockWriterTest.java (100%) rename {telemetry_core => telemetry-core}/src/test/java/com/newrelic/telemetry/transport/BatchDataSenderTest.java (100%) diff --git a/settings.gradle b/settings.gradle index f8899917..64aebf59 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,3 @@ include ':telemetry-core' include ':integration_test' include 'telemetry-http-okhttp' include 'telemetry-http-java11' - -// remap the name of the module so that we get a more standard library name at publish time. -project(":telemetry-core").projectDir = file("telemetry_core") diff --git a/telemetry_core/README.md b/telemetry-core/README.md similarity index 100% rename from telemetry_core/README.md rename to telemetry-core/README.md diff --git a/telemetry_core/build.gradle.kts b/telemetry-core/build.gradle.kts similarity index 100% rename from telemetry_core/build.gradle.kts rename to telemetry-core/build.gradle.kts diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/Attributes.java b/telemetry-core/src/main/java/com/newrelic/telemetry/Attributes.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/Attributes.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/Attributes.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/BaseConfig.java b/telemetry-core/src/main/java/com/newrelic/telemetry/BaseConfig.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/BaseConfig.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/BaseConfig.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/EventBatchSenderFactory.java b/telemetry-core/src/main/java/com/newrelic/telemetry/EventBatchSenderFactory.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/EventBatchSenderFactory.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/EventBatchSenderFactory.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/LogBatchSenderFactory.java b/telemetry-core/src/main/java/com/newrelic/telemetry/LogBatchSenderFactory.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/LogBatchSenderFactory.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/LogBatchSenderFactory.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/MetricBatchSenderFactory.java b/telemetry-core/src/main/java/com/newrelic/telemetry/MetricBatchSenderFactory.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/MetricBatchSenderFactory.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/MetricBatchSenderFactory.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/Response.java b/telemetry-core/src/main/java/com/newrelic/telemetry/Response.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/Response.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/Response.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/SenderConfiguration.java b/telemetry-core/src/main/java/com/newrelic/telemetry/SenderConfiguration.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/SenderConfiguration.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/SenderConfiguration.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/SpanBatchSenderFactory.java b/telemetry-core/src/main/java/com/newrelic/telemetry/SpanBatchSenderFactory.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/SpanBatchSenderFactory.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/SpanBatchSenderFactory.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/Telemetry.java b/telemetry-core/src/main/java/com/newrelic/telemetry/Telemetry.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/Telemetry.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/Telemetry.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/TelemetryBatch.java b/telemetry-core/src/main/java/com/newrelic/telemetry/TelemetryBatch.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/TelemetryBatch.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/TelemetryBatch.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/events/Event.java b/telemetry-core/src/main/java/com/newrelic/telemetry/events/Event.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/events/Event.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/events/Event.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/events/EventBatch.java b/telemetry-core/src/main/java/com/newrelic/telemetry/events/EventBatch.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/events/EventBatch.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/events/EventBatch.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/events/EventBatchSender.java b/telemetry-core/src/main/java/com/newrelic/telemetry/events/EventBatchSender.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/events/EventBatchSender.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/events/EventBatchSender.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/events/EventBuffer.java b/telemetry-core/src/main/java/com/newrelic/telemetry/events/EventBuffer.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/events/EventBuffer.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/events/EventBuffer.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/events/json/EventBatchMarshaller.java b/telemetry-core/src/main/java/com/newrelic/telemetry/events/json/EventBatchMarshaller.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/events/json/EventBatchMarshaller.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/events/json/EventBatchMarshaller.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/events/json/EventToJson.java b/telemetry-core/src/main/java/com/newrelic/telemetry/events/json/EventToJson.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/events/json/EventToJson.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/events/json/EventToJson.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/exceptions/DiscardBatchException.java b/telemetry-core/src/main/java/com/newrelic/telemetry/exceptions/DiscardBatchException.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/exceptions/DiscardBatchException.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/exceptions/DiscardBatchException.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/exceptions/ResponseException.java b/telemetry-core/src/main/java/com/newrelic/telemetry/exceptions/ResponseException.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/exceptions/ResponseException.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/exceptions/ResponseException.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithBackoffException.java b/telemetry-core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithBackoffException.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithBackoffException.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithBackoffException.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithRequestedWaitException.java b/telemetry-core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithRequestedWaitException.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithRequestedWaitException.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithRequestedWaitException.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithSplitException.java b/telemetry-core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithSplitException.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithSplitException.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/exceptions/RetryWithSplitException.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/http/HttpPoster.java b/telemetry-core/src/main/java/com/newrelic/telemetry/http/HttpPoster.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/http/HttpPoster.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/http/HttpPoster.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/http/HttpResponse.java b/telemetry-core/src/main/java/com/newrelic/telemetry/http/HttpResponse.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/http/HttpResponse.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/http/HttpResponse.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/json/AttributesJson.java b/telemetry-core/src/main/java/com/newrelic/telemetry/json/AttributesJson.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/json/AttributesJson.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/json/AttributesJson.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/logs/Log.java b/telemetry-core/src/main/java/com/newrelic/telemetry/logs/Log.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/logs/Log.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/logs/Log.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/logs/LogBatch.java b/telemetry-core/src/main/java/com/newrelic/telemetry/logs/LogBatch.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/logs/LogBatch.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/logs/LogBatch.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/logs/LogBatchSender.java b/telemetry-core/src/main/java/com/newrelic/telemetry/logs/LogBatchSender.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/logs/LogBatchSender.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/logs/LogBatchSender.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/logs/json/LogBatchMarshaller.java b/telemetry-core/src/main/java/com/newrelic/telemetry/logs/json/LogBatchMarshaller.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/logs/json/LogBatchMarshaller.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/logs/json/LogBatchMarshaller.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/logs/json/LogJsonCommonBlockWriter.java b/telemetry-core/src/main/java/com/newrelic/telemetry/logs/json/LogJsonCommonBlockWriter.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/logs/json/LogJsonCommonBlockWriter.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/logs/json/LogJsonCommonBlockWriter.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/logs/json/LogJsonTelemetryBlockWriter.java b/telemetry-core/src/main/java/com/newrelic/telemetry/logs/json/LogJsonTelemetryBlockWriter.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/logs/json/LogJsonTelemetryBlockWriter.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/logs/json/LogJsonTelemetryBlockWriter.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/CommonAttributesBuilder.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/CommonAttributesBuilder.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/CommonAttributesBuilder.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/CommonAttributesBuilder.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/Count.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/Count.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/Count.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/Count.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/Gauge.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/Gauge.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/Gauge.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/Gauge.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/Metric.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/Metric.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/Metric.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/Metric.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/MetricBatch.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/MetricBatch.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/MetricBatch.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/MetricBatch.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/MetricBatchSender.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/MetricBatchSender.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/MetricBatchSender.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/MetricBatchSender.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/MetricBatchSenderBuilder.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/MetricBatchSenderBuilder.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/MetricBatchSenderBuilder.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/MetricBatchSenderBuilder.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/MetricBuffer.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/MetricBuffer.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/MetricBuffer.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/MetricBuffer.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/Summary.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/Summary.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/Summary.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/Summary.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchJsonCommonBlockWriter.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchJsonCommonBlockWriter.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchJsonCommonBlockWriter.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchJsonCommonBlockWriter.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchJsonTelemetryBlockWriter.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchJsonTelemetryBlockWriter.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchJsonTelemetryBlockWriter.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchJsonTelemetryBlockWriter.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchMarshaller.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchMarshaller.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchMarshaller.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/json/MetricBatchMarshaller.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/metrics/json/MetricToJson.java b/telemetry-core/src/main/java/com/newrelic/telemetry/metrics/json/MetricToJson.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/metrics/json/MetricToJson.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/metrics/json/MetricToJson.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/spans/Span.java b/telemetry-core/src/main/java/com/newrelic/telemetry/spans/Span.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/spans/Span.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/spans/Span.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/spans/SpanBatch.java b/telemetry-core/src/main/java/com/newrelic/telemetry/spans/SpanBatch.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/spans/SpanBatch.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/spans/SpanBatch.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/spans/SpanBatchSender.java b/telemetry-core/src/main/java/com/newrelic/telemetry/spans/SpanBatchSender.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/spans/SpanBatchSender.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/spans/SpanBatchSender.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/spans/SpanBatchSenderBuilder.java b/telemetry-core/src/main/java/com/newrelic/telemetry/spans/SpanBatchSenderBuilder.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/spans/SpanBatchSenderBuilder.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/spans/SpanBatchSenderBuilder.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/spans/json/SpanBatchMarshaller.java b/telemetry-core/src/main/java/com/newrelic/telemetry/spans/json/SpanBatchMarshaller.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/spans/json/SpanBatchMarshaller.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/spans/json/SpanBatchMarshaller.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/spans/json/SpanJsonCommonBlockWriter.java b/telemetry-core/src/main/java/com/newrelic/telemetry/spans/json/SpanJsonCommonBlockWriter.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/spans/json/SpanJsonCommonBlockWriter.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/spans/json/SpanJsonCommonBlockWriter.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/spans/json/SpanJsonTelemetryBlockWriter.java b/telemetry-core/src/main/java/com/newrelic/telemetry/spans/json/SpanJsonTelemetryBlockWriter.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/spans/json/SpanJsonTelemetryBlockWriter.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/spans/json/SpanJsonTelemetryBlockWriter.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/transport/BatchDataSender.java b/telemetry-core/src/main/java/com/newrelic/telemetry/transport/BatchDataSender.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/transport/BatchDataSender.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/transport/BatchDataSender.java diff --git a/telemetry_core/src/main/java/com/newrelic/telemetry/util/Utils.java b/telemetry-core/src/main/java/com/newrelic/telemetry/util/Utils.java similarity index 100% rename from telemetry_core/src/main/java/com/newrelic/telemetry/util/Utils.java rename to telemetry-core/src/main/java/com/newrelic/telemetry/util/Utils.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/AttributesTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/AttributesTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/AttributesTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/AttributesTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/BaseConfigTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/BaseConfigTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/BaseConfigTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/BaseConfigTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/EventBatchSenderFactoryTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/EventBatchSenderFactoryTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/EventBatchSenderFactoryTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/EventBatchSenderFactoryTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/LogBatchSenderFactoryTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/LogBatchSenderFactoryTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/LogBatchSenderFactoryTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/LogBatchSenderFactoryTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/MetricBatchSenderFactoryTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/MetricBatchSenderFactoryTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/MetricBatchSenderFactoryTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/MetricBatchSenderFactoryTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/ResponseTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/ResponseTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/ResponseTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/ResponseTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/SpanBatchSenderFactoryTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/SpanBatchSenderFactoryTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/SpanBatchSenderFactoryTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/SpanBatchSenderFactoryTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/TelemetryBatchTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/TelemetryBatchTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/TelemetryBatchTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/TelemetryBatchTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/events/EventBatchSenderTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/events/EventBatchSenderTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/events/EventBatchSenderTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/events/EventBatchSenderTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/events/EventBufferTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/events/EventBufferTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/events/EventBufferTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/events/EventBufferTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/events/EventTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/events/EventTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/events/EventTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/events/EventTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/events/json/EventBatchMarshallerTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/events/json/EventBatchMarshallerTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/events/json/EventBatchMarshallerTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/events/json/EventBatchMarshallerTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/events/json/EventToJsonTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/events/json/EventToJsonTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/events/json/EventToJsonTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/events/json/EventToJsonTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/json/AttributesJsonTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/json/AttributesJsonTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/json/AttributesJsonTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/json/AttributesJsonTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/json/MetricBatchJsonCommonBlockWriterTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/json/MetricBatchJsonCommonBlockWriterTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/json/MetricBatchJsonCommonBlockWriterTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/json/MetricBatchJsonCommonBlockWriterTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/json/MetricBatchJsonTelemetryBlockWriterTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/json/MetricBatchJsonTelemetryBlockWriterTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/json/MetricBatchJsonTelemetryBlockWriterTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/json/MetricBatchJsonTelemetryBlockWriterTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/logs/LogBatchSenderTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/logs/LogBatchSenderTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/logs/LogBatchSenderTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/logs/LogBatchSenderTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/logs/json/LogJsonCommonBlockWriterTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/logs/json/LogJsonCommonBlockWriterTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/logs/json/LogJsonCommonBlockWriterTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/logs/json/LogJsonCommonBlockWriterTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/logs/json/LogJsonTelemetryBlockWriterTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/logs/json/LogJsonTelemetryBlockWriterTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/logs/json/LogJsonTelemetryBlockWriterTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/logs/json/LogJsonTelemetryBlockWriterTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/metrics/CommonAttributesBuilderTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/metrics/CommonAttributesBuilderTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/metrics/CommonAttributesBuilderTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/metrics/CommonAttributesBuilderTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/metrics/CountTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/metrics/CountTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/metrics/CountTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/metrics/CountTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/metrics/GaugeTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/metrics/GaugeTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/metrics/GaugeTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/metrics/GaugeTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/metrics/MetricBatchSenderTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/metrics/MetricBatchSenderTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/metrics/MetricBatchSenderTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/metrics/MetricBatchSenderTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/metrics/MetricBatchTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/metrics/MetricBatchTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/metrics/MetricBatchTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/metrics/MetricBatchTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/metrics/MetricBufferTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/metrics/MetricBufferTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/metrics/MetricBufferTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/metrics/MetricBufferTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/metrics/MetricToJsonTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/metrics/MetricToJsonTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/metrics/MetricToJsonTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/metrics/MetricToJsonTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/metrics/MetricsBatchMarshallerTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/metrics/MetricsBatchMarshallerTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/metrics/MetricsBatchMarshallerTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/metrics/MetricsBatchMarshallerTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/metrics/SummaryTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/metrics/SummaryTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/metrics/SummaryTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/metrics/SummaryTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/spans/SpanBatchSenderBuilderTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/spans/SpanBatchSenderBuilderTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/spans/SpanBatchSenderBuilderTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/spans/SpanBatchSenderBuilderTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/spans/SpanBatchSenderTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/spans/SpanBatchSenderTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/spans/SpanBatchSenderTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/spans/SpanBatchSenderTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/spans/SpanBatchTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/spans/SpanBatchTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/spans/SpanBatchTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/spans/SpanBatchTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/spans/SpanBuilderTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/spans/SpanBuilderTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/spans/SpanBuilderTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/spans/SpanBuilderTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/spans/SpanTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/spans/SpanTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/spans/SpanTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/spans/SpanTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/spans/json/SpanJsonCommonBlockWriterTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/spans/json/SpanJsonCommonBlockWriterTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/spans/json/SpanJsonCommonBlockWriterTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/spans/json/SpanJsonCommonBlockWriterTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/spans/json/SpanJsonTelemetryBlockWriterTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/spans/json/SpanJsonTelemetryBlockWriterTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/spans/json/SpanJsonTelemetryBlockWriterTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/spans/json/SpanJsonTelemetryBlockWriterTest.java diff --git a/telemetry_core/src/test/java/com/newrelic/telemetry/transport/BatchDataSenderTest.java b/telemetry-core/src/test/java/com/newrelic/telemetry/transport/BatchDataSenderTest.java similarity index 100% rename from telemetry_core/src/test/java/com/newrelic/telemetry/transport/BatchDataSenderTest.java rename to telemetry-core/src/test/java/com/newrelic/telemetry/transport/BatchDataSenderTest.java From f8d1ac1e8986441a759f5d0b39babe54bc9a3490 Mon Sep 17 00:00:00 2001 From: Schalk Cronje Date: Fri, 2 Oct 2020 17:37:55 +0200 Subject: [PATCH 2/8] Clean up telemetry-core build --- build.gradle.kts | 3 ++- gradle.properties | 12 ++++++++++- settings.gradle | 2 +- telemetry-core/build.gradle.kts | 36 ++++++++++++++++----------------- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 85d15ba5..7a2ad158 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,6 +7,7 @@ plugins { id("maven-publish") id("signing") id("com.github.sherter.google-java-format") version "0.8" + id("com.github.johnrengelman.shadow") version "5.2.0" apply false } allprojects { @@ -25,7 +26,7 @@ allprojects { } } -listOf(":telemetry", ":telemetry-http-okhttp", ":telemetry-http-java11", ":telemetry-all").forEach { +listOf(":telemetry", ":telemetry-http-okhttp", ":telemetry-http-java11" /*, ":telemetry-all"*/).forEach { project(it) { apply(plugin = "java-library") apply(plugin = "maven-publish") diff --git a/gradle.properties b/gradle.properties index fad7a7ce..f9550a04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,8 @@ # # Here is where we manage the version -version=0.8.1 +group=com.newrelic.telemetry +version=0.8.2-SNAPSHOT # Set this to true to enable using a local sonatype (for debugging publishing issues) # Start a local sonatype in docker with this command: @@ -18,3 +19,12 @@ useLocalSonatype=false # or set SONATYPE_USERNAME and SONATYPE_PASSWORD env vars #sonatypeUsername=admin #sonatypePassword=admin123 + +# Dependency versions +slf4jVersion=1.7.30 +gsonVersion=2.8.6 +guavaVersion=27.1-jre +junitVersion=5.3.1 +jsonassertVersion=1.5.0 +mockitoVersion=2.23.0 +okhttpVersion=4.8.0 diff --git a/settings.gradle b/settings.gradle index 64aebf59..d8dceb50 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ include ':telemetry' -include ':telemetry-all' +//include ':telemetry-all' include ':telemetry_examples' include ':telemetry-core' include ':integration_test' diff --git a/telemetry-core/build.gradle.kts b/telemetry-core/build.gradle.kts index 4b36933a..cdf9ac19 100644 --- a/telemetry-core/build.gradle.kts +++ b/telemetry-core/build.gradle.kts @@ -5,21 +5,19 @@ import com.newrelic.telemetry.gradle.configuredPom plugins { java id("java-library") - id("com.github.johnrengelman.shadow") version "5.2.0" + id("com.github.johnrengelman.shadow") } +val junitVersion: String by project +val jsonassertVersion: String by project +val mockitoVersion: String by project +val guavaVersion: String by project +val slf4jVersion: String by project +val gsonVersion: String by project + apply(plugin = "maven-publish") apply(plugin = "signing") -private object Versions { - const val junit = "5.3.1" - const val guava = "27.1-jre" - const val mockito = "2.23.0" - const val slf4j = "1.7.30" - const val jsonassert = "1.5.0" - const val gson = "2.8.6" -} - configure { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -28,15 +26,15 @@ configure { configurations["shadow"].extendsFrom(configurations["api"]) dependencies { - api("org.slf4j:slf4j-api:${Versions.slf4j}") - implementation("com.google.code.gson:gson:${Versions.gson}") + api("org.slf4j:slf4j-api:${slf4jVersion}") + implementation("com.google.code.gson:gson:${gsonVersion}") - testImplementation("org.slf4j:slf4j-simple:${Versions.slf4j}") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Versions.junit}") - testImplementation("org.mockito:mockito-core:${Versions.mockito}") - testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.junit}") - testImplementation("com.google.guava:guava:${Versions.guava}") - testImplementation("org.skyscreamer:jsonassert:${Versions.jsonassert}") + testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}") + testImplementation("org.mockito:mockito-core:${mockitoVersion}") + testImplementation("org.junit.jupiter:junit-jupiter-api:${junitVersion}") + testImplementation("com.google.guava:guava:${guavaVersion}") + testImplementation("org.skyscreamer:jsonassert:${jsonassertVersion}") } val javadocJar by tasks.creating(Jar::class) { @@ -55,7 +53,7 @@ tasks { "shadowJar"(ShadowJar::class) { archiveClassifier.set("") dependencies { - exclude(dependency("org.slf4j:slf4j-api:${Versions.slf4j}")) + exclude(dependency("org.slf4j:slf4j-api:${slf4jVersion}")) } manifest { attributes(mapOf("Implementation-Version" to project.version, "Implementation-Vendor" to "New Relic, Inc.")) From 382c6c7ea3cacc647bcfc868457fafcda03d4a38 Mon Sep 17 00:00:00 2001 From: Schalk Cronje Date: Fri, 2 Oct 2020 17:39:11 +0200 Subject: [PATCH 3/8] Clean up telemetry-http-okhttp build --- telemetry-http-okhttp/build.gradle.kts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/telemetry-http-okhttp/build.gradle.kts b/telemetry-http-okhttp/build.gradle.kts index 63fec83a..ff94b072 100644 --- a/telemetry-http-okhttp/build.gradle.kts +++ b/telemetry-http-okhttp/build.gradle.kts @@ -1,8 +1,6 @@ -private object Versions { - const val okhttp = "4.8.0" - const val junit = "5.3.1" - const val jsonassert = "1.5.0" -} +val junitVersion: String by project +val jsonassertVersion: String by project +val okhttpVersion: String by project configure { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -12,9 +10,9 @@ configure { dependencies { implementation(project(":telemetry")) api(project(":telemetry-core")) - api("com.squareup.okhttp3:okhttp:${Versions.okhttp}") + api("com.squareup.okhttp3:okhttp:${okhttpVersion}") - testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.junit}") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Versions.junit}") - testImplementation("org.skyscreamer:jsonassert:${Versions.jsonassert}") + testImplementation("org.junit.jupiter:junit-jupiter-api:${junitVersion}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}") + testImplementation("org.skyscreamer:jsonassert:${jsonassertVersion}") } From 5ac51f0e35d3cc284666e695897cd19a1a9e9763 Mon Sep 17 00:00:00 2001 From: Schalk Cronje Date: Fri, 2 Oct 2020 17:40:23 +0200 Subject: [PATCH 4/8] Clean up telemetry-http-java11 build --- telemetry-http-java11/build.gradle.kts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/telemetry-http-java11/build.gradle.kts b/telemetry-http-java11/build.gradle.kts index f66ef6f2..b03b3d85 100644 --- a/telemetry-http-java11/build.gradle.kts +++ b/telemetry-http-java11/build.gradle.kts @@ -1,7 +1,5 @@ -private object Versions { - const val junit = "5.3.1" - const val jsonassert = "1.5.0" -} +val junitVersion: String by project +val jsonassertVersion: String by project configure { sourceCompatibility = JavaVersion.VERSION_11 @@ -12,7 +10,7 @@ dependencies { implementation(project(":telemetry")) api(project(":telemetry-core")) - testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.junit}") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Versions.junit}") - testImplementation("org.skyscreamer:jsonassert:${Versions.jsonassert}") + testImplementation("org.junit.jupiter:junit-jupiter-api:${junitVersion}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}") + testImplementation("org.skyscreamer:jsonassert:${jsonassertVersion}") } From b87ada3be5530c5aadd69f754756ea8708234782 Mon Sep 17 00:00:00 2001 From: Schalk Cronje Date: Fri, 2 Oct 2020 17:42:25 +0200 Subject: [PATCH 5/8] Clean up telemetry build --- telemetry/build.gradle.kts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/telemetry/build.gradle.kts b/telemetry/build.gradle.kts index 5405f9fc..920bdb0c 100644 --- a/telemetry/build.gradle.kts +++ b/telemetry/build.gradle.kts @@ -1,9 +1,6 @@ - -private object Versions { - const val junit = "5.3.1" - const val mockito = "2.23.0" - const val slf4j = "1.7.30" -} +val junitVersion: String by project +val mockitoVersion: String by project +val slf4jVersion: String by project configure { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -13,8 +10,8 @@ configure { dependencies { "api"(project(":telemetry-core")) - testImplementation("org.slf4j:slf4j-simple:${Versions.slf4j}") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Versions.junit}") - testImplementation("org.mockito:mockito-core:${Versions.mockito}") - testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.junit}") + testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}") + testImplementation("org.mockito:mockito-core:${mockitoVersion}") + testImplementation("org.junit.jupiter:junit-jupiter-api:${junitVersion}") } \ No newline at end of file From e06e9be36ef4f017ec1b8625a11a57d72b546e3a Mon Sep 17 00:00:00 2001 From: Schalk Cronje Date: Fri, 2 Oct 2020 17:55:05 +0200 Subject: [PATCH 6/8] Clean up integration_test build --- gradle.properties | 2 ++ integration_test/build.gradle.kts | 38 +++++++++++++++---------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/gradle.properties b/gradle.properties index f9550a04..6ecac532 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,4 +27,6 @@ guavaVersion=27.1-jre junitVersion=5.3.1 jsonassertVersion=1.5.0 mockitoVersion=2.23.0 +mockserverVersion=5.5.1 okhttpVersion=4.8.0 +testContainerVersion=1.11.3 diff --git a/integration_test/build.gradle.kts b/integration_test/build.gradle.kts index 28565e92..b24d9cf1 100644 --- a/integration_test/build.gradle.kts +++ b/integration_test/build.gradle.kts @@ -1,14 +1,14 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat -private object Versions { - const val junit = "5.3.1" - const val mockito = "2.23.0" - const val mockserver = "5.5.1" - const val slf4j = "1.7.26" - const val okhttp = "3.14.1" - const val guava = "27.1-jre" - const val testContainer = "1.11.3" -} +val guavaVersion: String by project +val junitVersion: String by project +val mockitoVersion: String by project +val mockserverVersion: String by project +val okhttpVersion: String by project +val slf4jVersion: String by project +val gsonVersion: String by project +val testContainerVersion: String by project + repositories { mavenCentral() jcenter() @@ -19,19 +19,19 @@ plugins { } dependencies { - implementation("org.mock-server:mockserver-client-java:${Versions.mockserver}") + implementation("org.mock-server:mockserver-client-java:${mockserverVersion}") implementation(project(":telemetry-core")) implementation(project(":telemetry-http-okhttp")) - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Versions.junit}") - testImplementation("org.junit.jupiter:junit-jupiter-params:${Versions.junit}") - testImplementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}") - testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.junit}") - testImplementation("org.mockito:mockito-core:${Versions.mockito}") - testImplementation("org.slf4j:slf4j-simple:${Versions.slf4j}") - testImplementation("com.google.guava:guava:${Versions.guava}") - testImplementation("org.testcontainers:testcontainers:${Versions.testContainer}") - testImplementation("org.testcontainers:junit-jupiter:${Versions.testContainer}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}") + testImplementation("org.junit.jupiter:junit-jupiter-params:${junitVersion}") + testImplementation("com.squareup.okhttp3:okhttp:${okhttpVersion}") + testImplementation("org.junit.jupiter:junit-jupiter-api:${junitVersion}") + testImplementation("org.mockito:mockito-core:${mockitoVersion}") + testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}") + testImplementation("com.google.guava:guava:${guavaVersion}") + testImplementation("org.testcontainers:testcontainers:${testContainerVersion}") + testImplementation("org.testcontainers:junit-jupiter:${testContainerVersion}") } tasks { From 2f958f9b9e03cce3faa19f54e523778d6af3613a Mon Sep 17 00:00:00 2001 From: Schalk Cronje Date: Fri, 2 Oct 2020 17:58:41 +0200 Subject: [PATCH 7/8] Converts settins.gradle to Kotlin DSL --- settings.gradle.kts | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 settings.gradle.kts diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..04f90930 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,10 @@ +rootProject.name = "newrelic-telemetry-sdk-java" + +include (":telemetry") +include (":telemetry-all") +include (":telemetry_examples") +include (":telemetry-core") +include (":integration_test") +include ("telemetry-http-okhttp") +include ("telemetry-http-java11") + From 2c9de45109c8ac584aa0a9951acdc086b790811f Mon Sep 17 00:00:00 2001 From: Schalk Cronje Date: Fri, 2 Oct 2020 18:20:41 +0200 Subject: [PATCH 8/8] Fixup telemetry-all --- build.gradle.kts | 6 +++--- settings.gradle | 7 ------- telemetry-all/build.gradle.kts | 35 +++++++++++++++++----------------- 3 files changed, 20 insertions(+), 28 deletions(-) delete mode 100644 settings.gradle diff --git a/build.gradle.kts b/build.gradle.kts index 7a2ad158..14426944 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,11 +7,11 @@ plugins { id("maven-publish") id("signing") id("com.github.sherter.google-java-format") version "0.8" - id("com.github.johnrengelman.shadow") version "5.2.0" apply false + id("org.ysb33r.java.modulehelper") version("0.9.0") apply false + id("com.github.johnrengelman.shadow") version ("5.2.0") apply false } allprojects { - group = "com.newrelic.telemetry" val release: String? by project version = if ("true" == release) version else "${version}-SNAPSHOT" repositories { @@ -26,7 +26,7 @@ allprojects { } } -listOf(":telemetry", ":telemetry-http-okhttp", ":telemetry-http-java11" /*, ":telemetry-all"*/).forEach { +listOf(":telemetry", ":telemetry-http-okhttp", ":telemetry-http-java11" , ":telemetry-all").forEach { project(it) { apply(plugin = "java-library") apply(plugin = "maven-publish") diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index d8dceb50..00000000 --- a/settings.gradle +++ /dev/null @@ -1,7 +0,0 @@ -include ':telemetry' -//include ':telemetry-all' -include ':telemetry_examples' -include ':telemetry-core' -include ':integration_test' -include 'telemetry-http-okhttp' -include 'telemetry-http-java11' diff --git a/telemetry-all/build.gradle.kts b/telemetry-all/build.gradle.kts index fb24f1b0..de29e620 100644 --- a/telemetry-all/build.gradle.kts +++ b/telemetry-all/build.gradle.kts @@ -1,14 +1,13 @@ -private object Versions { - const val slf4j = "1.7.30" - const val gson = "2.8.6" -} - plugins { java id("java-library") + id( "org.ysb33r.java.modulehelper") } -configure { +val slf4jVersion: String by project +val gsonVersion: String by project + +configure { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } @@ -17,28 +16,28 @@ sourceSets { main { java.setSrcDirs(listOf( "src/main/java", - "../telemetry_core/src/main/java", + "../telemetry-core/src/main/java", "../telemetry/src/main/java", "../telemetry-http-java11/src/main/java" )) resources.setSrcDirs(listOf( - "../telemetry_core/src/main/resources", + "../telemetry-core/src/main/resources", "../telemetry/src/main/resources", "../telemetry-http-java11/src/main/resources" )) } } + dependencies { - api("org.slf4j:slf4j-api:${Versions.slf4j}") - implementation("com.google.code.gson:gson:${Versions.gson}") + api("org.slf4j:slf4j-api:${slf4jVersion}") + implementation("com.google.code.gson:gson:${gsonVersion}") } -tasks.register("jarAll") { - dependsOn(configurations.runtimeClasspath) - from(sourceSets["main"].output) - configurations.runtimeClasspath.get().allDependencies.findAll(closureOf{ - val proj = this as ProjectDependency - from(proj.dependencyProject.sourceSets["main"].output) - }) - manifest.attributes["Automatic-Module-Name"] = "com.newrelic.telemetry" +extraJavaModules { + module("slf4j-api-${slf4jVersion}.jar", "org.slf4j", slf4jVersion) { + exports("org.slf4j") + } + module("gson-${gsonVersion}.jar", "com.google.code.gson", gsonVersion) { + exports("com.google.gson") + } }