Skip to content

Commit 2e4271e

Browse files
jamtur01jamtur01
committed
More deprecation fixes
1 parent 9720b63 commit 2e4271e

File tree

4 files changed

+201
-156
lines changed

4 files changed

+201
-156
lines changed

‎metrics3-riemann-reporter/src/test/java/com/codahale/metrics/riemann/RiemannReporterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private void verifyNoReporting() throws IOException {
8888
final InOrder inOrder = inOrder(riemann, eventDSL, client);
8989
inOrder.verify(riemann).connect();
9090
inOrder.verify(client, never()).event();
91-
verifyZeroInteractions(eventDSL);
91+
verifyNoInteractions(eventDSL);
9292
inOrder.verify(client).flush();
9393
inOrder.verifyNoMoreInteractions();
9494
}

‎metrics4-riemann-reporter/src/test/java/com/codahale/metrics/riemann/RiemannReporterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private void verifyNoReporting() throws IOException {
8888
final InOrder inOrder = inOrder(riemann, eventDSL, client);
8989
inOrder.verify(riemann).connect();
9090
inOrder.verify(client, never()).event();
91-
verifyZeroInteractions(eventDSL);
91+
verifyNoInteractions(eventDSL);
9292
inOrder.verify(client).flush();
9393
inOrder.verifyNoMoreInteractions();
9494
}

‎pom.xml‎

Lines changed: 191 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -1,157 +1,199 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>io.riemann</groupId>
6-
<artifactId>riemann-java-client-parent</artifactId>
7-
<version>0.5.4-SNAPSHOT</version>
8-
<modules>
9-
<module>riemann-java-client</module>
10-
<module>metrics2-riemann-reporter</module>
11-
<module>metrics3-riemann-reporter</module>
12-
<module>metrics4-riemann-reporter</module>
13-
</modules>
14-
<packaging>pom</packaging>
15-
<name>Riemann Java Client</name>
16-
<description>Java client for http://riemann.io/</description>
17-
<url>/</url>
18-
19-
<properties>
20-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
22-
</properties>
23-
24-
<licenses>
25-
<license>
26-
<name>Apache-2.0</name>
27-
<url>https://choosealicense.com/licenses/apache-2.0/</url>
28-
</license>
29-
</licenses>
30-
31-
<dependencyManagement>
32-
<dependencies>
33-
<dependency>
34-
<groupId>io.netty</groupId>
35-
<artifactId>netty-bom</artifactId>
36-
<version>4.1.79.Final</version>
37-
<type>pom</type>
38-
<scope>import</scope>
39-
</dependency>
40-
</dependencies>
41-
</dependencyManagement>
4+
<modelVersion>4.0.0</modelVersion>
425

