diff --git a/pom.xml b/pom.xml index 79e42d5..a5772f2 100644 --- a/pom.xml +++ b/pom.xml @@ -88,13 +88,13 @@ jakarta.activation jakarta.activation-api - 1.2.2 + 2.0.0-rc1 provided jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 + 3.0.0-RC1 provided true @@ -320,13 +320,13 @@ manifest - > + <_removeheaders>Bnd-LastModified,Built-By,Include-Resource,Private-Package ${project.version} - ${scmBranch}-${buildNumber} - javax.activation;version=!, - javax.xml.bind.attachment;version=!, + jakarta.activation;version=!, + jakarta.xml.bind.attachment;version=!, * diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index d913f3e..0a93ff3 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -10,7 +10,7 @@ module org.jvnet.staxex { requires java.logging; - requires static java.xml.bind; + requires static jakarta.xml.bind; requires transitive jakarta.activation; requires transitive java.xml; diff --git a/src/main/java/org/jvnet/staxex/Base64Data.java b/src/main/java/org/jvnet/staxex/Base64Data.java index 7e61e7e..c1b73f6 100644 --- a/src/main/java/org/jvnet/staxex/Base64Data.java +++ b/src/main/java/org/jvnet/staxex/Base64Data.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -10,8 +10,8 @@ package org.jvnet.staxex; -import javax.activation.DataHandler; -import javax.activation.DataSource; +import jakarta.activation.DataHandler; +import jakarta.activation.DataSource; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -28,7 +28,7 @@ //import com.sun.xml.stream.writers.XMLStreamWriterImpl; //import java.io.FileNotFoundException; //import java.io.FileWriter; -//import javax.activation.FileDataSource; +//import jakarta.activation.FileDataSource; /** * Binary data represented as base64-encoded string diff --git a/src/main/java/org/jvnet/staxex/BinaryText.java b/src/main/java/org/jvnet/staxex/BinaryText.java index b0a14f8..ffef023 100644 --- a/src/main/java/org/jvnet/staxex/BinaryText.java +++ b/src/main/java/org/jvnet/staxex/BinaryText.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -10,7 +10,7 @@ package org.jvnet.staxex; -import javax.activation.DataHandler; +import jakarta.activation.DataHandler; /** * BinaryText represents a MTOM attachment. diff --git a/src/main/java/org/jvnet/staxex/MtomEnabled.java b/src/main/java/org/jvnet/staxex/MtomEnabled.java index 8a43b4f..8d61723 100644 --- a/src/main/java/org/jvnet/staxex/MtomEnabled.java +++ b/src/main/java/org/jvnet/staxex/MtomEnabled.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -10,7 +10,7 @@ package org.jvnet.staxex; -import javax.activation.DataHandler; +import jakarta.activation.DataHandler; /** * A SOAPElement implementation may support this interface to allow MTOM attachments. diff --git a/src/main/java/org/jvnet/staxex/StreamingDataHandler.java b/src/main/java/org/jvnet/staxex/StreamingDataHandler.java index 2d6b56a..9a022f8 100644 --- a/src/main/java/org/jvnet/staxex/StreamingDataHandler.java +++ b/src/main/java/org/jvnet/staxex/StreamingDataHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -10,8 +10,8 @@ package org.jvnet.staxex; -import javax.activation.DataHandler; -import javax.activation.DataSource; +import jakarta.activation.DataHandler; +import jakarta.activation.DataSource; import java.io.BufferedInputStream; import java.io.Closeable; import java.io.File; diff --git a/src/main/java/org/jvnet/staxex/XMLStreamWriterEx.java b/src/main/java/org/jvnet/staxex/XMLStreamWriterEx.java index 91a77c4..3541b42 100644 --- a/src/main/java/org/jvnet/staxex/XMLStreamWriterEx.java +++ b/src/main/java/org/jvnet/staxex/XMLStreamWriterEx.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -10,7 +10,7 @@ package org.jvnet.staxex; -import javax.activation.DataHandler; +import jakarta.activation.DataHandler; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import java.io.OutputStream; diff --git a/src/main/java/org/jvnet/staxex/util/MtomStreamWriter.java b/src/main/java/org/jvnet/staxex/util/MtomStreamWriter.java index d6f2b30..0952e40 100644 --- a/src/main/java/org/jvnet/staxex/util/MtomStreamWriter.java +++ b/src/main/java/org/jvnet/staxex/util/MtomStreamWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -10,7 +10,7 @@ package org.jvnet.staxex.util; -import javax.xml.bind.attachment.AttachmentMarshaller; +import jakarta.xml.bind.attachment.AttachmentMarshaller; import javax.xml.stream.XMLStreamWriter; /** diff --git a/src/main/java/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java b/src/main/java/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java index e59a112..c870e07 100644 --- a/src/main/java/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java +++ b/src/main/java/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -12,7 +12,7 @@ import java.io.IOException; -import javax.xml.bind.attachment.AttachmentMarshaller; +import jakarta.xml.bind.attachment.AttachmentMarshaller; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader;