bump spec version, JAF 2.0.0, fixup module name
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/jaxb-api-test/pom.xml b/jaxb-api-test/pom.xml
index 802b004..0e6911c 100644
--- a/jaxb-api-test/pom.xml
+++ b/jaxb-api-test/pom.xml
@@ -95,12 +95,8 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!--module-path ${project.build.directory}/modules/jakarta.activation-api-${activation.version}.jar -->
<argLine>
- --add-modules java.xml.bind
- --upgrade-module-path ${project.build.directory}/modules/jakarta.xml.bind-api-${project.version}.jar
- --module-path ${project.build.directory}/modules/jakarta.activation-api-${activation.version}.jar
- --add-reads java.xml.bind=ALL-UNNAMED
+ --module-path ${project.build.directory}/modules/jakarta.activation-api-${activation.version}.jar:${project.build.directory}/modules/jakarta.xml.bind-api-${project.version}.jar
</argLine>
<systemPropertyVariables>
<java.util.logging.config.file>
@@ -124,7 +120,7 @@
<bottom>
<![CDATA[
Comments to : <a href="mailto:${release.spec.feedback}">${release.spec.feedback}</a>.<br>
-Copyright © 2019 Eclipse Foundation. All rights reserved.<br>
+Copyright © 2020 Eclipse Foundation. All rights reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
</bottom>
<detectJavaApiLink>false</detectJavaApiLink>
diff --git a/jaxb-api-test/src/test/java/module-info.java b/jaxb-api-test/src/test/java/module-info.java
index d6404cb..f9de673 100644
--- a/jaxb-api-test/src/test/java/module-info.java
+++ b/jaxb-api-test/src/test/java/module-info.java
@@ -12,7 +12,7 @@
* Tests for jaxb API.
*/
module jakarta.xml.bind.tests {
- requires java.xml.bind;
+ requires jakarta.xml.bind;
requires java.logging;
requires junit;
}
diff --git a/jaxb-api/pom.xml b/jaxb-api/pom.xml
index 537e3c3..13c449e 100644
--- a/jaxb-api/pom.xml
+++ b/jaxb-api/pom.xml
@@ -116,7 +116,7 @@
<groups>
<group>
<title>Jakarta XML Binding API Packages</title>
- <packages>javax.xml.bind*</packages>
+ <packages>jakarta.xml.bind*</packages>
</group>
</groups>
<tags>
@@ -273,7 +273,6 @@
<Export-Package>${api.package}.*; version=${spec.version}.${impl.version}</Export-Package>
<Import-Package>
!org.glassfish.hk2.osgiresourcelocator,
- javax.activation;version=!,
*
</Import-Package>
<Bundle-SymbolicName>${extension.name}-api</Bundle-SymbolicName>
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java
index 9fcb0ef..4812d8d 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java
@@ -10,7 +10,7 @@
package jakarta.xml.bind.annotation;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
import static java.lang.annotation.ElementType.*;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java
index 9ee457c..a39d294 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java
@@ -19,7 +19,7 @@
import javax.xml.transform.Source;
import jakarta.xml.bind.attachment.AttachmentMarshaller;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
/**
* Disable consideration of XOP encoding for datatypes that are bound to
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java b/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java
index 8658616..75048df 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java
@@ -10,7 +10,7 @@
package jakarta.xml.bind.attachment;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
import jakarta.xml.bind.Marshaller;
/**
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java b/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java
index 50f1ed4..da4f992 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java
@@ -10,7 +10,7 @@
package jakarta.xml.bind.attachment;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
/**
* <p>Enables JAXB unmarshalling of a root document containing optimized binary data formats.</p>
diff --git a/jaxb-api/src/main/java/module-info.java b/jaxb-api/src/main/java/module-info.java
index 938c7be..d9048ad 100644
--- a/jaxb-api/src/main/java/module-info.java
+++ b/jaxb-api/src/main/java/module-info.java
@@ -14,7 +14,7 @@
* <p>
* References in this document to JAXB refer to the Jakarta XML Binding unless otherwise noted.
*/
-module java.xml.bind {
+module jakarta.xml.bind {
requires transitive jakarta.activation;
requires transitive java.xml;
requires java.logging;
diff --git a/pom.xml b/pom.xml
index 1d3dc19..476b985 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,11 +81,11 @@
<release.spec.feedback>jaxb-dev@eclipse.org</release.spec.feedback>
<release.spec.date>Jul 2017</release.spec.date>
- <api.package>javax.xml.bind</api.package>
+ <api.package>jakarta.xml.bind</api.package>
<extension.name>jakarta.xml.bind</extension.name>
- <spec.version>2.3</spec.version>
- <impl.version>3</impl.version>
- <activation.version>1.2.2</activation.version>
+ <spec.version>3.0</spec.version>
+ <impl.version>0</impl.version>
+ <activation.version>2.0.0-rc1</activation.version>
<config.dir>${project.basedir}/etc/config</config.dir>
<vendor.name>Eclipse Foundation</vendor.name>
</properties>
diff --git a/spec/pom.xml b/spec/pom.xml
index 062851f..d7b5a4b 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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 Public License v. 2.0, which is available at
@@ -28,7 +28,7 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>xml-binding-spec</artifactId>
<packaging>pom</packaging>
- <version>2.3-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<name>Jakarta XML Binding Specification</name>
<properties>