6+
<groupId>io.riemann</groupId>
7+
<artifactId>riemann-java-client-parent</artifactId>
8+
<version>0.5.4-SNAPSHOT</version>
9+
<packaging>pom</packaging>
10+
11+
<modules>
12+
<module>riemann-java-client</module>
13+
<module>metrics2-riemann-reporter</module>
14+
<module>metrics3-riemann-reporter</module>
15+
<module>metrics4-riemann-reporter</module>
16+
</modules>
17+
18+
<name>Riemann Java Client</name>
19+
<description>Java client for http://riemann.io/</description>
20+
<url>/</url>
21+
22+
<properties>
23+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25+
26+
<protobuf.version>3.24.4</protobuf.version>
27+
</properties>
28+
29+
<licenses>
30+
<license>
31+
<name>Apache-2.0</name>
32+
<url>https://choosealicense.com/licenses/apache-2.0/</url>
33+
</license>
34+
</licenses>
35+
36+
<dependencyManagement>
4337
<dependencies>
44-
<!-- TEST DEP's -->
45-
<dependency>
46-
<groupId>junit</groupId>
47-
<artifactId>junit</artifactId>
48-
<version>4.13.1</version>
49-
<scope>test</scope>
50-
</dependency>
51-
52-
<dependency>
53-
<groupId>org.mockito</groupId>
54-
<artifactId>mockito-core</artifactId>
55-
<version>3.12.4</version>
56-
<scope>test</scope>
57-
</dependency>
38+
<dependency>
39+
<groupId>io.netty</groupId>
40+
<artifactId>netty-bom</artifactId>
41+
<version>4.1.79.Final</version>
42+
<type>pom</type>
43+
<scope>import</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>com.google.protobuf</groupId>
47+
<artifactId>protobuf-java</artifactId>
48+
<version>${protobuf.version}</version>
49+
</dependency>
5850
</dependencies>
51+
</dependencyManagement>
52+
53+
<dependencies>
54+
<!-- TEST DEPs -->
55+
<dependency>
56+
<groupId>junit</groupId>
57+
<artifactId>junit</artifactId>
58+
<version>4.13.1</version>
59+
<scope>test</scope>
60+
</dependency>
61+
62+
<dependency>
63+
<groupId>org.mockito</groupId>
64+
<artifactId>mockito-core</artifactId>
65+
<version>3.12.4</version>
66+
<scope>test</scope>
67+
</dependency>
68+
</dependencies>
69+
70+
<build>
71+
<extensions>
72+
<extension>
73+
<groupId>kr.motd.maven</groupId>
74+
<artifactId>os-maven-plugin</artifactId>
75+
<version>1.7.1</version>
76+
</extension>
77+
</extensions>
78+
79+
<plugins>
80+
<plugin>
81+
<groupId>org.apache.maven.plugins</groupId>
82+
<artifactId>maven-compiler-plugin</artifactId>
83+
<version>3.11.0</version>
84+
<configuration>
85+
<release>8</release>
86+
<compilerArgs>
87+
<arg>-Xlint:deprecation</arg>
88+
<arg>-Xlint:unchecked</arg>
89+
</compilerArgs>
90+
</configuration>
91+
</plugin>
92+
93+
<!-- Inherit add-source for all modules that generate into target/generated-sources -->
94+
<plugin>
95+
<groupId>org.codehaus.mojo</groupId>
96+
<artifactId>build-helper-maven-plugin</artifactId>
97+
<version>3.6.0</version>
98+
<executions>
99+
<execution>
100+
<id>add-source</id>
101+
<phase>generate-sources</phase>
102+
<goals>
103+
<goal>add-source</goal>
104+
</goals>
105+
<configuration>
106+
<sources>
107+
<source>target/generated-sources</source>
108+
</sources>
109+
</configuration>
110+
</execution>
111+
</executions>
112+
</plugin>
113+
114+
<plugin>
115+
<groupId>org.apache.maven.plugins</groupId>
116+
<artifactId>maven-source-plugin</artifactId>
117+
<version>3.0.1</version>
118+
<executions>
119+
<execution>
120+
<id>attach-sources</id>
121+
<goals>
122+
<goal>jar-no-fork</goal>
123+
</goals>
124+
</execution>
125+
</executions>
126+
</plugin>
127+
128+
<plugin>
129+
<groupId>org.apache.maven.plugins</groupId>
130+
<artifactId>maven-javadoc-plugin</artifactId>
131+
<version>3.4.0</version>
132+
<configuration>
133+
<source>8</source>
134+
<detectJavaApiLink>false</detectJavaApiLink>
135+
</configuration>
136+
<executions>
137+
<execution>
138+
<id>attach-javadocs</id>
139+
<goals>
140+
<goal>jar</goal>
141+
</goals>
142+
</execution>
143+
</executions>
144+
</plugin>
145+
146+
<plugin>
147+
<groupId>org.apache.felix</groupId>
148+
<artifactId>maven-bundle-plugin</artifactId>
149+
<version>3.0.1</version>
150+
<extensions>true</extensions>
151+
<configuration>
152+
<instructions>
153+
<Export-Package>
154+
io.riemann.riemann;-noimport:=true,
155+
io.riemann.riemann.client;-noimport:=true,
156+
com.codahale.metrics.riemann;-noimport:=true,
157+
com.yammer.metrics.reporting;-noimport:=true
158+
</Export-Package>
159+
<Import-Package>
160+
io.dropwizard.metrics;version="[3.6.1)";resolution:="optional",
161+
com.yammer.metrics;resolution:="optional",
162+
com.yammer.metrics.core;resolution:="optional",
163+
com.yammer.metrics.stats;resolution:="optional",
164+
*
165+
</Import-Package>
166+
</instructions>
167+
</configuration>
168+
</plugin>
169+
170+
<plugin>
171+
<groupId>org.xolstice.maven.plugins</groupId>
172+
<artifactId>protobuf-maven-plugin</artifactId>
173+
<version>0.6.1</version>
174+
<configuration>
175+
<protocArtifact>
176+
com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
177+
</protocArtifact>
178+
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
179+
<protoSourceRoot>${basedir}/src/main/proto</protoSourceRoot>
180+
</configuration>
181+
<executions>
182+
<execution>
183+
<goals>
184+
<goal>compile</goal>
185+
</goals>
186+
</execution>
187+
</executions>
188+
</plugin>
189+
</plugins>
190+
</build>
59191

