Skip to content

Commit

Permalink
Update to basepom-8
Browse files Browse the repository at this point in the history
Update the basepom to the latest release which should be fully Java 8
compatible.

- Lots of maven plugin updates

- Dependency changes:
-- guice   4.0beta4 --> 4.0beta5
-- Jersey  1.18.1   --> 1.18.3
-- Joda    2.3      --> 2.6
-- JUnit   4.11     --> 4.12
-- Mockito 1.9.5    --> 1.10.19
-- slf4j   1.7.7    --> 1.7.9
  • Loading branch information
Henning Schmiedehausen committed Jan 6, 2015
1 parent 101f3e0 commit b6b4af3
Showing 1 changed file with 6 additions and 23 deletions.
29 changes: 6 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.basepom</groupId>
<artifactId>basepom-standard-oss</artifactId>
<version>6</version>
<version>8</version>
</parent>

<groupId>com.hubspot</groupId>
Expand Down Expand Up @@ -35,17 +35,20 @@
<project.jdk7.home>${env.JAVA7_HOME}</project.jdk7.home>
<project.build.targetJdk>1.7</project.build.targetJdk>
<basepom.check.skip-license>true</basepom.check.skip-license>
<!--
<basepom.check.fail-extended>true</basepom.check.fail-extended>
-->

<basepom.test.timeout>120</basepom.test.timeout>

<dep.plugin.surefire.version>2.18</dep.plugin.surefire.version>

<!-- hubspot jackson and dropwizard dep use 2.3.x -->
<dep.jackson.version>2.3.3</dep.jackson.version>
<dep.jackson.core.version>${dep.jackson.version}</dep.jackson.core.version>
<dep.jackson.databind.version>${dep.jackson.version}</dep.jackson.databind.version>

<!-- guava 18.0 is problematic, keep 17 for a while -->
<dep.guava.version>17.0</dep.guava.version>

<!-- dropwizard uses jetty 9.0.x -->
<dep.jetty.version>9.0.7.v20131107</dep.jetty.version>

Expand Down Expand Up @@ -540,26 +543,6 @@
<artifactId>frontend-maven-plugin</artifactId>
<version>0.0.16</version>
</plugin>
<plugin>
<groupId>com.ning.maven.plugins</groupId>
<artifactId>maven-duplicate-finder-plugin</artifactId>
<version>1.0.7</version>
<configuration>
<ignoredResources>
<ignoredResource>.*\.build\.json</ignoredResource>
<ignoredResource>.*\.html</ignoredResource>
<ignoredResource>META-INF/.*</ignoredResource>
<ignoredResource>about_files/.*</ignoredResource>
<ignoredResource>plugin\.properties</ignoredResource>
<ignoredResource>plugin\.xml</ignoredResource>
<ignoredResource>.*\.java</ignoredResource>
<ignoredResource>log4j\.xml</ignoredResource>
<ignoredResource>log4j\.properties</ignoredResource>
<ignoredResource>logback\.xml</ignoredResource>
<ignoredResource>logback\.properties</ignoredResource>
</ignoredResources>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down

0 comments on commit b6b4af3

Please # to comment.