--- old/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java 2019-06-03 13:23:04.325576481 -0700 +++ new/test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java 2019-06-03 13:23:04.009418492 -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,14 +35,14 @@ * MixRepeatableAndOfficialContainerInheritedB2Test.java */ -@BarInheritedContainer(value = {@BarInherited(value = 1), @BarInherited(value = 2)}) -@BarInherited(value = 3) +@BarInheritedContainer({@BarInherited(1), @BarInherited(2)}) +@BarInherited(3) class H {} @ExpectedBase( value = BarInherited.class, - getAnnotation = "@BarInherited(value=0)", - getAnnotationsByType = {"@BarInherited(value=0)"}, + getAnnotation = "@BarInherited(0)", + getAnnotationsByType = {"@BarInherited(0)"}, getAllAnnotationMirrors = { "@BarInherited(0)", "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})", @@ -57,8 +57,8 @@ @ExpectedContainer( value = BarInheritedContainer.class, getAnnotation = "@BarInheritedContainer(" - + "value={@BarInherited(value=1), @BarInherited(value=2)})", + + "{@BarInherited(1), @BarInherited(2)})", getAnnotationsByType = {"@BarInheritedContainer(" - + "value={@BarInherited(value=1), @BarInherited(value=2)})"}) -@BarInherited(value = 0) + + "{@BarInherited(1), @BarInherited(2)})"}) +@BarInherited(0) class MixRepeatableAndOfficialContainerInheritedB2Test extends H {}