60-
<build>
61-
<plugins>
62-
<plugin>
63-
<groupId>org.apache.maven.plugins</groupId>
64-
<artifactId>maven-compiler-plugin</artifactId>
65-
<version>3.8.0</version>
66-
<configuration>
67-
<source>1.8</source>
68-
<target>1.8</target>
69-
</configuration>
70-
</plugin>
71-
72-
<plugin>
73-
<groupId>org.codehaus.mojo</groupId>
74-
<artifactId>build-helper-maven-plugin</artifactId>
75-
<version>3.0.0</version>
76-
<executions>
77-
<execution>
78-
<id>add-source</id>
79-
<phase>generate-sources</phase>
80-
<goals>
81-
<goal>add-source</goal>
82-
</goals>
83-
<configuration>
84-
<sources>
85-
<source>target/generated-sources</source>
86-
</sources>
87-
</configuration>
88-
</execution>
89-
</executions>
90-
</plugin>
91-
92-
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-source-plugin</artifactId>
95-
<version>3.0.1</version>
96-
<executions>
97-
<execution>
98-
<id>attach-sources</id>
99-
<goals>
100-
<goal>jar-no-fork</goal>
101-
</goals>
102-
</execution>
103-
</executions>
104-
</plugin>
105-
106-
<plugin>
107-
<groupId>org.apache.maven.plugins</groupId>
108-
<artifactId>maven-javadoc-plugin</artifactId>
109-
<configuration>
110-
<source>8</source>
111-
<detectJavaApiLink>false</detectJavaApiLink>
112-
</configuration>
113-
<version>3.4.0</version>
114-
<executions>
115-
<execution>
116-
<id>attach-javadocs</id>
117-
<goals>
118-
<goal>jar</goal>
119-
</goals>
120-
</execution>
121-
</executions>
122-
</plugin>
123-
124-
<plugin>
125-
<groupId>org.apache.felix</groupId>
126-
<artifactId>maven-bundle-plugin</artifactId>
127-
<version>3.0.1</version>
128-
<extensions>true</extensions>
129-
<configuration>
130-
<instructions>
131-
<Export-Package>
132-
io.riemann.riemann;-noimport:=true,
133-
io.riemann.riemann.client;-noimport:=true,
134-
com.codahale.metrics.riemann;-noimport:=true,
135-
com.yammer.metrics.reporting;-noimport:=true
136-
</Export-Package>
137-
<Import-Package>
138-
io.dropwizard.metrics;version="[3.6.1)";resolution:="optional",
139-
com.yammer.metrics;resolution:="optional",
140-
com.yammer.metrics.core;resolution:="optional",
141-
com.yammer.metrics.stats;resolution:="optional",
142-
*
143-
</Import-Package>
144-
</instructions>
145-
</configuration>
146-
</plugin>
147-
</plugins>
148-
</build>
149-
150-
<distributionManagement>
151-
<repository>
152-
<id>clojars</id>
153-
<name>Clojars</name>
154-
<url>https://clojars.org/repo</url>
155-
</repository>
156-
</distributionManagement>
192+
<distributionManagement>
193+
<repository>
194+
<id>clojars</id>
195+
<name>Clojars</name>
196+
<url>https://clojars.org/repo</url>
197+
</repository>
198+
</distributionManagement>
157199
</project>

‎riemann-java-client/pom.xml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,14 @@
8787
<plugin>
8888
<groupId>org.apache.maven.plugins</groupId>
8989
<artifactId>maven-compiler-plugin</artifactId>
90-
<version>3.8.0</version>
91-
<configuration>
92-
<source>1.8</source>
93-
<target>1.8</target>
94-
</configuration>
90+
<version>3.11.0</version>
91+
<configuration>
92+
<release>8</release>
93+
<compilerArgs>
94+
<arg>-Xlint:deprecation</arg>
95+
<arg>-Xlint:unchecked</arg>
96+
</compilerArgs>
97+
</configuration>
9598
</plugin>
9699
</plugins>
97100
</build>

0 commit comments

Comments
 (0)