diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 65906aabcd74ed72e007e0e30a83f6c59d46d5ed..a177945e17ce2d5b3b90e9a408d3eb11258ac41c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,11 @@
+[//]: # " Copyright (c) 2018, 2019 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 "
+[//]: # " http://www.eclipse.org/org/documents/edl-v10.php. "
+[//]: # " "
+[//]: # " SPDX-License-Identifier: BSD-3-Clause "
+
# Contributing to Jakarta XML Binding
Thanks for your interest in this project.
diff --git a/etc/config/copyright-exclude b/etc/config/copyright-exclude
index bc50badbbbbb2a6a7d228b463ff79607e68a04e1..5f02897ecd43f0c4eec1f0ce07e65ee10a98dc0b 100644
--- a/etc/config/copyright-exclude
+++ b/etc/config/copyright-exclude
@@ -1,39 +1,11 @@
-.gif
-.jpg
-.jpeg
-.jpeg1
-.jpeg2
-.png
-.svg
-.tif
-.exe
-.ico
-.jar
-.zip
-.war
-.sql
-.jks
-.json
-.class
-.bin
.iml
.ipr
-.envelope
.txt
.bat
.sh
-.commented
-.svnignore
-.svn
-/.auth
-www
-site
etc/config/copyright-exclude
-jaxb-api/src/main/javadoc/doc-files/speclicense.html
+javadoc/doc-files/speclicense.html
jaxb-api-test/src/test/resources/logging.properties
jaxb-api-test/src/test/resources/javax/xml/bind/test.policy
jaxb-api-test/src/test/resources/jaxb/test/usr/jaxb.index
/LICENSE.md
-/README.md
-/CONTRIBUTING.md
-/NOTICE.md
diff --git a/jaxb-api-test/pom.xml b/jaxb-api-test/pom.xml
index e5eaceb56009a3a79faa953a77ac463d57905793..a7d8721fa485d675c040ea96b9dc5872b260ddc3 100644
--- a/jaxb-api-test/pom.xml
+++ b/jaxb-api-test/pom.xml
@@ -61,25 +61,10 @@
<id>copy</id>
<phase>process-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${project.version}</version>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/modules</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>${activation.version}</version>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/modules</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <outputDirectory>${project.build.directory}/modules</outputDirectory>
</configuration>
</execution>
</executions>
@@ -127,27 +112,24 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
+ <release>11</release>
<doclint>none</doclint>
<nodeprecated>false</nodeprecated>
<use>false</use>
<author>true</author>
<version>true</version>
- <doctitle><![CDATA[<br>
-JAXB ${project.version} API Library Tests</h2>
-${project.name} specification, ${release.spec.date}<br>
-Comments to: <i><a href='mailto:${release.spec.feedback}'>${release.spec.feedback}</a></i><br>
-More information at: <i><a target='_top'
-href='https://projects.eclipse.org/projects/ee4j.jaxb'>https://projects.eclipse.org/projects/ee4j.jaxb</a></i><br>
- <br> <br><hr width='65%'><h1>${project.name}</h1><hr width='75%'>
-<br> <br>]]>
- </doctitle>
- <header><![CDATA[JAXB<br>v${project.version}]]>
+ <doctitle>Jakarta XML Binding API Library Tests documentation</doctitle>
+ <header><![CDATA[Jakarta XML Binding<br>v${project.version}]]>
</header>
<bottom>
- <![CDATA[<br>Copyright © {inceptionYear}–{currentYear} Oracle and/or its affiliates.
- All rights reserved.<br>Comments to : <a href="mailto:${release.spec.feedback}">${release.spec.feedback}</a>.]]>
+ <![CDATA[
+Comments to : <a href="mailto:${release.spec.feedback}">${release.spec.feedback}</a>.<br>
+Copyright © 2019 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>
+ <detectOfflineLinks>false</detectOfflineLinks>
+ <docfilessubdirs>true</docfilessubdirs>
</configuration>
</plugin>
</plugins>
diff --git a/jaxb-api-test/src/main/javadoc/doc-files/speclicense.html b/jaxb-api-test/src/main/javadoc/doc-files/speclicense.html
new file mode 100644
index 0000000000000000000000000000000000000000..ba29e5ed25b6fddac3bb796dc6e3ec8cd99eee1e
--- /dev/null
+++ b/jaxb-api-test/src/main/javadoc/doc-files/speclicense.html
@@ -0,0 +1,72 @@
+<html>
+<head>
+<title>Eclipse Foundation Specification License - v1.0</title>
+</head>
+<body>
+<h1>Eclipse Foundation Specification License - v1.0</h1>
+<p>By using and/or copying this document, or the Eclipse Foundation
+ document from which this statement is linked, you (the licensee) agree
+ that you have read, understood, and will comply with the following
+ terms and conditions:</p>
+
+<p>Permission to copy, and distribute the contents of this document, or
+ the Eclipse Foundation document from which this statement is linked, in
+ any medium for any purpose and without fee or royalty is hereby
+ granted, provided that you include the following on ALL copies of the
+ document, or portions thereof, that you use:</p>
+
+<ul>
+ <li> link or URL to the original Eclipse Foundation document.</li>
+ <li>All existing copyright notices, or if one does not exist, a notice
+ (hypertext is preferred, but a textual representation is permitted)
+ of the form: "Copyright © [$date-of-document]
+ “Eclipse Foundation, Inc. <<url to this license>>
+ "
+ </li>
+</ul>
+
+<p>Inclusion of the full text of this NOTICE must be provided. We
+ request that authorship attribution be provided in any software,
+ documents, or other items or products that you create pursuant to the
+ implementation of the contents of this document, or any portion
+ thereof.</p>
+
+<p>No right to create modifications or derivatives of Eclipse Foundation
+ documents is granted pursuant to this license, except anyone may
+ prepare and distribute derivative works and portions of this document
+ in software that implements the specification, in supporting materials
+ accompanying such software, and in documentation of such software,
+ PROVIDED that all such works include the notice below. HOWEVER, the
+ publication of derivative works of this document for use as a technical
+ specification is expressly prohibited.</p>
+
+<p>The notice is:</p>
+
+<p>"Copyright © 2018 Eclipse Foundation. This software or
+ document includes material copied from or derived from [title and URI
+ of the Eclipse Foundation specification document]."</p>
+
+<h2>Disclaimers</h2>
+
+<p>THIS DOCUMENT IS PROVIDED "AS IS," AND THE COPYRIGHT
+ HOLDERS AND THE ECLIPSE FOUNDATION MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+ NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE
+ SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS
+ WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR
+ OTHER RIGHTS.</p>
+
+<p>THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION WILL NOT BE LIABLE
+ FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT
+ OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE
+ CONTENTS THEREOF.</p>
+
+<p>The name and trademarks of the copyright holders or the Eclipse
+ Foundation may NOT be used in advertising or publicity pertaining to
+ this document or its contents without specific, written prior
+ permission. Title to copyright in this document will at all times
+ remain with copyright holders.</p>
+
+</body>
+</html>
diff --git a/jaxb-api/pom.xml b/jaxb-api/pom.xml
index 09838156b927a3e15aa07ed4cb688fe90d3e5075..14ca46c813715bb8442dc37715ec2cf83f009e16 100644
--- a/jaxb-api/pom.xml
+++ b/jaxb-api/pom.xml
@@ -55,7 +55,6 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.1.0</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -76,13 +75,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>4.2.0</version>
+ <version>4.2.1</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
<instructions>
- <_noee>true</_noee>
<Bundle-Version>${project.version}</Bundle-Version> <!-- 2.2.99.bnull -->
<Bundle-Description>
Jakarta XML Binding API ${spec.version} Design Specification
@@ -256,7 +254,6 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<execution>
<id>default-compile</id>
<configuration>
- <release>8</release>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/ServiceLoaderUtil.java b/jaxb-api/src/main/java/javax/xml/bind/ServiceLoaderUtil.java
index dcee27b1e42e84f3444032b1001af8814edbb903..6282251ba5322d0c72e624dbb3cdc9ac2a2ec12d 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/ServiceLoaderUtil.java
+++ b/jaxb-api/src/main/java/javax/xml/bind/ServiceLoaderUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019 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
diff --git a/pom.xml b/pom.xml
index 7c73e64dcfe295004ba9eeb9e80da8262a4410a3..d2823b407137cd00814ed23676fce49be4c264d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<spotbugs.exclude>${project.basedir}/exclude.xml</spotbugs.exclude>
<spotbugs.skip>false</spotbugs.skip>
<spotbugs.threshold>Low</spotbugs.threshold>
- <spotbugs.version>3.1.11</spotbugs.version>
+ <spotbugs.version>3.1.12.1</spotbugs.version>
<release.spec.feedback>jaxb-dev@eclipse.org</release.spec.feedback>
<release.spec.date>Jul 2017</release.spec.date>
@@ -114,7 +114,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.glassfish.copyright</groupId>
@@ -127,15 +127,19 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.1.2</version>
+ </plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -143,7 +147,7 @@
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>3.0.0-M1</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -165,8 +169,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
</compilerArgs>
@@ -194,6 +198,20 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build-Id>${project.version} - ${scmBranch}-${buildNumber}, ${timestamp}</Implementation-Build-Id>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>