Skip to content

Commit

Permalink
Dependency updates (#2168)
Browse files Browse the repository at this point in the history 
* Upgrade to Mockito 2.10.0

* Upgrade to Guava 23.1

* Upgrade to Hibernate 5.2.11.Final

* Upgrade to classmate 1.3.4

* Upgrade to tomcat-jdbc 8.5.23

* Upgrade to Errorprone 2.1.1

* Upgrade to JMH 1.19

* Upgrade Maven plugins
  • Loading branch information
@joschi @arteam
joschi authored and arteam committed Oct 5, 2017
1 parent 2fb3e60 commit 1f2f040
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 40 deletions.
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Expand Up @@ -28,7 +28,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<version>3.0.0</version>
<executions>
<execution>
<id>parse-version</id>
Expand Down
10 changes: 6 additions & 4 deletions docs/source/about/release-notes.rst
View file
Expand Up @@ -23,21 +23,23 @@ v1.2.0: Unreleased
* Add optional Jersey filters `#1948 <https://github.com/dropwizard/dropwizard/pull/1948>`_
* Upgrade to Apache commons-lang3 3.6
* Upgrade to AssertJ 3.8.0
* Upgrade to Guava 23.0
* Upgrade to classmate 1.3.4
* Upgrade to Guava 23.1
* Upgrade to H2 1.4.196
* Upgrade to Hibernate 5.2.10.Final
* Upgrade to Hibernate 5.2.11.Final
* Upgrade to Hibernate Validator 5.4.1.Final
* Upgrade to HSQLDB 2.4.0
* Upgrade to Jackson 2.9.1
* Upgrade to Jetty 9.4.7.v20170914
* Upgrade to JMH 1.19
* Upgrade to Joda-Time 2.9.9
* Upgrade to Logback 1.2.3
* Upgrade to Metrics 3.2.5
* Upgrade to Mockito 2.8.47
* Upgrade to Mockito 2.10.0
* Upgrade to Mustache.java 0.9.5
* Upgrade to Objenesis 2.6
* Upgrade to SLF4J 1.7.25
* Upgrade to tomcat-jdbc 8.5.20
* Upgrade to tomcat-jdbc 8.5.23

.. _rel-1.1.4:

Expand Down
10 changes: 5 additions & 5 deletions dropwizard-archetypes/pom.xml
View file
Expand Up @@ -32,18 +32,18 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
<version>2.4</version>
<version>3.0.1</version>
</extension>
</extensions>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
<version>2.4</version>
<version>3.0.1</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<version>3.0.2</version>
<configuration>
<escapeString>\</escapeString>
</configuration>
Expand Down Expand Up @@ -81,7 +81,7 @@
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>2.0.0</version>
<version>3.0.1</version>
<configuration>
<!-- custom settings.xml to have invoker use our local M2 repo for artifacts -->
<settingsFile>${project.parent.basedir}/src/test/resources/settings.xml</settingsFile>
Expand Down Expand Up @@ -140,7 +140,7 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<version>3.0.2</version>
<executions>
<execution>
<id>package-tools</id>
Expand Down
2 changes: 1 addition & 1 deletion dropwizard-benchmarks/pom.xml
View file
Expand Up @@ -10,7 +10,7 @@
<properties>
<!-- see https://issues.apache.org/jira/browse/MCOMPILER-235 -->
<maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
<jmh.version>1.15</jmh.version>
<jmh.version>1.19</jmh.version>
<!-- Skip deployment of this sub-module -->
<maven.source.skip>true</maven.source.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
Expand Down
8 changes: 4 additions & 4 deletions dropwizard-bom/pom.xml
View file
Expand Up @@ -22,7 +22,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>23.0</guava.version>
<guava.version>23.1-jre</guava.version>
<jersey.version>2.25.1</jersey.version>
<jackson.version>2.9.1</jackson.version>
<jetty.version>9.4.7.v20170914</jetty.version>
Expand Down Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>8.5.20</version>
<version>8.5.23</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand Down Expand Up @@ -123,7 +123,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.2.10.Final</version>
<version>5.2.11.Final</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
Expand All @@ -139,7 +139,7 @@
<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>classmate</artifactId>
<version>1.3.3</version>
<version>1.3.4</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
Expand Down
16 changes: 8 additions & 8 deletions dropwizard-example/pom.xml
View file
Expand Up @@ -134,7 +134,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -144,12 +144,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>2.20.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -159,22 +159,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -184,7 +184,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.4</version>
<version>3.6</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
13 changes: 5 additions & 8 deletions dropwizard-jersey/src/main/java/io/dropwizard/jersey/validation/ConstraintMessage.java
View file
Expand Up @@ -91,14 +91,11 @@ public static Optional<String> isRequestEntity(ConstraintViolation<?> violation,
}
final List<Parameter> parameters = invocable.getParameters();

switch (parent.getKind()) {
case PARAMETER:
final Parameter param = parameters.get(parent.as(Path.ParameterNode.class).getParameterIndex());
if (param.getSource().equals(Parameter.Source.UNKNOWN)) {
return Optional.of(Joiner.on('.').join(Iterables.skip(violation.getPropertyPath(), 2)));
}
default:
break;
if (parent.getKind() == ElementKind.PARAMETER) {
final Parameter param = parameters.get(parent.as(Path.ParameterNode.class).getParameterIndex());
if (param.getSource().equals(Parameter.Source.UNKNOWN)) {
return Optional.of(Joiner.on('.').join(Iterables.skip(violation.getPropertyPath(), 2)));
}
}

return Optional.empty();
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
View file
Expand Up @@ -61,7 +61,7 @@
<maven.site.deploy.skip>true</maven.site.deploy.skip>
<junit.version>4.12</junit.version>
<assertj.version>3.8.0</assertj.version>
<mockito.version>2.8.47</mockito.version>
<mockito.version>2.10.0</mockito.version>
</properties>

<developers>
Expand Down Expand Up @@ -343,12 +343,12 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>2.8.1</version>
<version>2.8.2</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.0.15</version>
<version>2.1.1</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -415,12 +415,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>2.20.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -455,7 +455,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Expand All @@ -472,12 +472,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.5.1</version>
<version>3.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
<version>3.0.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -497,7 +497,7 @@
<plugin>
<groupId>kr.motd.maven</groupId>
<artifactId>sphinx-maven-plugin</artifactId>
<version>1.5.3.Final</version>
<version>1.6.1.Final</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down

0 comments on commit 1f2f040

Please sign in to comment.