bumped version to 1.0.0 and updated dependencies

kairosdb · Mar 25, 2024 · 8987cac · 8987cac
1 parent 2fe6331
commit 8987cac
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 57 deletions.
diff --git a/metrics4j/pom.xml b/metrics4j/pom.xml
@@ -6,12 +6,12 @@
 
 	<groupId>org.kairosdb</groupId>
 	<artifactId>metrics4j</artifactId>
-	<version>0.21.0-SNAPSHOT</version>
+	<version>1.0.0</version>
 
 	<parent>
 		<groupId>org.kairosdb</groupId>
 		<artifactId>metrics4j-all</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 	</parent>
 
 	<name>metrics4j</name>
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>com.typesafe</groupId>
 			<artifactId>config</artifactId>
-			<version>1.4.0</version>
+			<version>1.4.3</version>
 		</dependency>
 	</dependencies>
 

diff --git a/metrics4j/src/main/java/org/kairosdb/metrics4j/collectors/impl/LongCounter.java b/metrics4j/src/main/java/org/kairosdb/metrics4j/collectors/impl/LongCounter.java
@@ -1,6 +1,5 @@
 package org.kairosdb.metrics4j.collectors.impl;
 
-import com.sun.javafx.image.BytePixelSetter;
 import lombok.EqualsAndHashCode;
 import lombok.Setter;
 import lombok.ToString;

diff --git a/metrics4j/src/main/java/org/kairosdb/metrics4j/sinks/TextSocketSink.java b/metrics4j/src/main/java/org/kairosdb/metrics4j/sinks/TextSocketSink.java
@@ -6,7 +6,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.annotation.XmlAttribute;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.IOException;

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/MetricThreadHelperTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/MetricThreadHelperTest.java
@@ -4,7 +4,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.kairosdb.metrics4j.collectors.impl.BagCollector;
-import org.kairosdb.metrics4j.collectors.impl.DoubleCounter;
 import org.kairosdb.metrics4j.collectors.impl.LongCounter;
 import org.kairosdb.metrics4j.configuration.MetricConfig;
 import org.kairosdb.metrics4j.configuration.TestFormatter;
@@ -26,7 +25,6 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
 import static org.kairosdb.metrics4j.configuration.MetricConfig.CONFIG_SYSTEM_PROPERTY;
 import static org.kairosdb.metrics4j.configuration.MetricConfig.OVERRIDES_SYSTEM_PROPERTY;
 import static org.mockito.Mockito.mock;

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/Metrics4jTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/Metrics4jTest.java
@@ -2,7 +2,6 @@
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import net.bytebuddy.asm.Advice;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -18,15 +17,13 @@
 import org.kairosdb.metrics4j.reporting.LongValue;
 import org.kairosdb.metrics4j.sinks.MetricSink;
 import org.mockito.ArgumentCaptor;
-import org.mockito.ArgumentMatchers;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/collectors/CollectorsTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/collectors/CollectorsTest.java
@@ -18,9 +18,7 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 public class CollectorsTest

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/collectors/DoubleCounterTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/collectors/DoubleCounterTest.java
@@ -12,7 +12,6 @@
 import static org.kairosdb.metrics4j.internal.ReportingContext.AGGREGATION_KEY;
 import static org.kairosdb.metrics4j.internal.ReportingContext.TYPE_COUNTER_VALUE;
 import static org.kairosdb.metrics4j.internal.ReportingContext.TYPE_KEY;
-import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/collectors/LongCounterTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/collectors/LongCounterTest.java
@@ -10,7 +10,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/collectors/SimpleStatsTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/collectors/SimpleStatsTest.java
@@ -7,16 +7,13 @@
 import org.kairosdb.metrics4j.reporting.LongValue;
 import org.kairosdb.metrics4j.reporting.MetricReporter;
 import org.kairosdb.metrics4j.reporting.ReportedMetric;
-import org.mockito.ArgumentMatchers;
 
 import java.util.HashMap;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.kairosdb.metrics4j.internal.ReportingContext.TYPE_KEY;
 import static org.kairosdb.metrics4j.internal.ReportingContext.TYPE_SUMMARY_VALUE;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.ArgumentMatchers.anyMapOf;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/collectors/TimestampCounterTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/collectors/TimestampCounterTest.java
@@ -5,7 +5,6 @@
 import org.kairosdb.metrics4j.internal.ReportedMetricImpl;
 import org.kairosdb.metrics4j.reporting.LongValue;
 import org.kairosdb.metrics4j.reporting.MetricReporter;
-import org.kairosdb.metrics4j.reporting.MetricValue;
 import org.kairosdb.metrics4j.reporting.ReportedMetric;
 import org.kairosdb.metrics4j.util.Clock;
 

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/configuration/MetricConfigTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/configuration/MetricConfigTest.java
@@ -5,7 +5,6 @@
 import org.junit.jupiter.api.Test;
 import org.kairosdb.metrics4j.MetricSourceManager;
 import org.kairosdb.metrics4j.collectors.LongCollector;
-import org.kairosdb.metrics4j.collectors.impl.ChainedLongCollector;
 import org.kairosdb.metrics4j.collectors.impl.DoubleCounter;
 import org.kairosdb.metrics4j.collectors.impl.LongCounter;
 import org.kairosdb.metrics4j.formatters.DefaultFormatter;
@@ -18,22 +17,17 @@
 import org.kairosdb.metrics4j.reporting.ReportedMetric;
 import org.kairosdb.metrics4j.sinks.MetricSink;
 import org.mockito.ArgumentCaptor;
-import org.xml.sax.SAXException;
 
-import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
-import java.io.IOException;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.kairosdb.metrics4j.configuration.MetricConfig.CONFIG_SYSTEM_PROPERTY;
 import static org.kairosdb.metrics4j.configuration.MetricConfig.OVERRIDES_SYSTEM_PROPERTY;
 import static org.kairosdb.metrics4j.configuration.MetricConfig.appendSourceName;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/configuration/TestSource.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/configuration/TestSource.java
@@ -3,8 +3,6 @@
 import org.kairosdb.metrics4j.annotation.Key;
 import org.kairosdb.metrics4j.collectors.DoubleCollector;
 import org.kairosdb.metrics4j.collectors.LongCollector;
-import org.kairosdb.metrics4j.collectors.impl.DoubleCounter;
-import org.kairosdb.metrics4j.collectors.impl.LongCounter;
 
 public interface TestSource
 {

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/formatters/DefaultFormatterTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/formatters/DefaultFormatterTest.java
@@ -5,7 +5,6 @@
 import org.kairosdb.metrics4j.reporting.LongValue;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
 
 class DefaultFormatterTest
 {

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/internal/ArgKeyTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/internal/ArgKeyTest.java
@@ -3,12 +3,9 @@
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
 
 class ArgKeyTest
 {

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/plugins/TestCompositMXBean.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/plugins/TestCompositMXBean.java
@@ -1,6 +1,5 @@
 package org.kairosdb.metrics4j.plugins;
 
-import javax.management.openmbean.CompositeData;
 
 public interface TestCompositMXBean
 {

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/plugins/TestMXBean.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/plugins/TestMXBean.java
@@ -1,6 +1,5 @@
 package org.kairosdb.metrics4j.plugins;
 
-import javax.management.DynamicMBean;
 
 public interface TestMXBean
 {

diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/sinks/TelnetSinkTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/sinks/TelnetSinkTest.java
@@ -11,7 +11,6 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
 
 class TelnetSinkTest
 {

diff --git a/plugins/influxdb/pom.xml b/plugins/influxdb/pom.xml
@@ -6,12 +6,12 @@
 
 	<groupId>org.kairosdb.metrics4jplugin</groupId>
 	<artifactId>m4j-influxdb</artifactId>
-	<version>0.7.0</version>
+	<version>1.0.0</version>
 
 	<parent>
 		<groupId>org.kairosdb</groupId>
 		<artifactId>metrics4j-all</artifactId>
-		<version>1.0.1</version>
+		<version>1.2.0</version>
 	</parent>
 
 	<name>metrics4j-influx</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.kairosdb</groupId>
 			<artifactId>metrics4j</artifactId>
-			<version>0.21.0-SNAPSHOT</version>
+			<version>1.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/plugins/kairosdb/pom.xml b/plugins/kairosdb/pom.xml
@@ -6,12 +6,12 @@
 
 	<groupId>org.kairosdb.metrics4jplugin</groupId>
 	<artifactId>m4j-kairosdb</artifactId>
-	<version>0.6.0</version>
+	<version>1.0.0</version>
 
 	<parent>
 		<groupId>org.kairosdb</groupId>
 		<artifactId>metrics4j-all</artifactId>
-		<version>1.0.1</version>
+		<version>1.2.0</version>
 	</parent>
 
 	<name>metrics4j-kairos</name>
@@ -47,13 +47,13 @@
 		<dependency>
 			<groupId>org.kairosdb</groupId>
 			<artifactId>metrics4j</artifactId>
-			<version>0.21.0-SNAPSHOT</version>
+			<version>1.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.kairosdb</groupId>
 			<artifactId>client</artifactId>
-			<version>3.0.1</version>
+			<version>3.1.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/plugins/opentelemetry/pom.xml b/plugins/opentelemetry/pom.xml
@@ -6,12 +6,12 @@
 
 	<groupId>org.kairosdb.metrics4jplugin</groupId>
 	<artifactId>m4j-otel</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
+	<version>1.0.0</version>
 
 	<parent>
 		<groupId>org.kairosdb</groupId>
 		<artifactId>metrics4j-all</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 	</parent>
 
 	<name>metrics4j-otel</name>
@@ -47,13 +47,13 @@
 		<dependency>
 			<groupId>org.kairosdb</groupId>
 			<artifactId>metrics4j</artifactId>
-			<version>0.21.0-SNAPSHOT</version>
+			<version>1.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.opentelemetry</groupId>
 			<artifactId>opentelemetry-exporter-otlp</artifactId>
-			<version>1.30.1</version>
+			<version>1.36.0</version>
 		</dependency>
 		<!--<dependency>
 			<groupId>org.kairosdb</groupId>

diff --git a/plugins/prometheus/pom.xml b/plugins/prometheus/pom.xml
@@ -6,12 +6,12 @@
 
 	<groupId>org.kairosdb.metrics4jplugin</groupId>
 	<artifactId>m4j-prometheus</artifactId>
-	<version>0.6.0</version>
+	<version>1.0.0</version>
 
 	<parent>
 		<groupId>org.kairosdb</groupId>
 		<artifactId>metrics4j-all</artifactId>
-		<version>1.0.1</version>
+		<version>1.2.0</version>
 	</parent>
 
 	<name>metrics4j-prometheus</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.kairosdb</groupId>
 			<artifactId>metrics4j</artifactId>
-			<version>0.21.0-SNAPSHOT</version>
+			<version>1.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>org.kairosdb</groupId>
 	<artifactId>metrics4j-all</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 	<packaging>pom</packaging>
 
 	<name>metrics4j-all</name>
@@ -51,44 +51,45 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.26</version>
+			<!--<version>1.7.36</version>-->
+			<version>2.0.12</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.10</version>
+			<version>1.18.32</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.12.0</version>
+			<version>2.23.1</version>
 			<scope>test</scope>
 		</dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.5.1</version>
+            <version>5.10.2</version>
 			<scope>test</scope>
         </dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.5.1</version>
+			<version>5.10.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-            <version>3.14.0</version>
+            <version>3.25.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>2.23.0</version>
+			<version>5.11.0</version>
 			<scope>test</scope>
 		</dependency>
     </dependencies>
@@ -100,8 +101,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.1</version>
 				<configuration>
-					<source>8</source>
-					<target>8</target>
+					<source>11</source>
+					<target>11</target>
 				</configuration>
 			</plugin>
 			<plugin>