Skip to content

Commit

Permalink
bumped version to 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Massimiliano Pippi committed Jul 12, 2016
1 parent 8230e1a commit aa47ec6
Show file tree
Hide file tree
Showing 3 changed files with 135 additions and 135 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The client jar is distributed via maven central, and can be downloaded [here](ht
<dependency>
<groupId>com.datadoghq</groupId>
<artifactId>java-dogstatsd-client</artifactId>
<version>2.1.1</version>
<version>2.2</version>
</dependency>
```

Expand Down
264 changes: 133 additions & 131 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,141 +1,143 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>

<groupId>com.datadoghq</groupId>
<artifactId>java-dogstatsd-client</artifactId>
<packaging>jar</packaging>
<name>java-dogstatsd-client</name>
<version>2.1.1-SNAPSHOT</version>
<description>A tiny library allowing Java applications to communicate with DataDog statsd instances easily.</description>
<url>https://github.com/DataDog/java-dogstatsd-client</url>
<groupId>com.datadoghq</groupId>
<artifactId>java-dogstatsd-client</artifactId>
<packaging>jar</packaging>
<name>java-dogstatsd-client</name>
<version>2.2</version>
<description>A tiny library allowing Java applications to communicate with DataDog statsd instances easily.</description>
<url>https://github.com/DataDog/java-dogstatsd-client</url>

<properties>
<java.version>1.6</java.version>
</properties>
<properties>
<java.version>1.6</java.version>
</properties>

<licenses>
<license>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
<licenses>
<license>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>https://github.com/DataDog/java-dogstatsd-client</url>
<connection>scm:git:git://github.com/DataDog/java-dogstatsd-client.git</connection>
<developerConnection>scm:git:git@github.com:Datadog/java-dogstatsd-client.git</developerConnection>
<tag>HEAD</tag>
<scm>
<url>https://github.com/DataDog/java-dogstatsd-client</url>
<connection>scm:git:git://github.com/DataDog/java-dogstatsd-client.git</connection>
<developerConnection>scm:git:git@github.com:Datadog/java-dogstatsd-client.git</developerConnection>
<tag>HEAD</tag>
</scm>

<developers>
<developer> <!-- Additions for new Datadog features -->
<id>datadog</id>
<name>Datadog developers</name>
<email>dev@datadoghq.com</email>
</developer>
<developer> <!-- Initial datadog port -->
<id>duffy</id>
<name>Charles Duffy</name>
<email>duffy@indeed.com</email>
</developer>
<developer> <!-- Upstream, pre-datadog version -->
<id>scarytom</id>
<name>Tom Denley</name>
<email>tom.denley@timgroup.com</email>
</developer>
</developers>
<developers>
<developer> <!-- Additions for new Datadog features -->
<id>datadog</id>
<name>Datadog developers</name>
<email>dev@datadoghq.com</email>
</developer>
<developer> <!-- Initial datadog port -->
<id>duffy</id>
<name>Charles Duffy</name>
<email>duffy@indeed.com</email>
</developer>
<developer> <!-- Upstream, pre-datadog version -->
<id>scarytom</id>
<name>Tom Denley</name>
<email>tom.denley@timgroup.com</email>
</developer>
</developers>

<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
<version>1.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<version>4.12</version>
</dependency>
</dependencies>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
<version>1.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<version>4.12</version>
</dependency>
</dependencies>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>

</project>
4 changes: 1 addition & 3 deletions src/main/java/com/timgroup/statsd/NonBlockingStatsDClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
* From the perspective of the application, these methods are non-blocking, with the resulting
* IO operations being carried out in a separate thread. Furthermore, these methods are guaranteed
* not to throw an exception which may disrupt application execution.
* </p>
*
* <p>As part of a clean system shutdown, the {@link #stop()} method should be invoked
* on any StatsD clients.</p>
Expand Down Expand Up @@ -642,7 +641,7 @@ private String escapeEventString(final String title) {
public void recordServiceCheckRun(final ServiceCheck sc) {
send(toStatsDString(sc));
}

private String toStatsDString(final ServiceCheck sc) {
// see http://docs.datadoghq.com/guides/dogstatsd/#service-checks
final StringBuilder sb = new StringBuilder();
Expand Down Expand Up @@ -763,7 +762,6 @@ private void blockingSend(final InetSocketAddress address) throws IOException {
* @param hostname the host name of the targeted StatsD server
* @param port the port of the targeted StatsD server
* @return a function to perform the lookup
* @see NonBlockingStatsDClient#NonBlockingStatsDClient(String, String[], StatsDClientErrorHandler, Callable)
*/
public static Callable<InetSocketAddress> volatileAddressResolution(final String hostname, final int port) {
return new Callable<InetSocketAddress>() {
Expand Down

0 comments on commit aa47ec6

Please sign in to comment.