[Git][java-team/jaxb-api][master] 6 commits: Standards-Version updated to 4.2.1
Emmanuel Bourg
gitlab at salsa.debian.org
Thu Nov 1 22:50:51 GMT 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jaxb-api
Commits:
4774464c by Emmanuel Bourg at 2018-11-01T22:21:34Z
Standards-Version updated to 4.2.1
- - - - -
af3e5690 by Emmanuel Bourg at 2018-11-01T22:29:22Z
New upstream version 2.3.1
- - - - -
93d2d982 by Emmanuel Bourg at 2018-11-01T22:29:23Z
Update upstream source from tag 'upstream/2.3.1'
Update to upstream version '2.3.1'
with Debian dir 15a49c6fee9a4e336a2b1d94344184ef19a6ec7a
- - - - -
2663e414 by Emmanuel Bourg at 2018-11-01T22:44:00Z
Removed the multi release jar patch (fixed suptream)
- - - - -
3780986e by Emmanuel Bourg at 2018-11-01T22:46:07Z
New dependency on libactivation-java (Closes: #912466)
- - - - -
2914b7b6 by Emmanuel Bourg at 2018-11-01T22:46:33Z
Upload to unstable
- - - - -
25 changed files:
- .gitignore
- debian/changelog
- debian/control
- − debian/patches/01-fix-multi-release-jar.patch
- − debian/patches/series
- jaxb-api-test/pom.xml
- + jaxb-api-test/src/main/java/module-info.java
- jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java
- + jaxb-api-test/src/test/java/module-info.java
- jaxb-api/pom.xml
- jaxb-api/src/main/java/javax/xml/bind/ContextFinder.java
- jaxb-api/src/main/java/javax/xml/bind/JAXBPermission.java
- jaxb-api/src/main/java/javax/xml/bind/Marshaller.java
- jaxb-api/src/main/java/javax/xml/bind/Unmarshaller.java
- jaxb-api/src/main/java/javax/xml/bind/annotation/XmlNsForm.java
- jaxb-api/src/main/java/javax/xml/bind/annotation/XmlType.java
- jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/package-info.java
- jaxb-api/src/main/java/javax/xml/bind/annotation/package-info.java
- jaxb-api/src/main/java/javax/xml/bind/attachment/AttachmentUnmarshaller.java
- jaxb-api/src/main/java/javax/xml/bind/helpers/package-info.java
- jaxb-api/src/main/java/javax/xml/bind/util/package-info.java
- jaxb-api/src/main/jdk9/module-info.java → jaxb-api/src/main/java/module-info.java
- jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java
- pom.xml
- tools/rewrite_poms_git.sh
Changes:
=====================================
.gitignore
=====================================
@@ -1 +1,2 @@
-/target/
\ No newline at end of file
+/target/
+/jaxb-api/target/
\ No newline at end of file
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+jaxb-api (2.3.1-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Removed the multi release jar patch (fixed suptream)
+ - New dependency on libactivation-java (Closes: #912466)
+ * Standards-Version updated to 4.2.1
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 01 Nov 2018 23:46:23 +0100
+
jaxb-api (2.3.0-2) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -6,12 +6,13 @@ Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
Build-Depends:
debhelper (>= 11),
default-jdk,
+ libactivation-java,
libbuild-helper-maven-plugin-java,
libmaven-antrun-plugin-java,
libmaven-bundle-plugin-java,
libmaven-dependency-plugin-java,
maven-debian-helper (>= 1.5)
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
Vcs-Git: https://salsa.debian.org/java-team/jaxb-api.git
Vcs-Browser: https://salsa.debian.org/java-team/jaxb-api
Homepage: https://github.com/javaee/jaxb-spec
=====================================
debian/patches/01-fix-multi-release-jar.patch deleted
=====================================
@@ -1,24 +0,0 @@
-Description: Add the missing META-INF/versions directory in the multi release jar
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/jaxb-api/pom.xml
-+++ b/jaxb-api/pom.xml
-@@ -345,7 +345,7 @@
- <profile>
- <id>jdk9</id>
- <activation>
-- <jdk>9</jdk>
-+ <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <pluginManagement>
-@@ -453,9 +453,6 @@
- </goals>
- </execution>
- </executions>
-- <configuration>
-- <skip>true</skip>
-- </configuration>
- </plugin>
- </plugins>
- </build>
=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-01-fix-multi-release-jar.patch
=====================================
jaxb-api-test/pom.xml
=====================================
@@ -1,9 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright (c) 2017-2018 Oracle and/or its affiliates. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common Development
+ and Distribution License("CDDL") (collectively, the "License"). You
+ may not use this file except in compliance with the License. You can
+ obtain a copy of the License at
+ https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ or LICENSE.txt. See the License for the specific
+ language governing permissions and limitations under the License.
+
+ When distributing the software, include this License Header Notice in each
+ file and include the License file at LICENSE.txt.
+
+ GPL Classpath Exception:
+ Oracle designates this particular file as subject to the "Classpath"
+ exception as provided by Oracle in the GPL Version 2 section of the License
+ file that accompanied this code.
+
+ Modifications:
+ If applicable, add the following below the License Header, with the fields
+ enclosed by brackets [] replaced by your own identifying information:
+ "Portions Copyright [year] [name of copyright owner]"
+
+ Contributor(s):
+ If you wish your version of this file to be governed by only the CDDL or
+ only the GPL Version 2, indicate your decision by adding "[Contributor]
+ elects to include this software in this distribution under the [CDDL or GPL
+ Version 2] license." If you don't indicate a single choice of license, a
+ recipient has the option to distribute your version of this file under
+ either the CDDL, the GPL Version 2 or to extend the choice of license to
+ its licensees as provided above. However, if you add GPL Version 2 code
+ and therefore, elected the GPL Version 2 license, then the option applies
+ only if the new code is made subject to such option by the copyright
+ holder.
+
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>jaxb-api-parent</artifactId>
<groupId>javax.xml.bind</groupId>
- <version>2.3.0</version>
+ <version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -21,39 +64,42 @@
<artifactId>jaxb-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <release>9</release>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
- <!--Need to copy jaxb-api jar to use it at upgrade module path as multi-release jar file -->
<id>copy</id>
<phase>test-compile</phase>
<goals>
@@ -66,67 +112,38 @@
<artifactId>jaxb-api</artifactId>
<version>${project.version}</version>
<overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}</outputDirectory>
+ <outputDirectory>${project.build.directory}/mods</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation.version}</version>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/mods</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>
+ --add-modules java.xml.bind
+ --upgrade-module-path ${project.build.directory}/mods/jaxb-api-${project.version}.jar
+ --module-path ${project.build.directory}/mods/javax.activation-api-${activation.version}.jar
+ --add-reads java.xml.bind=ALL-UNNAMED
+ </argLine>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>
+ src/test/resources/logging.properties
+ </java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>non-jdk9</id>
- <activation>
- <jdk>(,1.9)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>
- -Xbootclasspath/p:${project.build.directory}/jaxb-api-${project.version}.jar
- </argLine>
- <systemPropertyVariables>
- <java.util.logging.config.file>
- src/test/resources/logging.properties
- </java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jdk9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>
- --add-modules java.xml.bind
- --upgrade-module-path ${project.build.directory}/jaxb-api-${project.version}.jar
- --add-reads java.xml.bind=ALL-UNNAMED
- </argLine>
- <systemPropertyVariables>
- <java.util.logging.config.file>
- src/test/resources/logging.properties
- </java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
+</project>
=====================================
jaxb-api-test/src/main/java/module-info.java
=====================================
@@ -0,0 +1,44 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+/**
+ * Placeholder for
+ */
+module java.xml.bind.tests.src {}
\ No newline at end of file
=====================================
jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java
=====================================
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2015-2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2018 Oracle and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
=====================================
jaxb-api-test/src/test/java/module-info.java
=====================================
@@ -0,0 +1,48 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2018-2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+/**
+ * Tests for jaxb API.
+ */
+module java.xml.bind.tests {
+ requires java.xml.bind;
+ requires java.logging;
+ requires junit;
+}
\ No newline at end of file
=====================================
jaxb-api/pom.xml
=====================================
@@ -1,23 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright (c) 2017-2018 Oracle and/or its affiliates. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common Development
+ and Distribution License("CDDL") (collectively, the "License"). You
+ may not use this file except in compliance with the License. You can
+ obtain a copy of the License at
+ https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ or LICENSE.txt. See the License for the specific
+ language governing permissions and limitations under the License.
+
+ When distributing the software, include this License Header Notice in each
+ file and include the License file at LICENSE.txt.
+
+ GPL Classpath Exception:
+ Oracle designates this particular file as subject to the "Classpath"
+ exception as provided by Oracle in the GPL Version 2 section of the License
+ file that accompanied this code.
+
+ Modifications:
+ If applicable, add the following below the License Header, with the fields
+ enclosed by brackets [] replaced by your own identifying information:
+ "Portions Copyright [year] [name of copyright owner]"
+
+ Contributor(s):
+ If you wish your version of this file to be governed by only the CDDL or
+ only the GPL Version 2, indicate your decision by adding "[Contributor]
+ elects to include this software in this distribution under the [CDDL or GPL
+ Version 2] license." If you don't indicate a single choice of license, a
+ recipient has the option to distribute your version of this file under
+ either the CDDL, the GPL Version 2 or to extend the choice of license to
+ its licensees as provided above. However, if you add GPL Version 2 code
+ and therefore, elected the GPL Version 2 license, then the option applies
+ only if the new code is made subject to such option by the copyright
+ holder.
+
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>jaxb-api-parent</artifactId>
<groupId>javax.xml.bind</groupId>
- <version>2.3.0</version>
+ <version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jaxb-api</artifactId>
<packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
@@ -36,11 +85,10 @@
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M1</version>
<configuration>
<rules>
<requireJavaVersion>
- <version>[1.7,)</version>
+ <version>[1.8,)</version>
</requireJavaVersion>
<requireMavenVersion>
<version>[3.0.3,)</version>
@@ -52,7 +100,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.7</version>
<configuration>
<formats>
<format>xml</format>
@@ -67,7 +115,7 @@
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
- <version>1.29</version>
+ <version>1.49</version>
<configuration>
<templateFile>${project.basedir}/copyright.txt</templateFile>
<excludeFile>${project.basedir}/copyright-exclude</excludeFile>
@@ -82,24 +130,12 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
- <configuration>
- <argLine>
- -Xbootclasspath/p:${basedir}/target/classes
- </argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>3.1.0</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -117,7 +153,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.4</version>
<configuration>
<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
<timestampFormat>{0,date,yyyy-MM-dd'T'HH:mm:ssZ}</timestampFormat>
@@ -129,19 +165,20 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>3.3.0</version>
+ <version>3.5.1</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
<instructions>
+ <Require-Capability>osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.8))"</Require-Capability>
<Bundle-Version>${project.version}</Bundle-Version> <!-- 2.2.99.bnull -->
<Extension-Name>${extension.name}</Extension-Name>
<Implementation-Version>${spec.version}.${impl.version}</Implementation-Version>
<Specification-Version>${project.version}</Specification-Version>
<Export-Package>${extension.name}.*; version=${spec.version}</Export-Package>
<Import-Package>
- javax.activation,
+ javax.activation;version=!,
javax.xml.bind;version="[${spec.version},3)",
javax.xml.bind.annotation;version="[${spec.version},3)",
javax.xml.bind.annotation.adapters;version="[${spec.version},3)",
@@ -173,7 +210,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.0.5</version>
<configuration>
<skip>${findbugs.skip}</skip>
<threshold>${findbugs.threshold}</threshold>
@@ -193,9 +230,7 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0-M1</version>
<configuration>
<nodeprecated>false</nodeprecated>
<use>false</use>
@@ -245,31 +280,43 @@ href='http://jaxb.java.net'><i>http://jaxb.java.net</i></a>
<head>Implementation Note:</head>
</tag>
</tags>
- <!-- TODO to be removed before 2.3 release-->
- <additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.3.2</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <configuration>
+ <release>8</release>
+ <excludes>
+ <exclude>module-info.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>module-info-compile</id>
+ <phase>test-compile</phase><!--Avoid JavaSE9 capability added by bundle-plugin-->
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <release>9</release>
+ <includes>
+ <include>module-info.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -300,7 +347,6 @@ href='http://jaxb.java.net'><i>http://jaxb.java.net</i></a>
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -337,143 +383,44 @@ href='http://jaxb.java.net'><i>http://jaxb.java.net</i></a>
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>compile-java9</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${project.build.outputDirectory}/META-INF/versions/9" />
+ <javac srcdir="${mrjar.sourceDirectory}" destdir="${project.build.outputDirectory}/META-INF/versions/9" classpath="${project.build.outputDirectory}" includeantruntime="false" source="9" target="9" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>update-source-jar</id>
+ <phase>verify</phase>
+ <configuration>
+ <tasks>
+ <jar destfile="${project.build.directory}/jaxb-api-${project.version}-sources.jar" update="true">
+ <fileset dir="${project.build.directory}/mr-jar/" />
+ </jar>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.12</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile</id>
- <configuration>
- <release>9</release>
- <source>9</source>
- <target>9</target>
- <includes>
- <include>module-info.java</include>
- </includes>
- </configuration>
- </execution>
- <execution>
- <id>base-compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>module-info.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <_failok>true</_failok>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0-M1</version>
- <configuration>
- <includeDependencySources>false</includeDependencySources>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-jdk9-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/main/jdk9</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>compile-java9</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <mkdir dir="${project.build.outputDirectory}/META-INF/versions/9" />
- <javac srcdir="${mrjar.sourceDirectory}" destdir="${project.build.outputDirectory}/META-INF/versions/9" classpath="${project.build.outputDirectory}" includeantruntime="false" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>update-source-jar</id>
- <phase>verify</phase>
- <configuration>
- <tasks>
- <jar destfile="${project.build.directory}/jaxb-api-${project.version}-sources.jar" update="true">
- <fileset dir="${project.build.directory}/mr-jar/" />
- </jar>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- lukas: FIX-ME in java.net:parent -->
- <id>jvnet-release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0-M1</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
+</project>
=====================================
jaxb-api/src/main/java/javax/xml/bind/ContextFinder.java
=====================================
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2003-2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003-2018 Oracle and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
=====================================
jaxb-api/src/main/java/javax/xml/bind/JAXBPermission.java
=====================================
@@ -56,15 +56,19 @@ import java.security.BasicPermission;
* and for each provides a description of what the permission allows
* and a discussion of the risks of granting code the permission.
*
- * <table border=1 cellpadding=5 summary="Permission target name, what the permission allows, and associated risks">
+ * <table class="striped">
+ * <caption style="display:none">Permission target name, what the permission allows, and associated risks"</caption>
+ * <thead>
* <tr>
- * <th>Permission Target Name</th>
- * <th>What the Permission Allows</th>
- * <th>Risks of Allowing this Permission</th>
+ * <th scope="col">Permission Target Name</th>
+ * <th scope="col">What the Permission Allows</th>
+ * <th scope="col">Risks of Allowing this Permission</th>
* </tr>
+ * </thead>
*
+ * <tbody style="text-align:left">
* <tr>
- * <td>setDatatypeConverter</td>
+ * <th scope="row">setDatatypeConverter</th>
* <td>
* Allows the code to set VM-wide {@link DatatypeConverterInterface}
* via {@link DatatypeConverter#setDatatypeConverter(DatatypeConverterInterface) the setDatatypeConverter method}
@@ -78,6 +82,7 @@ import java.security.BasicPermission;
* another application running in the same JVM.
* </td>
* </tr>
+ * </tbody>
* </table>
*
* @see java.security.BasicPermission
=====================================
jaxb-api/src/main/java/javax/xml/bind/Marshaller.java
=====================================
@@ -388,7 +388,7 @@ public interface Marshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
- * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
+ * object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -410,7 +410,7 @@ public interface Marshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
- * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
+ * object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -432,7 +432,7 @@ public interface Marshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
- * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
+ * object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -455,7 +455,7 @@ public interface Marshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
- * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
+ * object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -477,7 +477,7 @@ public interface Marshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
- * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
+ * object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -503,7 +503,7 @@ public interface Marshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
- * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
+ * object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -526,7 +526,7 @@ public interface Marshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
- * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
+ * object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -550,7 +550,7 @@ public interface Marshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
- * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
+ * object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -590,7 +590,7 @@ public interface Marshaller {
* {@code Marshaller}. This method can only be used to set one of
* the standard JAXB defined properties above or a provider specific
* property. Attempting to set an undefined property will result in
- * a PropertyException being thrown. See <a href="#supportedProps">
+ * a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#supportedProps">
* Supported Properties</a>.
*
* @param name the name of the property to be set. This value can either
@@ -611,7 +611,7 @@ public interface Marshaller {
* {@code Marshaller}. This method can only be used to get one of
* the standard JAXB defined properties above or a provider specific
* property. Attempting to get an undefined property will result in
- * a PropertyException being thrown. See <a href="#supportedProps">
+ * a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#supportedProps">
* Supported Properties</a>.
*
* @param name the name of the property to retrieve
=====================================
jaxb-api/src/main/java/javax/xml/bind/Unmarshaller.java
=====================================
@@ -200,13 +200,13 @@ import java.io.Reader;
* Unmarshalling can deserialize XML data that represents either an entire XML document
* or a subtree of an XML document. Typically, it is sufficient to use the
* unmarshalling methods described by
- * <a href="#unmarshalGlobal">Unmarshal root element that is declared globally</a>.
+ * <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal root element that is declared globally</a>.
* These unmarshal methods utilize {@link JAXBContext}'s mapping of global XML element
* declarations and type definitions to JAXB mapped classes to initiate the
* unmarshalling of the root element of XML data. When the {@link JAXBContext}'s
* mappings are not sufficient to unmarshal the root element of XML data,
* the application can assist the unmarshalling process by using the
- * <a href="#unmarshalByDeclaredType">unmarshal by declaredType methods</a>.
+ * <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType methods</a>.
* These methods are useful for unmarshalling XML data where
* the root element corresponds to a local element declaration in the schema.
* </blockquote>
@@ -259,32 +259,29 @@ import java.io.Reader;
* instance are set.
*
* <a name="unmarshalDeclaredTypeReturn"></a>
- * <table summary="" border="2" rules="all" cellpadding="4">
+ * <table class="striped">
+ * <caption>Unmarshal By Declared Type returned JAXBElement</caption>
* <thead>
* <tr>
- * <th align="center" colspan="2">
- * Unmarshal By Declared Type returned JAXBElement
+ * <th scope="col">JAXBElement Property</th>
+ * <th scope="col">Value</th>
* </tr>
* <tr>
- * <th>JAXBElement Property</th>
- * <th>Value</th>
- * </tr>
- * <tr>
- * <td>name</td>
- * <td>{@code xml element name}</td>
+ * <th scope="col">name</th>
+ * <th scope="col">{@code xml element name}</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>value</td>
+ * <th scope="row">value</th>
* <td>{@code instanceof declaredType}</td>
* </tr>
* <tr>
- * <td>declaredType</td>
+ * <th scope="row">declaredType</th>
* <td>unmarshal method {@code declaredType} parameter</td>
* </tr>
* <tr>
- * <td>scope</td>
+ * <th scope="row">scope</th>
* <td>{@code null} <i>(actual scope is unknown)</i></td>
* </tr>
* </tbody>
@@ -293,7 +290,7 @@ import java.io.Reader;
*
* <p>
* The following is an example of
- * <a href="#unmarshalByDeclaredType">unmarshal by declaredType method</a>.
+ * <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType method</a>.
* <p>
* Unmarshal by declaredType from a {@code org.w3c.dom.Node}:
* <blockquote>
@@ -428,7 +425,7 @@ public interface Unmarshaller {
* content tree.
*
* <p>
- * Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
+ * Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @param f the file to unmarshal XML data from
* @return the newly created root object of the java content tree
@@ -439,7 +436,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the file parameter is null
*/
@@ -451,7 +448,7 @@ public interface Unmarshaller {
* be incomplete when using this form of the unmarshal API.
*
* <p>
- * Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
+ * Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @param is the InputStream to unmarshal XML data from
* @return the newly created root object of the java content tree
@@ -462,7 +459,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the InputStream parameter is null
*/
@@ -475,7 +472,7 @@ public interface Unmarshaller {
* because a Reader does not provide the system ID.
*
* <p>
- * Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
+ * Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @param reader the Reader to unmarshal XML data from
* @return the newly created root object of the java content tree
@@ -486,7 +483,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the InputStream parameter is null
* @since 1.6, JAXB 2.0
@@ -498,7 +495,7 @@ public interface Unmarshaller {
* content tree.
*
* <p>
- * Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
+ * Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @param url the url to unmarshal XML data from
* @return the newly created root object of the java content tree
@@ -509,7 +506,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the URL parameter is null
*/
@@ -520,7 +517,7 @@ public interface Unmarshaller {
* resulting content tree.
*
* <p>
- * Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
+ * Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @param source the input source to unmarshal XML data from
* @return the newly created root object of the java content tree
@@ -531,7 +528,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the InputSource parameter is null
*/
@@ -542,7 +539,7 @@ public interface Unmarshaller {
* content tree.
*
* <p>
- * Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
+ * Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @param node
* the document/element to unmarshal XML data from.
@@ -555,7 +552,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the Node parameter is null
* @see #unmarshal(org.w3c.dom.Node, Class)
@@ -567,7 +564,7 @@ public interface Unmarshaller {
* and return the resulting content tree.
*
* <p>
- * Implements <a href="#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
+ * Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
*
* @param node
* the document/element to unmarshal XML data from.
@@ -575,7 +572,7 @@ public interface Unmarshaller {
* @param declaredType
* appropriate JAXB mapped class to hold {@code node}'s XML data.
*
- * @return <a href="#unmarshalDeclaredTypeReturn">JAXB Element</a> representation of {@code node}
+ * @return <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element</a> representation of {@code node}
*
* @throws JAXBException
* If any unexpected errors occur while unmarshalling
@@ -583,7 +580,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If any parameter is null
* @since 1.6, JAXB 2.0
@@ -595,7 +592,7 @@ public interface Unmarshaller {
* resulting content tree.
*
* <p>
- * Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
+ * Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* <p>
* <a name="saxParserPlugable"></a>
@@ -641,7 +638,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the Source parameter is null
* @see #unmarshal(javax.xml.transform.Source, Class)
@@ -655,16 +652,16 @@ public interface Unmarshaller {
* resulting content tree.
*
* <p>
- * Implements <a href="#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
+ * Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
*
* <p>
- * See <a href="#saxParserPlugable">SAX 2.0 Parser Pluggability</a>
+ * See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#saxParserPlugable">SAX 2.0 Parser Pluggability</a>
*
* @param source the XML Source to unmarshal XML data from (providers are
* only required to support SAXSource, DOMSource, and StreamSource)
* @param declaredType
* appropriate JAXB mapped class to hold {@code source}'s xml root element
- * @return Java content rooted by <a href="#unmarshalDeclaredTypeReturn">JAXB Element</a>
+ * @return Java content rooted by <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element</a>
*
* @throws JAXBException
* If any unexpected errors occur while unmarshalling
@@ -672,7 +669,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If any parameter is null
* @since 1.6, JAXB 2.0
@@ -685,7 +682,7 @@ public interface Unmarshaller {
* resulting content tree.
*
* <p>
- * Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
+ * Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* <p>
* This method assumes that the parser is on a START_DOCUMENT or
@@ -705,7 +702,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the {@code reader} parameter is null
* @throws IllegalStateException
@@ -722,7 +719,7 @@ public interface Unmarshaller {
* and return the resulting content tree.
*
* <p>
- * This method implements <a href="#unmarshalByDeclaredType">unmarshal by declaredType</a>.
+ * This method implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType</a>.
* <p>
* This method assumes that the parser is on a START_DOCUMENT or
* START_ELEMENT event. Unmarshalling will be done from this
@@ -735,7 +732,7 @@ public interface Unmarshaller {
* @param declaredType
* appropriate JAXB mapped class to hold {@code reader}'s START_ELEMENT XML data.
*
- * @return content tree rooted by <a href="#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
+ * @return content tree rooted by <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
*
* @throws JAXBException
* If any unexpected errors occur while unmarshalling
@@ -743,7 +740,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If any parameter is null
* @since 1.6, JAXB 2.0
@@ -755,7 +752,7 @@ public interface Unmarshaller {
* resulting content tree.
*
* <p>
- * This method is an <a href="#unmarshalGlobal">Unmarshal Global Root method</a>.
+ * This method is an <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root method</a>.
*
* <p>
* This method assumes that the parser is on a START_DOCUMENT or
@@ -775,7 +772,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the {@code reader} parameter is null
* @throws IllegalStateException
@@ -792,7 +789,7 @@ public interface Unmarshaller {
* and return the resulting content tree.
*
* <p>
- * This method implements <a href="#unmarshalByDeclaredType">unmarshal by declaredType</a>.
+ * This method implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType</a>.
*
* <p>
* This method assumes that the parser is on a START_DOCUMENT or
@@ -806,7 +803,7 @@ public interface Unmarshaller {
* @param declaredType
* appropriate JAXB mapped class to hold {@code reader}'s START_ELEMENT XML data.
*
- * @return content tree rooted by <a href="#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
+ * @return content tree rooted by <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
*
* @throws JAXBException
* If any unexpected errors occur while unmarshalling
@@ -814,7 +811,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
+ * binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If any parameter is null
* @since 1.6, JAXB 2.0
@@ -927,7 +924,7 @@ public interface Unmarshaller {
* {@code Unmarshaller}. This method can only be used to set one of
* the standard JAXB defined properties above or a provider specific
* property. Attempting to set an undefined property will result in
- * a PropertyException being thrown. See <a href="#supportedProps">
+ * a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#supportedProps">
* Supported Properties</a>.
*
* @param name the name of the property to be set. This value can either
@@ -948,7 +945,7 @@ public interface Unmarshaller {
* {@code Unmarshaller}. This method can only be used to get one of
* the standard JAXB defined properties above or a provider specific
* property. Attempting to get an undefined property will result in
- * a PropertyException being thrown. See <a href="#supportedProps">
+ * a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#supportedProps">
* Supported Properties</a>.
*
* @param name the name of the property to retrieve
=====================================
jaxb-api/src/main/java/javax/xml/bind/annotation/XmlNsForm.java
=====================================
@@ -51,23 +51,26 @@ package javax.xml.bind.annotation;
* The namespace qualification values are used in the annotations
* defined in this packge. The enumeration values are mapped as follows:
*
- * <table summary="" border="1" cellpadding="4" cellspacing="3">
- * <tbody>
+ * <table class="striped">
+ * <caption style="display:none">Mapping of enumeration values</caption>
+ * <thead>
* <tr>
- * <td><b>Enum Value</b></td>
- * <td><b>XML Schema Value</b></td>
+ * <th scope="col">Enum Value</th>
+ * <th scope="col">XML Schema Value</th>
* </tr>
+ * </thead>
*
- * <tr valign="top">
- * <td>UNQUALIFIED</td>
+ * <tbody>
+ * <tr>
+ * <th scope="row">UNQUALIFIED</th>
* <td>unqualified</td>
* </tr>
- * <tr valign="top">
- * <td>QUALIFIED</td>
+ * <tr>
+ * <th scope="row">QUALIFIED</th>
* <td>qualified</td>
* </tr>
- * <tr valign="top">
- * <td>UNSET</td>
+ * <tr>
+ * <th scope="row">UNSET</th>
* <td>namespace qualification attribute is absent from the
* XML Schema fragment</td>
* </tr>
=====================================
jaxb-api/src/main/java/javax/xml/bind/annotation/XmlType.java
=====================================
@@ -128,58 +128,60 @@ import java.lang.annotation.Target;
* complex type or simple type. The notational symbols used in the table are:
* <ul>
* <li> {@literal ->} : represents a mapping </li>
- * <li> [x]+ : one or more occurances of x </li>
+ * <li> [x]+ : one or more occurrences of x </li>
* <li> [ {@code @XmlValue} property ]: JavaBean property annotated with
* {@code @XmlValue}</li>
* <li> X : don't care
* </ul>
* <blockquote>
- * <table summary="" border="1" cellpadding="4" cellspacing="3">
- * <tbody>
+ * <table class="striped" summary="Mapping class to XML Schema simple type">
+ * <thead>
* <tr>
- * <td><b>Target</b></td>
- * <td><b>propOrder</b></td>
- * <td><b>ClassBody</b></td>
- * <td><b>ComplexType</b></td>
- * <td><b>SimpleType</b></td>
+ * <th scope="col">Target</th>
+ * <th scope="col">propOrder</th>
+ * <th scope="col">ClassBody</th>
+ * <th scope="col">ComplexType</th>
+ * <th scope="col">SimpleType</th>
* </tr>
+ * </thead>
*
- * <tr valign="top">
+ * <tbody>
+ * <tr>
* <td>Class</td>
* <td>{}</td>
- * <td>[property]+ {@literal ->} elements</td>
+ * <th scope="row">[property]+ {@literal ->} elements</th>
* <td>complexcontent<br>xs:all</td>
* <td> </td>
* </tr>
*
- * <tr valign="top">
+ * <tr>
* <td>Class</td>
* <td>non empty</td>
- * <td>[property]+ {@literal ->} elements</td>
+ * <th scope="row">[property]+ {@literal ->} elements</th>
* <td>complexcontent<br>xs:sequence</td>
* <td> </td>
* </tr>
*
- * <tr valign="top">
+ * <tr>
* <td>Class</td>
* <td>X</td>
- * <td>no property {@literal ->} element</td>
+ * <th scope="row">no property {@literal ->} element</th>
* <td>complexcontent<br>empty sequence</td>
* <td> </td>
* </tr>
*
- * <tr valign="top">
+ * <tr>
* <td>Class</td>
* <td>X</td>
- * <td>1 [{@code @XmlValue} property] {@literal &&} <br> [property]+ {@literal ->} attributes</td>
+ * <th scope="row">1 [{@code @XmlValue} property] {@literal &&} <br> [property]+ {@literal ->} attributes</th>
* <td>simplecontent</td>
* <td> </td>
* </tr>
*
- * <tr valign="top">
+ * <tr>
* <td>Class</td>
* <td>X</td>
- * <td>1 [{@code @XmlValue} property] {@literal &&} <br> no properties {@literal ->} attribute</td>
+ * <th scope="row">1 [{@code @XmlValue} property] {@literal &&} <br> no properties {@literal ->} attribute</th>
* <td> </td>
* <td>simpletype</td>
* </tr>
=====================================
jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/package-info.java
=====================================
@@ -41,15 +41,15 @@
/**
* {@link javax.xml.bind.annotation.adapters.XmlAdapter} and its spec-defined
* sub-classes to allow arbitrary Java classes to be used with JAXB.
- * <p>
+ *
* <h2>Package Specification</h2>
- * <p>
+ *
* <ul>
* <li><a href="http://jcp.org/en/jsr/detail?id=222">JAXB Specification</a>
* </ul>
- * <p>
+ *
* <h2>Related Documentation</h2>
- * <p>
+ *
* For overviews, tutorials, examples, guides, and tool documentation,
* please see:
* <ul>
@@ -58,4 +58,4 @@
*
* @see <a href="http://jaxb.java.net">JAXB Website</a>
*/
-package javax.xml.bind.annotation.adapters;
\ No newline at end of file
+package javax.xml.bind.annotation.adapters;
=====================================
jaxb-api/src/main/java/javax/xml/bind/annotation/package-info.java
=====================================
@@ -45,170 +45,90 @@
* <p>The following table shows the JAXB mapping annotations
* that can be associated with each program element. </p>
* <p>
- * <table border="1" cellpadding="4" cellspacing="3" summary="test0">
- * <tbody>
- * <tr>
- * <td><b>Program Element</b></td>
- * <td><b>JAXB annotation</b></td>
- * </tr>
- * <tr valign="top">
- * <td><b>Package</b></td>
- * <td>
- * <table summary="test">
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlSchema.html">XmlSchema</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaType.html">XmlSchemaType</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaTypes.html">XmlSchemaTypes</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.html">XmlJavaTypeAdapters</a></b></td>
- * </tr>
- * </table>
- * </td>
- * </tr>
- * <tr valign="top">
- * <td><b>Class</b></td>
- * <td>
- * <table summary="test2">
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
- * </tr>
- * </table>
- * </td>
- * </tr>
- * <tr valign="top">
- * <td><b>Enum type</b></td>
- * <td>
- * <table summary="test3">
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlEnum.html">XmlEnum</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlEnumValue.html">XmlEnumValue (enum constant only)</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
- * </tr>
- * </table>
- * </td>
- * </tr>
- * <tr valign="top">
- * <td><b>JavaBean Property/field</b></td>
- * <td>
- * <table summary="test4">
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElement.html">XmlElement</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElements.html">XmlElements</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementRef.html">XmlElementRef</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementRefs.html">XmlElementRefs</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementWrapper.html">XmlElementWrapper</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAnyElement.html">XmlAnyElement</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAttribute.html">XmlAttribute</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAnyAttribute.html">XmlAnyAttribute</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlTransient.html">XmlTransient</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlValue.html">XmlValue</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlID.html">XmlID</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlIDREF.html">XmlIDREF</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlMixed.html">XmlMixed</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementDecl.html">XmlElementDecl (only on method)</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
- * </tr>
- * </table>
- * </td>
- * </tr>
- * <tr valign="top">
- * <td><b>Parameter</b></td>
- * <td>
- * <table summary="test5">
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></b></td>
- * </tr>
- * <tr valign="top">
- * <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
- * </tr>
- * </table>
- * </td>
- * </tr>
+ * <table class="striped" summary="Annotations for customizing Java program elements to XML Schema mapping">
+ * <thead>
+ * <tr>
+ * <th scope="col">Program Element</th>
+ * <th scope="col">JAXB annotation</th>
+ * </tr>
+ * </thead>
+ * <tbody style="text-align:left">
+ * <tr>
+ * <th scope="row" style="vertical-align:top">Package</th>
+ * <td>
+ * <ul style="list-style-type:none">
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlSchema.html">XmlSchema</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaType.html">XmlSchemaType</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaTypes.html">XmlSchemaTypes</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.html">XmlJavaTypeAdapters</a></li>
+ * </ul>
+ * </td>
+ * </tr>
+ * <tr>
+ * <th scope="row" style="vertical-align:top">Class</th>
+ * <td>
+ * <ul style="list-style-type:none">
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
+ * </ul>
+ * </td>
+ * </tr>
+ * <tr>
+ * <th scope="row" style="vertical-align:top">Enum type</th>
+ * <td>
+ * <ul style="list-style-type:none">
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlEnum.html">XmlEnum</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlEnumValue.html">XmlEnumValue (enum constant only)</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
+ * </ul>
+ * </td>
+ * </tr>
+ * <tr>
+ * <th scope="row" style="vertical-align:top">JavaBean Property/field</th>
+ * <td>
+ * <ul style="list-style-type:none">
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElement.html">XmlElement</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElements.html">XmlElements</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementRef.html">XmlElementRef</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementRefs.html">XmlElementRefs</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementWrapper.html">XmlElementWrapper</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAnyElement.html">XmlAnyElement</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAttribute.html">XmlAttribute</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAnyAttribute.html">XmlAnyAttribute</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlTransient.html">XmlTransient</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlValue.html">XmlValue</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlID.html">XmlID</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlIDREF.html">XmlIDREF</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlMixed.html">XmlMixed</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementDecl.html">XmlElementDecl (only on method)</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
+ * </ul>
+ * </td>
+ * </tr>
+ * <tr>
+ * <th scope="row" style="vertical-align:top">Parameter</th>
+ * <td>
+ * <ul style="list-style-type:none">
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></li>
+ * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
+ * </ul>
+ * </td>
+ * </tr>
* </tbody>
* </table>
* <h3>Terminology</h3>
@@ -251,31 +171,33 @@
* <p>The following namespace prefixes are used in the XML Schema
* fragments in this package.
* <p>
- * <table border="1" cellpadding="4" cellspacing="3" summary="test6">
- * <tbody>
- * <tr>
- * <td><b>Prefix</b></td>
- * <td><b>Namespace</b></td>
- * <td><b>Notes</b></td>
- * </tr>
- * <tr valign="top">
- * <td>xs</td>
- * <td>http://www.w3.org/2001/XMLSchema</td>
- * <td>Namespace of XML Schema namespace</td>
- * </tr>
- * <tr valign="top">
- * <td>ref</td>
- * <td>http://ws-i.org/profiles/basic/1.1/xsd</td>
- * <td>Namespace for swaref schema component</td>
- * </tr>
- * <tr valign="top">
- * <td>xsi</td>
- * <td>http://www.w3.org/2001/XMLSchema-instance</td>
- * <td>XML Schema namespace for instances</td>
- * </tr>
- * </tbody>
+ * <table class="striped" summary="XML Schema fragments namespace prefixes">
+ * <thead>
+ * <tr>
+ * <th scope="col">Prefix</th>
+ * <th scope="col">Namespace</th>
+ * <th scope="col">Notes</th>
+ * </tr>
+ * </thead>
+ * <tbody>
+ * <tr>
+ * <th scope="row">xs</th>
+ * <td>http://www.w3.org/2001/XMLSchema</td>
+ * <td>Namespace of XML Schema namespace</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">ref</th>
+ * <td>http://ws-i.org/profiles/basic/1.1/xsd</td>
+ * <td>Namespace for swaref schema component</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">xsi</th>
+ * <td>http://www.w3.org/2001/XMLSchema-instance</td>
+ * <td>XML Schema namespace for instances</td>
+ * </tr>
+ * </tbody>
* </table>
*
* @since 1.6, JAXB 2.0
*/
-package javax.xml.bind.annotation;
\ No newline at end of file
+package javax.xml.bind.annotation;
=====================================
jaxb-api/src/main/java/javax/xml/bind/attachment/AttachmentUnmarshaller.java
=====================================
@@ -87,32 +87,29 @@ public abstract class AttachmentUnmarshaller {
*
* <p>The returned {@code DataHandler} instance must be configured
* to meet the following required mapping constaint.
- * <table summary="" border="2" rules="all" cellpadding="4">
+ * <table class="striped">
+ * <caption>Required Mappings between MIME and Java Types</caption>
* <thead>
* <tr>
- * <th align="center" colspan="2">
- * Required Mappings between MIME and Java Types
+ * <th scope="col">MIME Type</th>
+ * <th scope="col">Java Type</th>
* </tr>
* <tr>
- * <th>MIME Type</th>
- * <th>Java Type</th>
- * </tr>
- * <tr>
- * <th>{@code DataHandler.getContentType()}</th>
- * <th>{@code instanceof DataHandler.getContent()}</th>
+ * <th scope="col">{@code DataHandler.getContentType()}</th>
+ * <th scope="col">{@code instanceof DataHandler.getContent()}</th>
* </tr>
* </thead>
- * <tbody>
+ * <tbody style="text-align:left">
* <tr>
- * <td>image/gif</td>
+ * <th scope="row">image/gif</th>
* <td>java.awt.Image</td>
* </tr>
* <tr>
- * <td>image/jpeg</td>
+ * <th scope="row">image/jpeg</th>
* <td>java.awt.Image</td>
* </tr>
* <tr>
- * <td>text/xml or application/xml</td>
+ * <th scope="row">text/xml or application/xml</th>
* <td>javax.xml.transform.Source</td>
* </tr>
* </tbody>
=====================================
jaxb-api/src/main/java/javax/xml/bind/helpers/package-info.java
=====================================
@@ -41,17 +41,17 @@
/**
* <B>JAXB Provider Use Only:</b> Provides partial default implementations for
* some of the <code>javax.xml.bind</code> interfaces.
- * <p>
+ *
* <p>
* JAXB Providers can extend these classes and implement the abstract
* methods.
- * <p>
+ *
* <h2>Package Specification</h2>
- * <p>
+ *
* <ul>
* <li><a href="https://jaxb.java.net/">JAXB Specification</a>
* </ul>
- * <p>
+ *
* <h2>Related Documentation</h2>
* <p>
* For overviews, tutorials, examples, guides, and tool documentation,
@@ -62,4 +62,4 @@
*
* @see <a href="https://jaxb.java.net/">JAXB Website</a>
*/
-package javax.xml.bind.helpers;
\ No newline at end of file
+package javax.xml.bind.helpers;
=====================================
jaxb-api/src/main/java/javax/xml/bind/util/package-info.java
=====================================
@@ -40,13 +40,13 @@
/**
* Useful client utility classes.
- * <p>
+ *
* <h2>Package Specification</h2>
- * <p>
+ *
* <ul>
* <li><a href="https://jaxb.java.net/">JAXB Specification</a>
* </ul>
- * <p>
+ *
* <h2>Related Documentation</h2>
* <p>
* For overviews, tutorials, examples, guides, and tool documentation,
@@ -57,4 +57,4 @@
*
* @see <a href="https://jaxb.java.net/">JAXB Website</a>
*/
-package javax.xml.bind.util;
\ No newline at end of file
+package javax.xml.bind.util;
=====================================
jaxb-api/src/main/jdk9/module-info.java → jaxb-api/src/main/java/module-info.java
=====================================
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017-2018 Oracle and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
=====================================
jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java
=====================================
@@ -142,22 +142,25 @@ class ModuleUtil {
*
* @throws JAXBException if ony of a classes package is not open to {@code java.xml.bind} module.
*/
- static void delegateAddOpensToImplModule(Class[] classes, Class<?> factorySPI) throws JAXBException {
+ public static void delegateAddOpensToImplModule(Class[] classes, Class<?> factorySPI) throws JAXBException {
final Module implModule = factorySPI.getModule();
Module jaxbModule = JAXBContext.class.getModule();
for (Class cls : classes) {
- final Module classModule = cls.getModule();
- final String packageName = cls.getPackageName();
- //no need for unnamed
- if (!classModule.isNamed()) {
+ Class jaxbClass = cls.isArray() ?
+ cls.getComponentType() : cls;
+
+ final Module classModule = jaxbClass.getModule();
+ final String packageName = jaxbClass.getPackageName();
+ //no need for unnamed and java.base types
+ if (!classModule.isNamed() || classModule.getName().equals("java.base")) {
continue;
}
//report error if they are not open to java.xml.bind
if (!classModule.isOpen(packageName, jaxbModule)) {
throw new JAXBException(Messages.format(Messages.JAXB_CLASSES_NOT_OPEN,
- packageName, cls.getName(), classModule.getName()));
+ packageName, jaxbClass.getName(), classModule.getName()));
}
//propagate openness to impl module
classModule.addOpens(packageName, implModule);
=====================================
pom.xml
=====================================
@@ -3,7 +3,7 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common Development
@@ -43,16 +43,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api-parent</artifactId>
+ <version>2.3.1</version>
+
<parent>
<groupId>net.java</groupId>
<artifactId>jvnet-parent</artifactId>
<version>5</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api-parent</artifactId>
- <version>2.3.0</version>
<modules>
<module>jaxb-api</module>
<module>jaxb-api-test</module>
@@ -72,7 +73,7 @@
<connection>scm:git:git://github.com/javaee/jaxb-spec.git</connection>
<developerConnection>scm:git:git at github.com:javaee/jaxb-spec.git</developerConnection>
<url>https://github.com/javaee/jaxb-spec.git</url>
- <tag>2.3.0</tag>
+ <tag>HEAD</tag>
</scm>
<developers>
@@ -121,16 +122,26 @@
<extension.name>javax.xml.bind</extension.name>
<spec.version>2.3</spec.version>
<impl.version>0</impl.version>
+ <activation.version>1.2.0</activation.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.0</version>
+ <version>3.7.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@@ -139,9 +150,64 @@
</compilerArgs>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.20</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>jvnet-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalJOptions>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
+ </additionalJOptions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
=====================================
tools/rewrite_poms_git.sh
=====================================
@@ -1,12 +1,61 @@
#!/bin/bash
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright (c) 2017-2018 Oracle and/or its affiliates. All rights reserved.
+#
+# The contents of this file are subject to the terms of either the GNU
+# General Public License Version 2 only ("GPL") or the Common Development
+# and Distribution License("CDDL") (collectively, the "License"). You
+# may not use this file except in compliance with the License. You can
+# obtain a copy of the License at
+# https://oss.oracle.com/licenses/CDDL+GPL-1.1
+# or LICENSE.txt. See the License for the specific
+# language governing permissions and limitations under the License.
+#
+# When distributing the software, include this License Header Notice in each
+# file and include the License file at LICENSE.txt.
+#
+# GPL Classpath Exception:
+# Oracle designates this particular file as subject to the "Classpath"
+# exception as provided by Oracle in the GPL Version 2 section of the License
+# file that accompanied this code.
+#
+# Modifications:
+# If applicable, add the following below the License Header, with the fields
+# enclosed by brackets [] replaced by your own identifying information:
+# "Portions Copyright [year] [name of copyright owner]"
+#
+# Contributor(s):
+# If you wish your version of this file to be governed by only the CDDL or
+# only the GPL Version 2, indicate your decision by adding "[Contributor]
+# elects to include this software in this distribution under the [CDDL or GPL
+# Version 2] license." If you don't indicate a single choice of license, a
+# recipient has the option to distribute your version of this file under
+# either the CDDL, the GPL Version 2 or to extend the choice of license to
+# its licensees as provided above. However, if you add GPL Version 2 code
+# and therefore, elected the GPL Version 2 license, then the option applies
+# only if the new code is made subject to such option by the copyright
+# holder.
+#
+
# if option -n ... do not commit
COMMIT=Y
-while getopts ":n" opt; do
+RELEASE=false
+
+while getopts ":nv:r" opt; do
case $opt in
n)
COMMIT=N
- shift
+ ;;
+ v)
+ CUSTOM_VERSION=${OPTARG}
+ echo "Using custom version: ${CUSTOM_VERSION}"
+ ;;
+ r)
+ RELEASE=true
+ echo "Using release mode, to append buildnumber remove -r flag."
;;
\?)
echo "Invalid option: -$OPTARG" >&2
@@ -16,17 +65,8 @@ while getopts ":n" opt; do
done
echo "Script will commit changes: [$COMMIT] (pass option -n not to commit)"
-#if [ "$#" -eq 1 ]; then
-# CURRENT_VERSION=$1
-#fi
-#
-#if [ "$#" -eq 0 ]; then
-# echo "No version specified, reading release version from pom file"
-# CURRENT_VERSION=`cat pom.xml | grep '<version' -m 1 | cut -d ">" -f 2 | cut -d "<" -f 1 | cut -d "-" -f 1`
-#fi
-CURRENT_VERSION=2.3.0
-
-echo "Major release version found: $CURRENT_VERSION"
+CURRENT_VERSION=`cat pom.xml | grep '<version' -m 1 | cut -d ">" -f 2 | cut -d "<" -f 1 | cut -d "-" -f 1`
+echo "Current version: ${CURRENT_VERSION}"
SCRIPT_DIR=$(cd $(dirname $0); pwd -P)
@@ -48,7 +88,23 @@ DATESTAMP=`date +%y%m%d.%H%M`
BUILD_NUMBER=b${DATESTAMP}
DEVELOPER_VERSION=${CURRENT_VERSION}-SNAPSHOT
RELEASE_QUALIFIER=${BUILD_NUMBER}
-RELEASE_VERSION=${CURRENT_VERSION}-${RELEASE_QUALIFIER}
+
+if [ -z "${CUSTOM_VERSION}" ]; then
+ echo "No version specified, reading release version from pom file"
+ RELEASE_VERSION=${CURRENT_VERSION}
+else
+ RELEASE_VERSION=${CUSTOM_VERSION}
+fi;
+
+if [ "${RELEASE}" = true ]; then
+ echo "Release version: ${RELEASE_VERSION}"
+else
+ RELEASE_VERSION="${RELEASE_VERSION}-${RELEASE_QUALIFIER}"
+ echo "Pre-release version: ${RELEASE_VERSION}"
+fi;
+
+
+
RELEASE_TAG=${RELEASE_VERSION}
cleanup()
View it on GitLab: https://salsa.debian.org/java-team/jaxb-api/compare/0a2eb40c1b61f765e3dfbbdacf8edf408c634d91...2914b7b6dcb70934f2ba2d29108472bfd66174e9
--
View it on GitLab: https://salsa.debian.org/java-team/jaxb-api/compare/0a2eb40c1b61f765e3dfbbdacf8edf408c634d91...2914b7b6dcb70934f2ba2d29108472bfd66174e9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181101/6c239a2e/attachment.html>
More information about the pkg-java-commits
mailing list