--- old/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java 2013-04-04 15:25:58.156611692 +0200 +++ new/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java 2013-04-04 15:25:58.096611692 +0200 @@ -27,15 +27,14 @@ package com.sun.tools.internal.jxc.ap; +import com.sun.tools.internal.jxc.api.JXC; import com.sun.tools.internal.xjc.api.J2SJAXBModel; import com.sun.tools.internal.xjc.api.Reference; -import com.sun.tools.internal.xjc.api.XJC; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Processor; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedSourceVersion; import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; @@ -66,7 +65,6 @@ * @author Kohsuke Kawaguchi */ @SupportedAnnotationTypes("*") -@SupportedSourceVersion(SourceVersion.RELEASE_6) public class SchemaGenerator extends AbstractProcessor { /** @@ -96,7 +94,7 @@ // so that users won't have to manually exclude interfaces, which is silly. filterClass(classes, roundEnv.getRootElements()); - J2SJAXBModel model = XJC.createJavaCompiler().bind(classes, Collections.emptyMap(), null, processingEnv); + J2SJAXBModel model = JXC.createJavaCompiler().bind(classes, Collections.emptyMap(), null, processingEnv); if (model == null) return false; // error @@ -143,4 +141,12 @@ } } } + + @Override + public SourceVersion getSupportedSourceVersion() { + if (SourceVersion.latest().compareTo(SourceVersion.RELEASE_6) > 0) + return SourceVersion.valueOf("RELEASE_7"); + else + return SourceVersion.RELEASE_6; + } }