diff -Nru animal-sniffer-1.15/animal-sniffer/pom.xml animal-sniffer-1.16/animal-sniffer/pom.xml --- animal-sniffer-1.15/animal-sniffer/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -28,7 +28,7 @@ org.codehaus.mojo animal-sniffer-parent - 1.15 + 1.16 animal-sniffer @@ -47,7 +47,7 @@ org.ow2.asm asm-all - 5.0.3 + 5.2 diff -Nru animal-sniffer-1.15/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassFileVisitor.java animal-sniffer-1.16/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassFileVisitor.java --- animal-sniffer-1.15/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassFileVisitor.java 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassFileVisitor.java 2017-08-18 16:23:38.000000000 +0000 @@ -37,12 +37,27 @@ import java.util.TreeSet; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import org.codehaus.mojo.animal_sniffer.logging.Logger; +import org.codehaus.mojo.animal_sniffer.logging.PrintWriterLogger; /** * @author Kohsuke Kawaguchi */ public abstract class ClassFileVisitor { + + protected final Logger logger; + + protected ClassFileVisitor() + { + this( new PrintWriterLogger( System.err ) ); + } + + protected ClassFileVisitor( Logger logger ) + { + this.logger = logger; + } + /** * Whether to check inside .jar files */ @@ -138,8 +153,14 @@ while ( e.hasMoreElements() ) { JarEntry x = e.nextElement(); - if ( !x.getName().endsWith( ".class" ) ) + String name = x.getName(); + if ( !name.endsWith( ".class" ) ) + { + continue; // uninteresting to log even at debug + } + if ( name.startsWith( "META-INF/" ) || name.equals( "module-info.class" ) ) { + logger.debug( "Ignoring " + name ); continue; } entries.add( x ); @@ -147,6 +168,7 @@ Iterator it = entries.iterator(); while ( it.hasNext() ) { JarEntry x = it.next(); + // Even debug level seems too verbose for: logger.debug( "Processing " + x.getName() + " in " + file ); InputStream is = jar.getInputStream( x ); try { diff -Nru animal-sniffer-1.15/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassListBuilder.java animal-sniffer-1.16/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassListBuilder.java --- animal-sniffer-1.15/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassListBuilder.java 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassListBuilder.java 2017-08-18 16:23:38.000000000 +0000 @@ -45,8 +45,6 @@ { private final Set packages; - private final Logger logger; - public Set getPackages() { return packages; @@ -54,8 +52,8 @@ public ClassListBuilder( Set packages, Logger logger ) { + super( logger ); this.packages = packages; - this.logger = logger; } public ClassListBuilder( Logger logger ) @@ -86,6 +84,13 @@ IOException ioException = new IOException( "Bad class file " + name ); ioException.initCause( e ); throw ioException; + } + catch ( IllegalArgumentException e ) + { + logger.error( "Bad class file " + name ); + IOException ioException = new IOException( "Bad class file " + name ); + ioException.initCause( e ); + throw ioException; } } } diff -Nru animal-sniffer-1.15/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureChecker.java animal-sniffer-1.16/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureChecker.java --- animal-sniffer-1.15/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureChecker.java 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureChecker.java 2017-08-18 16:23:38.000000000 +0000 @@ -47,9 +47,11 @@ import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.Handle; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; /** * Checks the signature against classes in this list. @@ -370,16 +372,69 @@ return super.visitAnnotation( annoDesc, visible ); } - + private static final String LAMBDA_METAFACTORY = "java/lang/invoke/LambdaMetafactory"; + + @Override + public void visitInvokeDynamicInsn( String name, String desc, Handle bsm, Object... bsmArgs ) + { + if ( LAMBDA_METAFACTORY.equals( bsm.getOwner() ) ) + { + if ( "metafactory".equals( bsm.getName() ) || + "altMetafactory".equals( bsm.getName() ) ) + { + // check the method reference + Handle methodHandle = (Handle) bsmArgs[1]; + check( methodHandle.getOwner(), methodHandle.getName() + methodHandle.getDesc() ); + // check the functional interface type + checkType( Type.getReturnType( desc ) ); + } + } + } + @Override public void visitMethodInsn( int opcode, String owner, String name, String desc, boolean itf ) { + checkType( Type.getReturnType( desc ) ); check( owner, name + desc ); } - + @Override public void visitTypeInsn( int opcode, String type ) { + checkType( type ); + } + + @Override + public void visitFieldInsn( int opcode, String owner, String name, String desc ) + { + check( owner, name + '#' + desc ); + } + + @Override + public void visitLineNumber( int line, Label start ) + { + CheckingVisitor.this.line = line; + } + + private void checkType( Type asmType ) + { + if ( asmType == null ) + { + return; + } + if ( asmType.getSort() == Type.OBJECT ) + { + checkType( asmType.getInternalName() ); + } + if ( asmType.getSort() == Type.ARRAY ) + { + // recursive call + checkType( asmType.getElementType() ); + } + } + + private void checkType( String type ) + { if ( shouldBeIgnored( type ) ) { return; @@ -395,18 +450,6 @@ } } - @Override - public void visitFieldInsn( int opcode, String owner, String name, String desc ) - { - check( owner, name + '#' + desc ); - } - - @Override - public void visitLineNumber( int line, Label start ) - { - CheckingVisitor.this.line = line; - } - private void check( String owner, String sig ) { if ( shouldBeIgnored( owner ) ) diff -Nru animal-sniffer-1.15/animal-sniffer-annotations/pom.xml animal-sniffer-1.16/animal-sniffer-annotations/pom.xml --- animal-sniffer-1.15/animal-sniffer-annotations/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-annotations/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -28,7 +28,7 @@ org.codehaus.mojo animal-sniffer-parent - 1.15 + 1.16 animal-sniffer-annotations diff -Nru animal-sniffer-1.15/animal-sniffer-ant-tasks/pom.xml animal-sniffer-1.16/animal-sniffer-ant-tasks/pom.xml --- animal-sniffer-1.15/animal-sniffer-ant-tasks/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-ant-tasks/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -28,7 +28,7 @@ org.codehaus.mojo animal-sniffer-parent - 1.15 + 1.16 animal-sniffer-ant-tasks diff -Nru animal-sniffer-1.15/animal-sniffer-enforcer-rule/pom.xml animal-sniffer-1.16/animal-sniffer-enforcer-rule/pom.xml --- animal-sniffer-1.15/animal-sniffer-enforcer-rule/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-enforcer-rule/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -28,7 +28,7 @@ org.codehaus.mojo animal-sniffer-parent - 1.15 + 1.16 animal-sniffer-enforcer-rule diff -Nru animal-sniffer-1.15/animal-sniffer-enforcer-rule/src/it/setup-002/pom.xml animal-sniffer-1.16/animal-sniffer-enforcer-rule/src/it/setup-002/pom.xml --- animal-sniffer-1.15/animal-sniffer-enforcer-rule/src/it/setup-002/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-enforcer-rule/src/it/setup-002/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -100,6 +100,21 @@ UTF-8 UTF-8 UTF-8 + 1.5 + 1.5 + + + jdk9 + + 9 + + + 1.6 + 1.6 + + + + diff -Nru animal-sniffer-1.15/animal-sniffer-enforcer-rule/src/it/smoke-test/pom.xml animal-sniffer-1.16/animal-sniffer-enforcer-rule/src/it/smoke-test/pom.xml --- animal-sniffer-1.15/animal-sniffer-enforcer-rule/src/it/smoke-test/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-enforcer-rule/src/it/smoke-test/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -166,14 +166,24 @@ + + jdk9 + + 9 + + + 1.6 + 1.6 + + - - UTF-8 UTF-8 UTF-8 + 1.5 + 1.5 diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -28,7 +28,7 @@ org.codehaus.mojo animal-sniffer-parent - 1.15 + 1.16 animal-sniffer-maven-plugin diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/github-22/invoker.properties animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/github-22/invoker.properties --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/github-22/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/github-22/invoker.properties 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,3 @@ +invoker.buildResult=failure +# this is where the method signature change happened +invoker.java.version=1.8+ diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/github-22/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/github-22/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/github-22/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/github-22/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,92 @@ + + + + 4.0.0 + + localdomain.localhost + real-test + 1.0-SNAPSHOT + jar + + github-22 + + + + + + maven-clean-plugin + 2.2 + + + maven-compiler-plugin + 3.2 + + + maven-surefire-plugin + 2.4.2 + + + + + + maven-compiler-plugin + + 1.8 + 1.8 + + + + ${pluginGroupId} + ${pluginArtifactId} + ${pluginVersion} + + + test + + check + + + + org.codehaus.mojo.signature + java15 + 1.0 + + + + + + + + + UTF-8 + UTF-8 + UTF-8 + @project.groupId@ + @project.artifactId@ + @project.version@ + + + diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/github-22/src/main/java/localhost/GitHub22Bad.java animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/github-22/src/main/java/localhost/GitHub22Bad.java --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/github-22/src/main/java/localhost/GitHub22Bad.java 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/github-22/src/main/java/localhost/GitHub22Bad.java 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,53 @@ +package localhost; + +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Optional; +import java.util.function.Predicate; + +public class GitHub22Bad { + public Predicate> methodReference() { + return Optional::isPresent; + } + + public Predicate> methodReferenceSerializable() { + return (Serializable & Predicate>) Optional::isPresent; + } + + public Predicate> lambda() { + return o -> o.isPresent(); + } + + public Predicate> lambdaSerializable() { + return (Serializable & Predicate>) o -> o.isPresent(); + } + + public void callMethodWhichReturnsTypeFromNewerAPI() { + lambda(); + } + + public Predicate[][][] arrayReturnType() { + return new Predicate[][][]{{{(Predicate>) Optional::isPresent}}}; + } + + public void callArray() { + arrayReturnType(); + } + + public void exceptionMulticatch() { + try { + Method method = GitHub22Bad.class.getDeclaredMethod("emptyMethod"); + method.invoke(null); + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignore) { + } + } + + public void exceptionClassNotAvailableInJava6() { + try { + Method method = GitHub22Bad.class.getDeclaredMethod("emptyMethod"); + method.invoke(null); + } catch (ReflectiveOperationException ignore) { + } + } +} diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/github-22/verify.groovy animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/github-22/verify.groovy --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/github-22/verify.groovy 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/github-22/verify.groovy 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,12 @@ +File log = new File(basedir, 'build.log') +assert log.exists() +assert log.text.contains( 'GitHub22Bad.java:11: Undefined reference: boolean java.util.Optional.isPresent()' ) +assert log.text.contains( 'GitHub22Bad.java:11: Undefined reference: java.util.function.Predicate' ) +assert log.text.contains( 'GitHub22Bad.java:15: Undefined reference: boolean java.util.Optional.isPresent()' ) +assert log.text.contains( 'GitHub22Bad.java:15: Undefined reference: java.util.function.Predicate' ) +assert log.text.contains( 'GitHub22Bad.java:19: Undefined reference: java.util.function.Predicate' ) +assert log.text.contains( 'GitHub22Bad.java:23: Undefined reference: java.util.function.Predicate' ) +assert log.text.contains( 'GitHub22Bad.java:27: Undefined reference: java.util.function.Predicate' ) +assert log.text.contains( 'GitHub22Bad.java:31: Undefined reference: boolean java.util.Optional.isPresent()' ) +assert log.text.contains( 'GitHub22Bad.java:31: Undefined reference: java.util.function.Predicate' ) +assert log.text.contains( 'GitHub22Bad.java:35: Undefined reference: java.util.function.Predicate' ) diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-24/invoker.properties animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-24/invoker.properties --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-24/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-24/invoker.properties 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,2 @@ +invoker.buildResult=failure + diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-24/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-24/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-24/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-24/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,115 @@ + + + + 4.0.0 + + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + + localdomain.localhost + real-test + 1.0-SNAPSHOT + jar + + Real Test + + + Tests that real signatures work. + + + + + + + maven-clean-plugin + 2.2 + + + maven-compiler-plugin + 2.0.2 + + + maven-deploy-plugin + 2.3 + + + maven-install-plugin + 2.2 + + + maven-jar-plugin + 2.2 + + + maven-resources-plugin + 2.3 + + + maven-site-plugin + 2.0 + + + maven-surefire-plugin + 2.4.3 + + + + + + ${pluginGroupId} + ${pluginArtifactId} + ${pluginVersion} + + + test + + check + + + + org.codehaus.mojo.signature + java14 + + + + + + + + + + UTF-8 + UTF-8 + UTF-8 + @project.groupId@ + @project.artifactId@ + @project.version@ + + + diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-24/src/main/java/localhost/Main.java animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-24/src/main/java/localhost/Main.java --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-24/src/main/java/localhost/Main.java 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-24/src/main/java/localhost/Main.java 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,37 @@ +package localhost; + +/* + * The MIT License + * + * Copyright (c) 2009, codehaus.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + */ + +public class Main +{ + public static void main( String[] args ) + { + if ( new java.util.concurrent.ConcurrentHashMap().isEmpty() ) + { + System.out.println( "All is good" ); + } + } +} diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-24/verify.groovy animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-24/verify.groovy --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-24/verify.groovy 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-24/verify.groovy 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,3 @@ +File log = new File(basedir, 'build.log') +assert log.exists() +assert log.text.contains( 'For artifact {org.codehaus.mojo.signature:java14:null:signature}: The version cannot be empty.' ) diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-module-info/invoker.properties animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-module-info/invoker.properties --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-module-info/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-module-info/invoker.properties 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1 @@ +invoker.debug=true \ No newline at end of file diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-module-info/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-module-info/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-module-info/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-module-info/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,95 @@ + + + + 4.0.0 + + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + + localdomain.localhost + real-test + 1.0-SNAPSHOT + jar + + Issue #32 module info + + + Tests that module-info.class is ignored (pending real support). + + + + + + + maven-compiler-plugin + 2.0.2 + + + + + + ${pluginGroupId} + ${pluginArtifactId} + ${pluginVersion} + + + test + + check + + + + org.codehaus.mojo.signature + java14 + 1.0 + + + + + + + + + + org.codehaus.groovy + groovy + 2.5.0-beta-1 + + + + + UTF-8 + UTF-8 + UTF-8 + @project.groupId@ + @project.artifactId@ + @project.version@ + + + diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-module-info/src/main/java/test/Main.java animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-module-info/src/main/java/test/Main.java --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-module-info/src/main/java/test/Main.java 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-module-info/src/main/java/test/Main.java 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,33 @@ +package test; + +/* + * The MIT License + * + * Copyright (c) 2009, codehaus.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + */ + +public class Main +{ + public static void main( String[] args ) + { + } +} diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-module-info/verify.groovy animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-module-info/verify.groovy --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-module-info/verify.groovy 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-module-info/verify.groovy 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,3 @@ +File log = new File(basedir, 'build.log') +assert log.exists() +assert log.text.contains( '[DEBUG] Ignoring module-info.class' ) \ No newline at end of file diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/invoker.properties animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/invoker.properties --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/invoker.properties 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1 @@ +invoker.debug=true \ No newline at end of file diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,95 @@ + + + + 4.0.0 + + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + + localdomain.localhost + real-test + 1.0-SNAPSHOT + jar + + Issue #32 multirelease + + + Tests that multirelease JARs pass. + + + + + + + maven-compiler-plugin + 2.0.2 + + + + + + ${pluginGroupId} + ${pluginArtifactId} + ${pluginVersion} + + + test + + check + + + + org.codehaus.mojo.signature + java14 + 1.0 + + + + + + + + + + org.jboss.marshalling + jboss-marshalling-river + 2.0.0.CR1 + + + + + UTF-8 + UTF-8 + UTF-8 + @project.groupId@ + @project.artifactId@ + @project.version@ + + + diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/src/main/java/test/Main.java animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/src/main/java/test/Main.java --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/src/main/java/test/Main.java 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/src/main/java/test/Main.java 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,33 @@ +package test; + +/* + * The MIT License + * + * Copyright (c) 2009, codehaus.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + */ + +public class Main +{ + public static void main( String[] args ) + { + } +} diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/verify.groovy animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/verify.groovy --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/verify.groovy 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/issue-32-multirelease/verify.groovy 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,4 @@ +File log = new File(basedir, 'build.log') +assert log.exists() +assert log.text.contains( '[DEBUG] Ignoring META-INF/versions/9/org/jboss/marshalling/reflect/JDKSpecific.class') +assert log.text.contains( '[DEBUG] Ignoring META-INF/versions/9/org/jboss/marshalling/reflect/JDKSpecific$1.class' ) diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -26,6 +26,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + localdomain.localhost real-test 1.0-SNAPSHOT @@ -76,13 +82,6 @@ - maven-compiler-plugin - - 1.5 - 1.5 - - - ${pluginGroupId} ${pluginArtifactId} ${pluginVersion} diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14-from-cli/invoker.properties animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14-from-cli/invoker.properties --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14-from-cli/invoker.properties 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14-from-cli/invoker.properties 2017-08-18 16:23:38.000000000 +0000 @@ -1 +1 @@ -invoker.goals=org.codehaus.mojo:animal-sniffer-maven-plugin:1.15-SNAPSHOT:check -Danimal.sniffer.signature=org.codehaus.mojo.signature:java14:1.0 +invoker.goals=org.codehaus.mojo:animal-sniffer-maven-plugin:check -Danimal.sniffer.signature=org.codehaus.mojo.signature:java14:1.0 diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14-from-cli/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14-from-cli/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14-from-cli/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/jdk14-with-sig14-from-cli/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -47,6 +47,10 @@ maven-compiler-plugin 2.0.2 + + 1.5 + 1.5 + maven-deploy-plugin @@ -72,46 +76,20 @@ maven-surefire-plugin 2.4.2 + + + @project.groupId@ + @project.artifactId@ + @project.version@ + - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - ${pluginGroupId} - ${pluginArtifactId} - ${pluginVersion} - - - verify - - check - - - - org.codehaus.mojo.signature - java14 - 1.0 - - - - - - UTF-8 UTF-8 UTF-8 - @project.groupId@ - @project.artifactId@ - @project.version@ diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/jdk15-with-sig15/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/jdk15-with-sig15/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/jdk15-with-sig15/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/jdk15-with-sig15/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -26,6 +26,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + localdomain.localhost real-test 1.0-SNAPSHOT @@ -76,13 +82,6 @@ - maven-compiler-plugin - - 1.5 - 1.5 - - - ${pluginGroupId} ${pluginArtifactId} ${pluginVersion} diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/manimalsniffer-29/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/manimalsniffer-29/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/manimalsniffer-29/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/manimalsniffer-29/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -26,6 +26,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + localdomain.localhost real-test 1.0-SNAPSHOT @@ -76,13 +82,6 @@ - maven-compiler-plugin - - 1.5 - 1.5 - - - ${pluginGroupId} ${pluginArtifactId} ${pluginVersion} diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/manimalsniffer-41/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/manimalsniffer-41/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/manimalsniffer-41/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/manimalsniffer-41/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -26,6 +26,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + localdomain.localhost real-test 1.0-SNAPSHOT @@ -76,13 +82,6 @@ - maven-compiler-plugin - - 1.5 - 1.5 - - - ${pluginGroupId} ${pluginArtifactId} ${pluginVersion} diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/manimalsniffer-6/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/manimalsniffer-6/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/manimalsniffer-6/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/manimalsniffer-6/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -26,6 +26,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + localdomain.localhost real-test 1.0-SNAPSHOT @@ -101,13 +107,6 @@ - maven-compiler-plugin - - 1.5 - 1.5 - - - ${pluginGroupId} ${pluginArtifactId} ${pluginVersion} diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/manimalsniffer-9/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/manimalsniffer-9/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/manimalsniffer-9/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/manimalsniffer-9/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -26,6 +26,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + localdomain.localhost real-test 1.0-SNAPSHOT @@ -84,13 +90,6 @@ - maven-compiler-plugin - - 1.5 - 1.5 - - - ${pluginGroupId} ${pluginArtifactId} ${pluginVersion} diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/merge-test/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/merge-test/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/merge-test/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/merge-test/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -26,6 +26,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + localdomain.localhost merge-test 1.0-SNAPSHOT diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/setup-parent/invoker.properties animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/setup-parent/invoker.properties --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/setup-parent/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/setup-parent/invoker.properties 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1 @@ +invoker.goals = install \ No newline at end of file diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/setup-parent/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/setup-parent/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/setup-parent/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/setup-parent/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -0,0 +1,52 @@ + + + + 4.0.0 + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + pom + + + 1.5 + 1.5 + + + + + jdk9 + + 9 + + + 1.6 + 1.6 + + + + + diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/smoke-test/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/smoke-test/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/smoke-test/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/smoke-test/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -26,6 +26,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + localdomain.localhost build-test 1.0-SNAPSHOT diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/version-resolution/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/version-resolution/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/version-resolution/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/version-resolution/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -25,6 +25,13 @@ 4.0.0 + + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + with-deps localdomain.localhost 1.0-SNAPSHOT @@ -97,13 +104,6 @@ - maven-compiler-plugin - - 1.4 - 1.4 - - - @project.groupId@ @project.artifactId@ @project.version@ diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/with-deps/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/with-deps/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/with-deps/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/with-deps/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -25,6 +25,13 @@ 4.0.0 + + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + with-deps localdomain.localhost 1.0-SNAPSHOT @@ -87,13 +94,6 @@ - maven-compiler-plugin - - 1.4 - 1.4 - - - @project.groupId@ @project.artifactId@ @project.version@ diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/with-deps-excluded/pom.xml animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/with-deps-excluded/pom.xml --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/it/with-deps-excluded/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/it/with-deps-excluded/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -25,6 +25,13 @@ 4.0.0 + + + org.codehaus.mojo.its + animal-sniffer-parent + 1.0-SNAPSHOT + + with-deps localdomain.localhost 1.0-SNAPSHOT @@ -87,13 +94,6 @@ - maven-compiler-plugin - - 1.4 - 1.4 - - - @project.groupId@ @project.artifactId@ @project.version@ diff -Nru animal-sniffer-1.15/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/CheckSignatureMojo.java animal-sniffer-1.16/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/CheckSignatureMojo.java --- animal-sniffer-1.15/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/CheckSignatureMojo.java 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/CheckSignatureMojo.java 2017-08-18 16:23:38.000000000 +0000 @@ -203,7 +203,7 @@ + " version from dependencies" ); String source = "dependencies"; Dependency match = findMatchingDependency( signature, project.getDependencies() ); - if ( match == null ) + if ( match == null && project.getDependencyManagement() != null ) { getLog().debug( "Resolving signature " + signature.getGroupId() + ":" + signature.getArtifactId() + " version from dependencyManagement" ); diff -Nru animal-sniffer-1.15/debian/changelog animal-sniffer-1.16/debian/changelog --- animal-sniffer-1.15/debian/changelog 2017-07-31 19:34:08.000000000 +0000 +++ animal-sniffer-1.16/debian/changelog 2017-10-18 08:19:11.000000000 +0000 @@ -1,3 +1,12 @@ +animal-sniffer (1.16-1) unstable; urgency=medium + + * Team upload. + * New upstream release + * Removed the unused build dependency on libmaven-install-plugin-java + * Standards-Version updated to 4.1.1 + + -- Emmanuel Bourg Wed, 18 Oct 2017 10:19:11 +0200 + animal-sniffer (1.15-2) unstable; urgency=medium * Team upload. diff -Nru animal-sniffer-1.15/debian/control animal-sniffer-1.16/debian/control --- animal-sniffer-1.15/debian/control 2017-07-31 19:33:11.000000000 +0000 +++ animal-sniffer-1.16/debian/control 2017-10-18 08:14:17.000000000 +0000 @@ -15,13 +15,12 @@ libbuild-helper-maven-plugin-java, libmaven-common-artifact-filters-java, libmaven-enforcer-plugin-java, - libmaven-install-plugin-java, libmaven-invoker-plugin-java, libmaven-javadoc-plugin-java, libmaven-plugin-tools-java, libmaven-shade-plugin-java, libmaven3-core-java -Standards-Version: 4.0.0 +Standards-Version: 4.1.1 Vcs-Git: https://anonscm.debian.org/git/pkg-java/animal-sniffer.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/animal-sniffer.git Homepage: http://www.mojohaus.org/animal-sniffer/animal-sniffer-maven-plugin/ diff -Nru animal-sniffer-1.15/java-boot-classpath-detector/pom.xml animal-sniffer-1.16/java-boot-classpath-detector/pom.xml --- animal-sniffer-1.15/java-boot-classpath-detector/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/java-boot-classpath-detector/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -28,7 +28,7 @@ org.codehaus.mojo animal-sniffer-parent - 1.15 + 1.16 org.codehaus.mojo diff -Nru animal-sniffer-1.15/pom.xml animal-sniffer-1.16/pom.xml --- animal-sniffer-1.15/pom.xml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/pom.xml 2017-08-18 16:23:38.000000000 +0000 @@ -32,7 +32,7 @@ animal-sniffer-parent - 1.15 + 1.16 pom Animal Sniffer @@ -81,7 +81,7 @@ scm:git:https://github.com/mojohaus/animal-sniffer.git scm:git:ssh://git@github.com/mojohaus/animal-sniffer.git https://github.com/mojohaus/animal-sniffer - animal-sniffer-parent-1.15 + animal-sniffer-parent-1.16 GitHub @@ -156,5 +156,6 @@ + diff -Nru animal-sniffer-1.15/.travis.yml animal-sniffer-1.16/.travis.yml --- animal-sniffer-1.15/.travis.yml 2016-02-23 23:54:47.000000000 +0000 +++ animal-sniffer-1.16/.travis.yml 2017-08-18 16:23:38.000000000 +0000 @@ -5,13 +5,15 @@ - MAVEN_VERSION=3.2.5 - MAVEN_VERSION=3.3.3 - MAVEN_VERSION=3.3.9 + - MAVEN_VERSION=3.5.0 jdk: - - oraclejdk7 + - openjdk7 - oraclejdk8 +dist: trusty install: - "mvn -N io.takari:maven:wrapper -Dmaven=${MAVEN_VERSION}" - "./mvnw --show-version --errors --batch-mode test-compile dependency:go-offline" -script: "./mvnw --show-version --errors --batch-mode clean verify site" +script: "./mvnw --show-version --errors --batch-mode clean verify" cache: directories: - $HOME/.m2