Permalink
Browse files

Update to basepom-8

This also requires the included cglib to be upgraded to 3.1 but as this
dependency is shaded into the jar it should not be a compatibility problem.
  • Loading branch information...
1 parent f5291e7 commit f987f8924d89e529bd5c63cc6426d727dab9defc @hgschmie hgschmie committed Jan 2, 2015
View
@@ -10,7 +10,7 @@ report
*.iml
.clover
.idea
-build
+^build
out
.classpath
.project
View
@@ -1,6 +1,7 @@
language: java
jdk:
- - oraclejdk7
- openjdk6
+ - oraclejdk7
+ - oraclejdk8
install: mvn -DskipTests=true -Dbasepom.check.skip-all=true -B install
script: mvn -B verify
View
@@ -19,7 +19,7 @@
<parent>
<groupId>org.basepom</groupId>
<artifactId>basepom-standard-oss</artifactId>
- <version>5</version>
+ <version>8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -98,7 +98,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.2.2</version>
+ <version>3.1</version>
</dependency>
<dependency>
@@ -160,6 +160,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
+ <version>3.3</version>
<scope>test</scope>
</dependency>
@@ -237,14 +238,22 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
- <excludeFilterFile>${project.basedir}/src/findbugs/findbugs-exclude.xml</excludeFilterFile>
+ <excludeFilterFile>${project.basedir}/src/build/findbugs-exclude.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <suppressionsLocation>${project.basedir}/src/build/checkstyle-suppressions.xml</suppressionsLocation>
+ <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
</configuration>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
- <header>${project.basedir}/src/license/LICENSE-HEADER.txt</header>
+ <header>${project.basedir}/src/build/LICENSE-HEADER.txt</header>
<excludes combine.children="append">
<exclude>**/*.stg</exclude>
</excludes>
File renamed without changes.
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+~ Copyright (C) 2004 - 2014 Brian McCallister
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<suppressions>
+ <suppress checks=".*" files="org/skife/jdbi/rewriter/colon/ColonStatementLexer\.java$"/>
+ <suppress checks=".*" files="org/skife/jdbi/rewriter/hash/HashStatementLexer\.java$"/>
+ <suppress checks=".*" files="org/skife/jdbi/rewriter/printf/FormatterStatementLexer\.java$"/>
+</suppressions>

0 comments on commit f987f89

Please sign in to comment.