Skip to content

Commit

Permalink
[#29] Update to Jakarta EE 9 dependencies (#30)
Browse files Browse the repository at this point in the history
Signed-off-by: Andy McCright <j.andrew.mccright@gmail.com>

Co-authored-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
andymc12 and lukasj committed Mar 20, 2020
1 parent 7ea0874 commit a2709a3
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 24 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Expand Up @@ -88,13 +88,13 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>1.2.2</version>
<version>2.0.0-rc1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
<version>3.0.0-RC1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -320,13 +320,13 @@
<goals>
<goal>manifest</goal>
</goals>
<configuration>>
<configuration>
<instructions>
<_removeheaders>Bnd-LastModified,Built-By,Include-Resource,Private-Package</_removeheaders>
<Implementation-Build-Id>${project.version} - ${scmBranch}-${buildNumber}</Implementation-Build-Id>
<Import-Package>
javax.activation;version=!,
javax.xml.bind.attachment;version=!,
jakarta.activation;version=!,
jakarta.xml.bind.attachment;version=!,
*
</Import-Package>
</instructions>
Expand Down
4 changes: 2 additions & 2 deletions 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
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions 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
Expand All @@ -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;
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions 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
Expand All @@ -10,7 +10,7 @@

package org.jvnet.staxex;

import javax.activation.DataHandler;
import jakarta.activation.DataHandler;

/**
* BinaryText represents a MTOM attachment.
Expand Down
4 changes: 2 additions & 2 deletions 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
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions 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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions 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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions 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
Expand All @@ -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;

/**
Expand Down
@@ -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
Expand All @@ -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;
Expand Down

0 comments on commit a2709a3

Please sign in to comment.