diff options
5 files changed, 64 insertions, 43 deletions
diff --git a/container-core/pom.xml b/container-core/pom.xml index 1be10215419..d8473c8b541 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -46,6 +46,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> <scope>provided</scope> diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java index a17f09164c8..325f5177ffa 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java @@ -14,6 +14,7 @@ public class XMLInputFactoryProvider implements Provider<XMLInputFactory> { public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.XMLInputFactoryImpl"; @Override + @SuppressWarnings("deprecation") public XMLInputFactory get() { //ugly, but must be done System.setProperty(INPUT_FACTORY_INTERFACE, FACTORY_CLASS); diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index fc03f362b88..213f7398a04 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -186,6 +186,12 @@ <version>${javax.ws.rs-api.version}</version> </dependency> <dependency> + <!-- TODO: Remove (also from child modules) when container-core:JAXBContextFactory is removed. --> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2.7</version> + </dependency> + <dependency> <groupId>net.jcip</groupId> <artifactId>jcip-annotations</artifactId> <version>1.0</version> diff --git a/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml b/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml index 37e8469afdc..f0e16644a41 100644 --- a/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml +++ b/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml @@ -14,6 +14,13 @@ <version>6-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> <build> <plugins> <plugin> diff --git a/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java b/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java index 3c279e49a7f..44ec6a2ff6c 100644 --- a/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java +++ b/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java @@ -38,8 +38,6 @@ public class CertificateK { private final com.sun.security.auth.LdapPrincipal principal = null; private final com.sun.security.auth.module.JndiLoginModule jndiLoginModule = null; private final javax.accessibility.Accessible accessible = null; - private final javax.activation.CommandInfo commandInfo = null; - private final javax.activity.ActivityCompletedException activityCompletedException = null; private final javax.annotation.PostConstruct postConstruct = null; private final javax.annotation.processing.FilerException filerException = null; private final javax.crypto.BadPaddingException badPaddingException = null; @@ -52,8 +50,6 @@ public class CertificateK { private final javax.imageio.plugins.jpeg.JPEGHuffmanTable jpegHuffmanTable = null; private final javax.imageio.spi.IIORegistry iioRegistry = null; private final javax.imageio.stream.FileCacheImageInputStream fileCacheImageInputStream = null; - private final javax.jws.HandlerChain handlerChain = null; - private final javax.jws.soap.SOAPBinding soapBinding = null; private final javax.lang.model.SourceVersion sourceVersion = null; private final javax.lang.model.element.AnnotationMirror annotationMirror = null; private final javax.lang.model.type.ArrayType arrayType = null; @@ -78,8 +74,6 @@ public class CertificateK { private final javax.print.attribute.AttributeSet attributeSet = null; private final javax.print.attribute.standard.Chromaticity chromaticity = null; private final javax.print.event.PrintEvent printEvent = null; - private final javax.rmi.PortableRemoteObject portableRemoteObject = null; - private final javax.rmi.CORBA.ClassDesc classDesc = null; private final javax.rmi.ssl.SslRMIClientSocketFactory sslRMIClientSocketFactory = null; private final javax.script.AbstractScriptEngine abstractScriptEngine = null; private final javax.security.auth.AuthPermission authPermission = null; @@ -116,7 +110,6 @@ public class CertificateK { private final javax.swing.tree.AbstractLayoutCache abstractLayoutCache = null; private final javax.swing.undo.AbstractUndoableEdit abstractUndoableEdit = null; private final javax.tools.FileObject fileObject = null; - private final javax.transaction.InvalidTransactionException invalidTransactionException = null; private final javax.transaction.xa.XAException xaException = null; private final javax.xml.XMLConstants xmlConstants = null; private final javax.xml.bind.DataBindingException dataBindingException = null; @@ -134,7 +127,6 @@ public class CertificateK { private final javax.xml.datatype.DatatypeConfigurationException datatypeConfigurationException = null; private final javax.xml.namespace.NamespaceContext namespaceContext = null; private final javax.xml.parsers.DocumentBuilder documentBuilder = null; - private final javax.xml.soap.AttachmentPart attachmentPartt = null; private final javax.xml.stream.EventFilter eventFilter = null; private final javax.xml.stream.events.Characters characters = null; private final javax.xml.stream.util.EventReaderDelegate eventReaderDelegate = null; @@ -144,13 +136,6 @@ public class CertificateK { private final javax.xml.transform.stax.StAXResult stAXResult = null; private final javax.xml.transform.stream.StreamResult streamResult = null; private final javax.xml.validation.Schema schema = null; - private final javax.xml.ws.Action action = null; - private final javax.xml.ws.handler.HandlerResolver handlerResolver = null; - private final javax.xml.ws.handler.soap.SOAPMessageContext soapMessageContext = null; - private final javax.xml.ws.http.HTTPBinding httpBinding = null; - private final javax.xml.ws.soap.AddressingFeature addressingFeature = null; - private final javax.xml.ws.spi.Provider provider = null; - private final javax.xml.ws.wsaddressing.W3CEndpointReference w3CEndpointReference = null; private final javax.xml.xpath.XPath xPath = null; private final org.aopalliance.intercept.Joinpoint jointpoint = null; private final org.aopalliance.aop.Advice advice = null; @@ -163,34 +148,6 @@ public class CertificateK { private final org.apache.log4j.spi.ErrorHandler errorHandler = null; private final org.apache.log4j.xml.DOMConfigurator configurator = null; private final org.ietf.jgss.ChannelBinding channelBinding = null; - private final org.omg.CORBA.Any any = null; - private final org.omg.CORBA_2_3.ORB orb = null; - private final org.omg.CORBA_2_3.portable.InputStream inputStream = null; - private final org.omg.CORBA.DynAnyPackage.Invalid invalid = null; - private final org.omg.CORBA.ORBPackage.InvalidName invalidName = null; - private final org.omg.CORBA.portable.ApplicationException applicationException = null; - private final org.omg.CORBA.TypeCodePackage.BadKind badKind = null; - private final org.omg.CosNaming.Binding binding = null; - private final org.omg.CosNaming.NamingContextExtPackage.AddressHelper addressHelper = null; - private final org.omg.CosNaming.NamingContextPackage.AlreadyBound alreadyBound = null; - private final org.omg.Dynamic.Parameter parameter = null; - private final org.omg.DynamicAny.AnySeqHelper anySeqHelper = null; - private final org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode inconsistentTypeCode = null; - private final org.omg.DynamicAny.DynAnyPackage.InvalidValue invalidValue = null; - private final org.omg.IOP.Codec codex = null; - private final org.omg.IOP.CodecFactoryPackage.UnknownEncoding unknownEncoding = null; - private final org.omg.IOP.CodecPackage.FormatMismatch formatMismatch = null; - private final org.omg.Messaging.SyncScopeHelper syncScopeHelper = null; - private final org.omg.PortableInterceptor.AdapterManagerIdHelper adapterManagerIdHelper = null; - private final org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName duplicateName = null; - private final org.omg.PortableServer.AdapterActivator adapterActivator = null; - private final org.omg.PortableServer.CurrentPackage.NoContext noContext = null; - private final org.omg.PortableServer.POAManagerPackage.AdapterInactive adapterInactive = null; - private final org.omg.PortableServer.POAPackage.AdapterAlreadyExists adapterAlreadyExists = null; - private final org.omg.PortableServer.portable.Delegate delegate = null; - private final org.omg.PortableServer.ServantLocatorPackage.CookieHolder cookieHolder = null; - private final org.omg.SendingContext.RunTime runTime = null; - private final org.omg.stub.java.rmi._Remote_Stub remote_stub = null; private final org.osgi.framework.AdminPermission permission = null; private final org.osgi.framework.hooks.service.FindHook hook = null; private final org.osgi.framework.launch.Framework framework = null; @@ -217,6 +174,51 @@ public class CertificateK { private final org.xml.sax.ext.Attributes2Impl attributes2 = null; private final org.xml.sax.helpers.AttributesImpl attributes = null; + // Packages made invisible from Java 9 +// private final javax.activation.CommandInfo commandInfo = null; +// private final javax.activity.ActivityCompletedException activityCompletedException = null; +// private final javax.jws.HandlerChain handlerChain = null; +// private final javax.jws.soap.SOAPBinding soapBinding = null; +// private final javax.rmi.PortableRemoteObject portableRemoteObject = null; +// private final javax.rmi.CORBA.ClassDesc classDesc = null; +// private final javax.transaction.InvalidTransactionException invalidTransactionException = null; +// private final org.omg.CORBA.Any any = null; +// private final org.omg.CORBA_2_3.ORB orb = null; +// private final org.omg.CORBA_2_3.portable.InputStream inputStream = null; +// private final org.omg.CORBA.DynAnyPackage.Invalid invalid = null; +// private final org.omg.CORBA.ORBPackage.InvalidName invalidName = null; +// private final org.omg.CORBA.portable.ApplicationException applicationException = null; +// private final org.omg.CORBA.TypeCodePackage.BadKind badKind = null; +// private final org.omg.CosNaming.Binding binding = null; +// private final org.omg.CosNaming.NamingContextExtPackage.AddressHelper addressHelper = null; +// private final org.omg.CosNaming.NamingContextPackage.AlreadyBound alreadyBound = null; +// private final org.omg.Dynamic.Parameter parameter = null; +// private final org.omg.DynamicAny.AnySeqHelper anySeqHelper = null; +// private final org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode inconsistentTypeCode = null; +// private final org.omg.DynamicAny.DynAnyPackage.InvalidValue invalidValue = null; +// private final org.omg.IOP.Codec codex = null; +// private final org.omg.IOP.CodecFactoryPackage.UnknownEncoding unknownEncoding = null; +// private final org.omg.IOP.CodecPackage.FormatMismatch formatMismatch = null; +// private final org.omg.Messaging.SyncScopeHelper syncScopeHelper = null; +// private final org.omg.PortableInterceptor.AdapterManagerIdHelper adapterManagerIdHelper = null; +// private final org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName duplicateName = null; +// private final org.omg.PortableServer.AdapterActivator adapterActivator = null; +// private final org.omg.PortableServer.CurrentPackage.NoContext noContext = null; +// private final org.omg.PortableServer.POAManagerPackage.AdapterInactive adapterInactive = null; +// private final org.omg.PortableServer.POAPackage.AdapterAlreadyExists adapterAlreadyExists = null; +// private final org.omg.PortableServer.portable.Delegate delegate = null; +// private final org.omg.PortableServer.ServantLocatorPackage.CookieHolder cookieHolder = null; +// private final org.omg.SendingContext.RunTime runTime = null; +// private final org.omg.stub.java.rmi._Remote_Stub remote_stub = null; +// private final javax.xml.soap.AttachmentPart attachmentPartt = null; +// private final javax.xml.ws.Action action = null; +// private final javax.xml.ws.handler.HandlerResolver handlerResolver = null; +// private final javax.xml.ws.handler.soap.SOAPMessageContext soapMessageContext = null; +// private final javax.xml.ws.http.HTTPBinding httpBinding = null; +// private final javax.xml.ws.soap.AddressingFeature addressingFeature = null; +// private final javax.xml.ws.spi.Provider provider = null; +// private final javax.xml.ws.wsaddressing.W3CEndpointReference w3CEndpointReference = null; + // We should only access these old sun-internal classes if we // really, really have to // private final sun.misc.ASCIICaseInsensitiveComparator comparator = null; |