Skip to content

Commit

Permalink
Upgrade dependencies (#2537)
Browse files Browse the repository at this point in the history 
Note: Errorprone/Nullaway are currently not working on JDK11
  • Loading branch information
@jplock @joschi
jplock authored and joschi committed Oct 27, 2018
1 parent 26f054a commit c2fa9e0
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 21 deletions.
12 changes: 6 additions & 6 deletions dropwizard-bom/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<dropwizard.version>${project.version}</dropwizard.version>
<guava.version>26.0-jre</guava.version>
<guava.version>27.0-jre</guava.version>
<jersey.version>2.27</jersey.version>
<jackson.version>2.9.7</jackson.version>
<jetty.version>9.4.12.v20180830</jetty.version>
Expand All @@ -28,15 +28,15 @@
<slf4j.version>1.7.25</slf4j.version>
<logback.version>1.2.3</logback.version>
<h2.version>1.4.197</h2.version>
<jdbi3.version>3.4.0</jdbi3.version>
<jdbi3.version>3.5.1</jdbi3.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>2.6</version>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.4</version>
<version>1.6</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -170,7 +170,7 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.8.21</version>
<version>1.9.2</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
Expand Down Expand Up @@ -603,7 +603,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down
4 changes: 2 additions & 2 deletions dropwizard-example/pom.xml
View file
Expand Up @@ -171,7 +171,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -280,7 +280,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
<executions>
<execution>
<id>prepare-agent</id>
Expand Down
16 changes: 14 additions & 2 deletions dropwizard-http2/pom.xml
View file
Expand Up @@ -97,9 +97,9 @@
see http://www.eclipse.org/jetty/documentation/current/alpn-chapter.html for reference. -->
<profiles>
<profile>
<id>jdk10</id>
<id>jdk9+</id>
<activation>
<jdk>[9, 11]</jdk>
<jdk>[9,)</jdk>
</activation>
<properties>
<argLine>-Duser.language=en -Duser.region=US</argLine>
Expand Down Expand Up @@ -511,5 +511,17 @@
<alpn-boot.version>8.1.12.v20180117</alpn-boot.version>
</properties>
</profile>
<profile>
<id>jdk-1.8.0_181</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_181</value>
</property>
</activation>
<properties>
<alpn-boot.version>8.1.12.v20180117</alpn-boot.version>
</properties>
</profile>
</profiles>
</project>
4 changes: 2 additions & 2 deletions dropwizard-lifecycle/src/main/java/io/dropwizard/lifecycle/setup/ExecutorServiceBuilder.java
View file
Expand Up @@ -18,6 +18,7 @@
public class ExecutorServiceBuilder {
private static Logger log = LoggerFactory.getLogger(ExecutorServiceBuilder.class);

private static final AtomicLong COUNT = new AtomicLong(0);
private final LifecycleEnvironment environment;
private final String nameFormat;
private int corePoolSize;
Expand Down Expand Up @@ -47,11 +48,10 @@ public ExecutorServiceBuilder(LifecycleEnvironment environment, String nameForma
}

private static ThreadFactory buildThreadFactory(String nameFormat) {
final AtomicLong count = (nameFormat != null) ? new AtomicLong(0) : null;
return r -> {
final Thread thread = Executors.defaultThreadFactory().newThread(r);
if (nameFormat != null) {
thread.setName(String.format(Locale.ROOT, nameFormat, count.incrementAndGet()));
thread.setName(String.format(Locale.ROOT, nameFormat, COUNT.incrementAndGet()));
}
return thread;
};
Expand Down
4 changes: 2 additions & 2 deletions ...ifecycle/src/main/java/io/dropwizard/lifecycle/setup/ScheduledExecutorServiceBuilder.java
View file
Expand Up @@ -14,6 +14,7 @@

public class ScheduledExecutorServiceBuilder {

private static final AtomicLong COUNT = new AtomicLong(0);
private final LifecycleEnvironment environment;
private final String nameFormat;
private int poolSize;
Expand All @@ -37,11 +38,10 @@ public ScheduledExecutorServiceBuilder(LifecycleEnvironment environment, String
}

private static ThreadFactory buildThreadFactory(String nameFormat, boolean daemon) {
final AtomicLong count = (nameFormat != null) ? new AtomicLong(0) : null;
return r -> {
final Thread thread = Executors.defaultThreadFactory().newThread(r);
if (nameFormat != null) {
thread.setName(String.format(Locale.ROOT, nameFormat, count.incrementAndGet()));
thread.setName(String.format(Locale.ROOT, nameFormat, COUNT.incrementAndGet()));
}
thread.setDaemon(daemon);
return thread;
Expand Down
2 changes: 1 addition & 1 deletion dropwizard-testing/pom.xml
View file
Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>1.2.0</version>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Expand Up @@ -66,9 +66,9 @@
<argLine>-Duser.language=en -Duser.region=US</argLine>

<junit.version>4.12</junit.version>
<junit5.version>5.2.0</junit5.version>
<junit5.version>5.3.1</junit5.version>
<assertj.version>3.11.1</assertj.version>
<mockito.version>2.22.0</mockito.version>
<mockito.version>2.23.0</mockito.version>
</properties>

<developers>
Expand Down Expand Up @@ -353,7 +353,7 @@
<path>
<groupId>com.uber.nullaway</groupId>
<artifactId>nullaway</artifactId>
<version>0.5.4</version>
<version>0.6.0</version>
</path>
</annotationProcessorPaths>
<compilerArgs>
Expand All @@ -367,12 +367,12 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>2.8.4</version>
<version>2.8.5</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.3.1</version>
<version>2.3.2</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -551,7 +551,7 @@
<plugin>
<groupId>kr.motd.maven</groupId>
<artifactId>sphinx-maven-plugin</artifactId>
<version>2.2.2</version>
<version>2.2.3</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down

0 comments on commit c2fa9e0

Please sign in to comment.