--- old/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java 2019-06-03 13:23:06.522674401 -0700 +++ new/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java 2019-06-03 13:23:06.206516413 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,13 +35,13 @@ * MixSingularAndUnofficialContainerInheritedB1Test.java */ -@UnofficialInheritedContainer(value = {@FooInherited(value = 1),@FooInherited(value = 2)}) +@UnofficialInheritedContainer({@FooInherited(1),@FooInherited(2)}) class J {} @ExpectedBase( value = FooInherited.class, - getAnnotation = "@FooInherited(value=0)", - getAnnotationsByType = {"@FooInherited(value=0)"}, + getAnnotation = "@FooInherited(0)", + getAnnotationsByType = {"@FooInherited(0)"}, getAllAnnotationMirrors = { "@FooInherited(0)", "@UnofficialInheritedContainer({@FooInherited(1), @FooInherited(2)})", @@ -56,8 +56,8 @@ @ExpectedContainer( value = UnofficialInheritedContainer.class, getAnnotation = "@UnofficialInheritedContainer(" - + "value={@FooInherited(value=1), @FooInherited(value=2)})", + + "{@FooInherited(1), @FooInherited(2)})", getAnnotationsByType = {"@UnofficialInheritedContainer(" - + "value={@FooInherited(value=1), @FooInherited(value=2)})"}) -@FooInherited(value = 0) + + "{@FooInherited(1), @FooInherited(2)})"}) +@FooInherited(0) class MixSingularAndUnofficialContainerInheritedB1Test extends J {}