diff --git a/.travis.yml b/.travis.yml index 17bb741..34c1631 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: java jdk: - - openjdk6 + - openjdk7 script: "mvn clean install" after_success: - mvn clean test jacoco:report coveralls:jacoco @@ -8,4 +8,4 @@ notifications: email: recipients: - toda_k@worksap.co.jp - - li_yo@worksap.co.jp \ No newline at end of file + - li_yo@worksap.co.jp diff --git a/README.md b/README.md index c7f400c..2dedec5 100755 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ To use this product, please configure your findbugs-maven-plugin like below. jp.co.worksap.oss findbugs-plugin - 0.0.2 + 0.0.3-SNAPSHOT @@ -27,6 +27,10 @@ To use this product, please configure your findbugs-maven-plugin like below. # history +## 0.0.3 + +- upgraded JDK from 1.6 to 1.7 + ## 0.0.2 - added BrokenImmutableClassDetector diff --git a/pom.xml b/pom.xml index 6d936a8..4acfaba 100644 --- a/pom.xml +++ b/pom.xml @@ -38,8 +38,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/src/main/java/jp/co/worksap/oss/findbugs/jsr305/nullness/UnknownNullnessDetector.java b/src/main/java/jp/co/worksap/oss/findbugs/jsr305/nullness/UnknownNullnessDetector.java index 5318cc2..30702af 100644 --- a/src/main/java/jp/co/worksap/oss/findbugs/jsr305/nullness/UnknownNullnessDetector.java +++ b/src/main/java/jp/co/worksap/oss/findbugs/jsr305/nullness/UnknownNullnessDetector.java @@ -66,9 +66,7 @@ private TypeQualifierAnnotation findDefaultAnnotation(XMethod xMethod, } else { return null; } - } catch (SecurityException e) { - throw new IllegalStateException(e); - } catch (IllegalAccessException e) { + } catch (SecurityException | IllegalAccessException e) { throw new IllegalStateException(e); } catch (InvocationTargetException e) { throw new IllegalArgumentException(e); @@ -93,9 +91,7 @@ private void detectUnknowNullnessOfReturnedValue(Method method, .getDeclaredMethod("getDefaultAnnotation", AnnotatedObject.class, TypeQualifierValue.class, ElementType.class); GET_DEFAULT_ANNOTATION.setAccessible(true); - } catch (SecurityException e) { - throw new IllegalStateException(e); - } catch (NoSuchMethodException e) { + } catch (SecurityException | NoSuchMethodException e) { throw new IllegalStateException(e); } }