You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2018/06/07 19:27:42 UTC
[incubator-netbeans] branch master updated (f9bbf29 -> 9d39c80)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from f9bbf29 Merge pull request #440 from SirIntellegence/NETBEANS-438
add 152c3f4 [NETBEANS-830][NETBEANS-831] Fix license info for jaxb implementation
new 9d39c80 Merge pull request #582 from matthiasblaesing/netbeans-830_netbeans-831
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...2-license.txt => jaxb-2.2.5-2-jaxb-license.txt} | 2 +-
...-license.txt => jaxb-2.2.5-2-jaxb1-license.txt} | 94 ++++++++++++++++++++-
...-2-license.txt => jaxb-2.2.5-2-xjc-license.txt} | 31 ++++++-
.../licenses/CDDL-1.1-BSD-MIT-jaxb1-xjc | 98 ++++++++++++++++++++--
.../licenses/CDDL-1.1-MIT-jaxb-xjc | 33 ++++++--
5 files changed, 238 insertions(+), 20 deletions(-)
copy libs.jaxb/external/{jaxb-2.2.5-2-license.txt => jaxb-2.2.5-2-jaxb-license.txt} (99%)
copy libs.jaxb/external/{jaxb-2.2.5-2-license.txt => jaxb-2.2.5-2-jaxb1-license.txt} (80%)
copy libs.jaxb/external/{jaxb-2.2.5-2-license.txt => jaxb-2.2.5-2-xjc-license.txt} (94%)
copy libs.jaxb/external/jaxb-2.2.5-2-license.txt => nbbuild/licenses/CDDL-1.1-BSD-MIT-jaxb1-xjc (80%)
rename libs.jaxb/external/jaxb-2.2.5-2-license.txt => nbbuild/licenses/CDDL-1.1-MIT-jaxb-xjc (94%)
--
To stop receiving notification emails like this one, please contact
matthiasblaesing@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[incubator-netbeans] 01/01: Merge pull request #582 from
matthiasblaesing/netbeans-830_netbeans-831
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 9d39c80921c1dd03fdc59ab5492832b4407d3a68
Merge: f9bbf29 152c3f4
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Thu Jun 7 21:27:34 2018 +0200
Merge pull request #582 from matthiasblaesing/netbeans-830_netbeans-831
[NETBEANS-830][NETBEANS-831] Fix license info for jaxb implementation
...2-license.txt => jaxb-2.2.5-2-jaxb-license.txt} | 2 +-
...-license.txt => jaxb-2.2.5-2-jaxb1-license.txt} | 94 ++++++++++++++++++++-
...-2-license.txt => jaxb-2.2.5-2-xjc-license.txt} | 31 ++++++-
.../licenses/CDDL-1.1-BSD-MIT-jaxb1-xjc | 98 ++++++++++++++++++++--
.../licenses/CDDL-1.1-MIT-jaxb-xjc | 33 ++++++--
5 files changed, 238 insertions(+), 20 deletions(-)
--
To stop receiving notification emails like this one, please contact
matthiasblaesing@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists