#95: Change project name to Jakarta XML Binding
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1aa2c2b..8f8530a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,10 +1,10 @@
-# Contributing to Eclipse Project for JAXB
+# Contributing to Jakarta XML Binding
Thanks for your interest in this project.
## Project description
-The Java??? Architecture for XML Binding (JAXB) provides an API and tools that
+The Jakarta XML Binding (JAXB) provides an API and tools that
automate the mapping between XML documents and Java objects.
* https://projects.eclipse.org/projects/ee4j.jaxb
@@ -19,6 +19,7 @@
The project maintains the following source code repositories
* https://github.com/eclipse-ee4j/jaxb-api
+* https://github.com/eclipse-ee4j/jaxb-tck
## Eclipse Contributor Agreement
diff --git a/NOTICE.md b/NOTICE.md
index 5aac171..6d67de2 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1,12 +1,13 @@
-# Notices for Eclipse Project for JAXB
+# Notices for Jakarta XML Binding
-This content is produced and maintained by the Eclipse Project for JAXB project.
+This content is produced and maintained by the Jakarta XML Binding
+project.
* Project home: https://projects.eclipse.org/projects/ee4j.jaxb
## Trademarks
-Eclipse Project for JAXB is a trademark of the Eclipse Foundation.
+Jakarta XML Binding is a trademark of the Eclipse Foundation.
## Copyright
@@ -17,8 +18,8 @@
## Declared Project Licenses
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.
+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
@@ -27,12 +28,36 @@
The project maintains the following source code repositories:
* https://github.com/eclipse-ee4j/jaxb-api
+* https://github.com/eclipse-ee4j/jaxb-tck
## Third-party Content
This project leverages the following third party content.
-None
+Apache River (3.0.0)
+
+* License: Apache-2.0 AND BSD-3-Clause
+
+ASM 7 (n/a)
+
+* License: BSD-3-Clause
+* Project: https://asm.ow2.io/
+* Source:
+ https://repository.ow2.org/nexus/#nexus-search;gav~org.ow2.asm~asm-commons~~~~kw,versionexpand
+
+JTHarness (5.0)
+
+* License: (GPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)
+* Project: https://wiki.openjdk.java.net/display/CodeTools/JT+Harness
+* Source: http://hg.openjdk.java.net/code-tools/jtharness/
+
+normalize.css (3.0.2)
+
+* License: MIT
+
+SigTest (n/a)
+
+* License: GPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
## Cryptography
diff --git a/README.md b/README.md
index c38da72..ab58c6c 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# Java Architecture for XML Binding (JAXB) API
+# Jakarta XML Binding API
-This project contains JAXB API based on JSR-222 specification.
+This project contains Jakarta XML Binding API and specification.
### Licensing and Governance
-JAXB API is licensed under a license - [EDL 1.0](LICENSE.md).
+This project is licensed under [EDL 1.0](LICENSE.md) license.
### More Info
-JSR-222 specification documents are available on [jcp.org](https://jcp.org/en/jsr/detail?id=222).
+[Eclipse project](https://projects.eclipse.org/projects/ee4j.jaxb).
diff --git a/exclude.xml b/jaxb-api/exclude.xml
similarity index 93%
rename from exclude.xml
rename to jaxb-api/exclude.xml
index 4a00c67..ee8053f 100644
--- a/exclude.xml
+++ b/jaxb-api/exclude.xml
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 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/jaxb-api/pom.xml b/jaxb-api/pom.xml
index 23a5889..d3a2f04 100644
--- a/jaxb-api/pom.xml
+++ b/jaxb-api/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ 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
@@ -53,37 +53,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <formats>
- <format>xml</format>
- </formats>
- <check>
- <totalLineRate>45</totalLineRate>
- <packageLineRate>45</packageLineRate>
- <haltOnFailure>true</haltOnFailure>
- </check>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.glassfish.copyright</groupId>
- <artifactId>glassfish-copyright-maven-plugin</artifactId>
- <configuration>
- <templateFile>${project.basedir}/copyright.txt</templateFile>
- <excludeFile>${project.basedir}/copyright-exclude</excludeFile>
- <!-- skip files not under SCM-->
- <scmOnly>true</scmOnly>
- <!-- turn off warnings -->
- <warn>true</warn>
- <!-- for use with repair -->
- <update>false</update>
- <!-- check that year is correct -->
- <ignoreYear>false</ignoreYear>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<configuration>
@@ -149,26 +118,19 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${spotbugs.version}</version>
<configuration>
- <skip>${findbugs.skip}</skip>
- <threshold>${findbugs.threshold}</threshold>
+ <skip>${spotbugs.skip}</skip>
+ <threshold>${spotbugs.threshold}</threshold>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
<excludeFilterFile>
- ${findbugs.exclude}
+ ${spotbugs.exclude}
</excludeFilterFile>
<fork>true</fork>
<jvmArgs>-Xms64m -Xmx256m</jvmArgs>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.findbugs</groupId>
- <artifactId>findbugs</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/ModuleUtil.java b/jaxb-api/src/main/java/javax/xml/bind/ModuleUtil.java
index 1a22714..f34cdc7 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/ModuleUtil.java
+++ b/jaxb-api/src/main/java/javax/xml/bind/ModuleUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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/jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java b/jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java
index 2b7bd09..593938c 100644
--- a/jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java
+++ b/jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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 78fc260..ae7cf3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1997, 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
@@ -25,8 +25,8 @@
<artifactId>jakarta.xml.bind-api-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Java Architecture for XML Binding</name>
- <description>JAXB (JSR 222) API</description>
+ <name>Jakarta XML Binding</name>
+ <description>Jakarta XML Binding API</description>
<url>https://github.com/eclipse-ee4j/jaxb-api</url>
<scm>
@@ -59,7 +59,7 @@
<mailingLists>
<mailingList>
- <name>Eclipse Project for JAXB mailing list</name>
+ <name>Jakarta XML Binding mailing list</name>
<post>jaxb-dev@eclipse.org</post>
<subscribe>https://accounts.eclipse.org/mailing-list/jaxb-dev</subscribe>
<unsubscribe>https://accounts.eclipse.org/mailing-list/jaxb-dev</unsubscribe>
@@ -68,10 +68,18 @@
</mailingLists>
<properties>
+ <copyright.exclude>${config.dir}/copyright-exclude</copyright.exclude>
+ <copyright.ignoreyear>false</copyright.ignoreyear>
+ <copyright.scmonly>true</copyright.scmonly>
+ <copyright.templatefile>${config.dir}/edl-copyright.txt</copyright.templatefile>
+ <copyright.update>false</copyright.update>
+ <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>
+
<release.spec.feedback>jaxb-dev@eclipse.org</release.spec.feedback>
<release.spec.date>Jul 2017</release.spec.date>
- <findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
- <findbugs.threshold>Low</findbugs.threshold>
<api.package>javax.xml.bind</api.package>
<extension.name>jakarta.xml.bind</extension.name>
<spec.version>2.4</spec.version>
@@ -111,7 +119,7 @@
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
- <version>1.50</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -160,17 +168,14 @@
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
<configuration>
- <templateFile>${config.dir}/edl-copyright.txt</templateFile>
- <excludeFile>${config.dir}/copyright-exclude</excludeFile>
- <scm>git</scm>
+ <templateFile>${copyright.templatefile}</templateFile>
+ <excludeFile>${copyright.exclude}</excludeFile>
<!-- skip files not under SCM-->
- <scmOnly>true</scmOnly>
- <!-- turn off warnings -->
- <warn>true</warn>
+ <scmOnly>${copyright.scmonly}</scmOnly>
<!-- for use with repair -->
- <update>false</update>
+ <update>${copyright.update}</update>
<!-- check that year is correct -->
- <ignoreYear>false</ignoreYear>
+ <ignoreYear>${copyright.ignoreyear}</ignoreYear>
</configuration>
<executions>
<execution>
@@ -185,23 +190,4 @@
</build>
- <profiles>
- <profile>
- <id>oss-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>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
