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/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new c05d42e Upgrade javaee6.api binaries c05d42e is described below commit c05d42e2420fc77f57d80cf6e26399cc8667468c Author: Jose Contreras <pepnes...@gmail.com> AuthorDate: Tue Dec 17 18:29:30 2019 -0600 Upgrade javaee6.api binaries --- enterprise/javaee.api/external/binaries-list | 4 ++-- ...xb-api-osgi-2.2-license.txt => jaxb-api-osgi-2.2.7-license.txt} | 4 ++-- ...osgi-2.0-license.txt => webservices-api-osgi-2.0.1-license.txt} | 6 +++--- enterprise/javaee.api/nbproject/project.properties | 7 ++++--- .../org/netbeans/modules/javaee/api/javaee-endorsed-api-6.0.xml | 4 ++-- nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 3 +++ 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/enterprise/javaee.api/external/binaries-list b/enterprise/javaee.api/external/binaries-list index 87ca549..1da5ff5 100644 --- a/enterprise/javaee.api/external/binaries-list +++ b/enterprise/javaee.api/external/binaries-list @@ -17,5 +17,5 @@ D6F416983EA13C334D5C599A9045414ECAF5D66D javax:javaee-api:6.0 EBEC44255251E6D3B8DDBAF701F732DAF0238CBF javax:javaee-web-api:6.0 479C1E06DB31C432330183F5CAE684163F186146 javax.annotation:javax.annotation-api:1.2 -ACDC6E43595B4EF739D7B3CBB6A8D36832DA6DDD javax.xml.bind:jaxb-api-osgi:2.2 -36C9E426AB6BDBE656316E3706FCD8878E8639AE javax.xml:webservices-api-osgi:2.0 +45EBA8B0520A70787D5DD2EA154ACE152F817C0D javax.xml.bind:jaxb-api-osgi:2.2.7 +203E8BEEA41131255439441068C3FD1FE9EFC190 javax.xml:webservices-api-osgi:2.0.1 diff --git a/enterprise/javaee.api/external/jaxb-api-osgi-2.2-license.txt b/enterprise/javaee.api/external/jaxb-api-osgi-2.2.7-license.txt similarity index 99% rename from enterprise/javaee.api/external/jaxb-api-osgi-2.2-license.txt rename to enterprise/javaee.api/external/jaxb-api-osgi-2.2.7-license.txt index d877b55..e442487 100644 --- a/enterprise/javaee.api/external/jaxb-api-osgi-2.2-license.txt +++ b/enterprise/javaee.api/external/jaxb-api-osgi-2.2.7-license.txt @@ -1,8 +1,8 @@ Name: Java Architecture for XML Binding -Version: 2.2 +Version: 2.2.7 License: CDDL-1.1 Description: JAXB (JSR 222) API bundled for OSGi distribution -Origin: Oracle (https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api-osgi/2.2) +Origin: Oracle (https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api-osgi/2.2.7) COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1 diff --git a/enterprise/javaee.api/external/webservices-api-osgi-2.0-license.txt b/enterprise/javaee.api/external/webservices-api-osgi-2.0.1-license.txt similarity index 99% rename from enterprise/javaee.api/external/webservices-api-osgi-2.0-license.txt rename to enterprise/javaee.api/external/webservices-api-osgi-2.0.1-license.txt index bc12f0e..fc1232b 100644 --- a/enterprise/javaee.api/external/webservices-api-osgi-2.0-license.txt +++ b/enterprise/javaee.api/external/webservices-api-osgi-2.0.1-license.txt @@ -1,8 +1,8 @@ -Name: Metro Web Services API OSGi Bundle 2.0 -Version: 2.0 +Name: Metro Web Services API OSGi Bundle 2.0.1 +Version: 2.0.1 License: CDDL-1.1 Description: Metro Web Services API OSGi Bundle -Origin: GlassFish Community (https://mvnrepository.com/artifact/javax.xml/webservices-api-osgi/2.0) +Origin: GlassFish Community (https://mvnrepository.com/artifact/javax.xml/webservices-api-osgi/2.0.1) COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1 diff --git a/enterprise/javaee.api/nbproject/project.properties b/enterprise/javaee.api/nbproject/project.properties index 6e84492..a5828ab 100644 --- a/enterprise/javaee.api/nbproject/project.properties +++ b/enterprise/javaee.api/nbproject/project.properties @@ -15,9 +15,10 @@ # specific language governing permissions and limitations # under the License. -javac.source=1.6 +javac.compilerargs=-Xlint -Xlint:-serial +javac.source=1.8 release.external/javaee-api-6.0.jar=modules/ext/javaee-api-6.0.jar release.external/javaee-web-api-6.0.jar=modules/ext/javaee-web-api-6.0.jar release.external/javax.annotation-api-1.2.jar=modules/ext/javaee6-endorsed/javax.annotation.jar -release.external/jaxb-api-osgi-2.2.jar=modules/ext/javaee6-endorsed/jaxb-api-osgi.jar -release.external/webservices-api-osgi-2.0.jar=modules/ext/javaee6-endorsed/webservices-api-osgi.jar \ No newline at end of file +release.external/jaxb-api-osgi-2.2.7.jar=modules/ext/javaee6-endorsed/jaxb-api-osgi.jar +release.external/webservices-api-osgi-2.0.1.jar=modules/ext/javaee6-endorsed/webservices-api-osgi.jar \ No newline at end of file diff --git a/enterprise/javaee.api/src/org/netbeans/modules/javaee/api/javaee-endorsed-api-6.0.xml b/enterprise/javaee.api/src/org/netbeans/modules/javaee/api/javaee-endorsed-api-6.0.xml index 1202aab..3e0c654 100644 --- a/enterprise/javaee.api/src/org/netbeans/modules/javaee/api/javaee-endorsed-api-6.0.xml +++ b/enterprise/javaee.api/src/org/netbeans/modules/javaee/api/javaee-endorsed-api-6.0.xml @@ -41,8 +41,8 @@ <name>maven-dependencies</name> <value> javax.annotation:javax.annotation-api:1.2 - javax.xml.bind:jaxb-api-osgi:2.2 - javax.xml:webservices-api-osgi:2.0 + javax.xml.bind:jaxb-api-osgi:2.2.7 + javax.xml:webservices-api-osgi:2.0.1 </value> </property> </properties> diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 075bd9d..6a91454 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -46,6 +46,9 @@ enterprise/javaee.api/external/javax.annotation-api-1.2.jar java/maven.indexer/e enterprise/javaee7.api/external/javax.annotation-api-1.2.jar enterprise/javaee8.api/external/javax.annotation-api-1.2.jar enterprise/javaee8.api/external/javax.annotation-api-1.2.jar enterprise/websvc.restlib/external/javax.annotation-api-1.2.jar +# jaxb-api-osgi is used by multiple modules. +enterprise/javaee.api/external/jaxb-api-osgi-2.2.7.jar enterprise/javaee7.api/external/jaxb-api-osgi-2.2.7.jar + #Struts taglib is used by both web.core.syntax and web.struts enterprise/web.core.syntax/external/struts-taglib-1.3.10.jar enterprise/web.struts/external/struts-taglib-1.3.10.jar --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists