This is an automated email from the ASF dual-hosted git repository. neilcsmith 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 a0532dc [NETBEANS-4715] Make GlassFish Report Jakarta EE 8.0 Profile Support new 0598a9d Merge pull request #2313 from lkishalmi/NETBEANS-4715 a0532dc is described below commit a0532dc5aad291247de62ae18c359e25c96ef37f Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com> AuthorDate: Fri Aug 14 09:23:47 2020 -0700 [NETBEANS-4715] Make GlassFish Report Jakarta EE 8.0 Profile Support --- .../server/config/ConfigBuilderProvider.java | 2 +- .../tooling/server/config/GlassFishV5_1.xml | 101 --------------------- .../tooling/server/config/GlassFishV5_1_0.xml | 4 +- .../tooling/server/config/JavaEEProfile.java | 2 +- 4 files changed, 4 insertions(+), 105 deletions(-) diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java index d297c77..90efe45 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java @@ -72,7 +72,7 @@ public class ConfigBuilderProvider { /** Library builder configuration since GlassFish 5.1. */ private static final Config.Next CONFIG_V5_1 = new Config.Next(GlassFishVersion.GF_5_1_0, - ConfigBuilderProvider.class.getResource("GlassFishV5_1.xml")); + ConfigBuilderProvider.class.getResource("GlassFishV5_1_0.xml")); /** Library builder configuration for GlassFish cloud. */ private static final Config config diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1.xml deleted file mode 100644 index bce4c22..0000000 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1.xml +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> -<server> - <tools lib="lib"> - <asadmin jar="client/appserver-cli.jar"/> - </tools> - <java version="1.8"> - <platform version="1.7"/> - <platform version="1.8"/> - </java> - <javaee version="1.8"> - <profile version="1.3" type="full"/> - <profile version="1.4" type="full"/> - <profile version="1.5" type="full"/> - <profile version="1.6" type="web"/> - <profile version="1.6" type="full" check="full"/> - <profile version="1.7" type="web"/> - <profile version="1.7" type="full" check="full"/> - <profile version="1.8" type="web"/> - <profile version="1.8" type="full" check="full"/> - <module type="war"/> - <module type="car" check="full"/> - <module type="ear" check="full"/> - <module type="ejb" check="full"/> - <module type="rar" check="full"/> - <check name="full"> - <file path="appclient-server-core.jar"/> - </check> - </javaee> - <library id="Java EE"> - <classpath> - <fileset dir="modules"> - <include name="javax\..+\.jar"/> - <include name="bean-validator.jar"/> - <include name="cdi-api.jar"/> - <include name="jaxb-osgi.jar"/> - <include name="jaxr-api-osgi.jar"/> - <include name="jaxrpc-api-osgi.jar"/> - <include name="webservices-osgi.jar"/> - <include name="weld-osgi-bundle.jar"/> - </fileset> - <fileset dir="modules/endorsed"> - <include name=".+\.jar"/> - </fileset> - <fileset dir="../mq/lib"> - <include name="jaxm-api.jar"/> - </fileset> - </classpath> - <javadocs> - <lookup path="docs/javaee-doc-api.jar"/> - </javadocs> - <sources> - </sources> - </library> - <library id="Jersey 2"> - <classpath> - <fileset dir="modules"> - <include name="guava.+\.jar"/> - <include name="jackson.+\.jar"/> - <!-- include name="javax.ws.+\.jar"/ --> - <include name="jersey.+\.jar"/> - <include name="jettison.*\.jar"/> - </fileset> - </classpath> - <javadocs> - <link url="http://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.0-m05-2/jersey-documentation-2.0-m05-2-docbook.zip"/> - </javadocs> - <sources> - </sources> - </library> - <library id="JAX-RS"> - <classpath> - <fileset dir="modules"> - <include name="javax.ws.rs-api.jar"/> - </fileset> - </classpath> - <javadocs> - </javadocs> - <sources> - </sources> - </library> -</server> diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml index bafd707..ea62cd8 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml @@ -37,8 +37,8 @@ <profile version="1.7" type="full" check="full"/> <profile version="1.8" type="web"/> <profile version="1.8" type="full" check="full"/> - <profile version="1.8.0" type="web"/> - <profile version="1.8.0" type="full" check="full"/> + <profile version="8.0.0" type="web"/> + <profile version="8.0.0" type="full" check="full"/> <module type="war"/> <module type="car" check="full"/> <module type="ear" check="full"/> diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java index 7efcd2f..75efca9 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java @@ -119,7 +119,7 @@ public enum JavaEEProfile { v1_7("1.7"), /** JavaEE 1.8. */ v1_8("1.8"), - /** JakartaEE 1.8.0. */ + /** JakartaEE 8.0. */ v8_0_0("8.0.0"); /** JavaEE profile type name. */ --------------------------------------------------------------------- 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