Commit 65dd2b17 authored by Emmanuel Bourg's avatar Emmanuel Bourg

New upstream version 2.3.0

parent 3d3df6f5

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

*.bat text eol=crlf
*.sh text eol=lf
......@@ -39,4 +39,18 @@
/jaxb-ri/bundles/osgi/tests/target/
/jaxb-ri/codemodel/target/
/jaxb-ri/codemodel/codemodel-annotation-compiler/target/
/jaxb-ri/codemodel/codemodel/target/
\ No newline at end of file
/jaxb-ri/codemodel/codemodel/target/
/jaxb-ri/tools/osgi_tests/core/target/
/jaxb-ri/tools/osgi_tests/jxc/target/
/jaxb-ri/tools/osgi_tests/osgi/target/
/jaxb-ri/tools/osgi_tests/osgi_extra/target/
/jaxb-ri/tools/osgi_tests/parent/target/
/jaxb-ri/tools/osgi_tests/runtime/target/
/jaxb-ri/tools/osgi_tests/xjc/target/
/jaxb-ri/boms/bom-ext/target/
/jaxb-ri/boms/bom/target/
/jaxb-ri/external/target/
/jaxb-ri/tools/osgi_tests/target/
/jaxb-ri/xsom/target/
/jaxb-ri/jaxb-xjc-jdk9/target/
/jaxb-ri/jaxb-jxc-jdk9/target/
\ No newline at end of file
---
---
# Source Code Submissions
We welcome your contributions and look forward to collaborating with you. We can only accept source code repository
submissions from users who have signed and returned the Oracle
Contributor Agreement. You will find details and the agreement to sign at this OTN web page:
[Oracle Contributor Agreement](http://www.oracle.com/technetwork/community/oca-486395.html).
# Other Contributions
For all project Submissions other than source code repository contributions, the following also applies: Oracle does
not claim ownership of Your Submissions. However, in order to fulfill
the purposes of this project, You must give Oracle and all Users
the right to post, access, discuss, use, publish, disseminate, and refine
Your Submissions.
In legalese: *You hereby grant to Oracle and all
Users a royalty-free, perpetual, irrevocable, worldwide, non-exclusive,
and fully sub-licensable right and license, under Your intellectual
property rights, to reproduce, modify, adapt, publish, translate, create
derivative works from, distribute, perform, display, and use Your
Submissions (in whole or part) and to incorporate or implement them in
other works in any form, media, or technology now known or later
developed, all subject to the obligation to retain any copyright notices
included in Your Submissions. All Users, Oracle, and their
sublicensees are responsible for any modifications they make to the
Submissions of others.*
Copyright © 2017 Oracle and/or its affiliates. All rights reserved.
This diff is collapsed.
### Licensing and Governance
# JAXB
Java Architecture for XML Binding (JAXB) is a software framework that allows Java developers to map Java classes to XML representations.
JAXB is a part of the Java SE and JAVA EE platforms.
## Licensing and Governance
JAXB is licensed under a dual license - CDDL 1.1 and GPL 2.0 with Class-path Exception.
That means you can choose which one of the two suits your needs better and use it under those terms.
We use <a href="http://glassfish.java.net/public/GovernancePolicy.html">GlassFish Governance Policy</a>,
We use [GlassFish Governance Policy](https://javaee.github.io/jaxb-v2/CONTRIBUTING),
which means we can only accept contributions under the
terms of <a href="http://oracle.com/technetwork/goto/oca">OCA</a>.
### More Info
terms of [OCA](http://oracle.com/technetwork/goto/oca).
Follow <a href="http://twitter.com/gfmetro">@gfmetro</a> (TBD) on Twitter to get JAXB and wider Metro (WSIT, JAX-WS, ...) related updates. See the Metro
website at http://metro.java.net to access Metro documentation and release information.
## Links
If you run into any issues
or have questions, ask at our user forum: <a href="mailto:users@metro.java.net">users@metro.java.net</a>, or file an issue at one of the issue trackers
* http://java.net/jira/browse/JAXB
* http://java.net/jira/browse/JAX_WS
* http://java.net/jira/browse/WSIT
- [METRO project](https://javaee.github.io/metro)
- [JSR 222](https://jcp.org/en/jsr/detail?id=222)
\ No newline at end of file
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
# Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 1997-2017 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://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
# or packager/legal/LICENSE.txt. See the License for the specific
# 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 packager/legal/LICENSE.txt.
# file and include the License file at LICENSE.txt.
#
# GPL Classpath Exception:
# Oracle designates this particular file as subject to the "Classpath"
......
......@@ -5,19 +5,19 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997-2017 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://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
or packager/legal/LICENSE.txt. See the License for the specific
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 packager/legal/LICENSE.txt.
file and include the License file at LICENSE.txt.
GPL Classpath Exception:
Oracle designates this particular file as subject to the "Classpath"
......
......@@ -3,19 +3,19 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013-2017 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
http://glassfish.java.net/public/CDDL+GPL_1_1.html
or packager/legal/LICENSE.txt. See the License for the specific
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 packager/legal/LICENSE.txt.
file and include the License file at LICENSE.txt.
GPL Classpath Exception:
Oracle designates this particular file as subject to the "Classpath"
......@@ -49,7 +49,7 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-bom</artifactId>
<relativePath>../bom/pom.xml</relativePath>
<version>2.2.10-SNAPSHOT</version>
<version>2.3.0</version>
</parent>
<groupId>com.sun.xml.bind</groupId>
......@@ -63,9 +63,8 @@
</description>
<properties>
<xsom.version>20130531</xsom.version>
<dtd-parser.version>1.1</dtd-parser.version>
<ant.version>1.9.0</ant.version>
<dtd-parser.version>1.2</dtd-parser.version>
<ant.version>1.9.7</ant.version>
<msv.version>2013.6.1</msv.version>
<!-- don't forget to check if isorelax.version is valid -> used in osgi -->