[netbeans] branch update-issue-report-form-18 created (now 5d139ca9b3)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch update-issue-report-form-18 in repository https://gitbox.apache.org/repos/asf/netbeans.git at 5d139ca9b3 Update netbeans_bug_report.yml for NB 18 (part 2!) This branch includes the following new commits: new 5d139ca9b3 Update netbeans_bug_report.yml for NB 18 (part 2!) 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. - 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
[netbeans] 01/01: Update netbeans_bug_report.yml for NB 18 (part 2!)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch update-issue-report-form-18 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 5d139ca9b3fe0b73250a63c0f7eab9b9773eb14d Author: Neil C Smith AuthorDate: Fri Jun 2 09:05:10 2023 +0100 Update netbeans_bug_report.yml for NB 18 (part 2!) --- .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml b/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml index d352da6a82..dce4d50cd5 100644 --- a/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml +++ b/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml @@ -64,11 +64,11 @@ body: multiple: false options: - "No / Don't know" +- "Apache NetBeans 17" - "Apache NetBeans 16" - "Apache NetBeans 15" - "Apache NetBeans 14" -- "Apache NetBeans 13" -- "Apache NetBeans 12.6 or earlier" +- "Apache NetBeans 13 or earlier" validations: required: true - type: input - 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
[netbeans] 01/01: Merge pull request #6013 from apache/update-issue-report-form-18
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 commit d6c8b6f88dfcdf7ad7db6a3b397626753b31b29c Merge: 4447e51670 5d139ca9b3 Author: Neil C Smith AuthorDate: Fri Jun 2 09:06:46 2023 +0100 Merge pull request #6013 from apache/update-issue-report-form-18 Update netbeans_bug_report.yml for NB 18 (part 2!) .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - 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
[netbeans] branch master updated (4447e51670 -> d6c8b6f88d)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 4447e51670 Merge pull request #6009 from thurka/GCN-2645 add 5d139ca9b3 Update netbeans_bug_report.yml for NB 18 (part 2!) new d6c8b6f88d Merge pull request #6013 from apache/update-issue-report-form-18 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: .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - 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
[netbeans] branch issues-update-18 deleted (was b00e76948a)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch issues-update-18 in repository https://gitbox.apache.org/repos/asf/netbeans.git was b00e76948a Update issue report template for NB18 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - 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
[netbeans] branch delivery deleted (was bf19d75c7d)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git was bf19d75c7d Merge pull request #5939 from mbien/fix-binaries-embedded-version The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - 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
[netbeans] branch update-issue-report-form-18 deleted (was 5d139ca9b3)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch update-issue-report-form-18 in repository https://gitbox.apache.org/repos/asf/netbeans.git was 5d139ca9b3 Update netbeans_bug_report.yml for NB 18 (part 2!) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - 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
[netbeans] branch master updated (d6c8b6f88d -> d89a420f74)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from d6c8b6f88d Merge pull request #6013 from apache/update-issue-report-form-18 add 6034731992 Resolve breakpoints in Scala code new d89a420f74 #5910: Breakpoints in Scala sources in VSCode 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: .../server/debugging/breakpoints/NbBreakpoint.java | 32 +- 1 file changed, 31 insertions(+), 1 deletion(-) - 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
[netbeans] 01/01: #5910: Breakpoints in Scala sources in VSCode
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit d89a420f7465097b0e872cde08f076202e2563f9 Merge: d6c8b6f88d 6034731992 Author: Jaroslav Tulach <1842422+jtul...@users.noreply.github.com> AuthorDate: Fri Jun 2 11:38:34 2023 +0200 #5910: Breakpoints in Scala sources in VSCode .../server/debugging/breakpoints/NbBreakpoint.java | 32 +- 1 file changed, 31 insertions(+), 1 deletion(-) - 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
[netbeans-mavenutils-archetypes] branch master updated: license header fix for rat detection + exclusion of archetype content
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-archetypes.git The following commit(s) were added to refs/heads/master by this push: new cd82809 license header fix for rat detection + exclusion of archetype content new 342a7bd Merge pull request #4 from ebarboni/ratcheck cd82809 is described below commit cd82809864bea66113acf85a2fd5548ade1c8f60 Author: Eric Barboni AuthorDate: Fri Jun 2 11:58:32 2023 +0200 license header fix for rat detection + exclusion of archetype content --- .../{README.MD => README.md}| 21 + netbeans-jakartaee-war-archetype/pom.xml| 18 +++--- .../META-INF/archetype-post-generate.groovy | 19 +++ .../resources/META-INF/maven/archetype-metadata.xml | 2 +- pom.xml | 2 +- 5 files changed, 57 insertions(+), 5 deletions(-) diff --git a/netbeans-jakartaee-war-archetype/README.MD b/netbeans-jakartaee-war-archetype/README.md similarity index 71% rename from netbeans-jakartaee-war-archetype/README.MD rename to netbeans-jakartaee-war-archetype/README.md index 3e6d8a3..a2f53e5 100644 --- a/netbeans-jakartaee-war-archetype/README.MD +++ b/netbeans-jakartaee-war-archetype/README.md @@ -1,3 +1,24 @@ + + # Parameters The archetype can be configured via several system properties: diff --git a/netbeans-jakartaee-war-archetype/pom.xml b/netbeans-jakartaee-war-archetype/pom.xml index ec90880..0361e97 100644 --- a/netbeans-jakartaee-war-archetype/pom.xml +++ b/netbeans-jakartaee-war-archetype/pom.xml @@ -9,7 +9,7 @@ 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 - https://www.apache.org/licenses/LICENSE-2.0 + 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 @@ -30,6 +30,18 @@ under the License. maven-archetype Apache NetBeans Maven Archetypes: Jakarte EE Web Application Archetype - - + + + +org.apache.rat +apache-rat-plugin + + + + src/main/resources/archetype-resources/** + + + + + diff --git a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy b/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy index 6ccef50..0cadbc3 100644 --- a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy +++ b/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy @@ -1,3 +1,22 @@ +/* + * 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. + */ + projectDir = new File(new File(request.outputDirectory), request.artifactId) jakartaEEVariant = request.getProperties().get("jakartaEEVariant") diff --git a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 5db397e..7283f2a 100644 --- a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -8,7 +8,7 @@ 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 - https://www.apache.org/licenses/LICENSE-2.0 + 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 diff --git a/pom.xml b/pom.xml index c4bab1d..7c97272 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ to you under the Apache License, Version 2.0 (the "License"); you ma
[netbeans-mavenutils-archetypes] branch master updated: force rat version
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-archetypes.git The following commit(s) were added to refs/heads/master by this push: new a4719c6 force rat version new 73162aa Merge pull request #5 from ebarboni/rat2 a4719c6 is described below commit a4719c6c1521909b90c7cf28ccde26b37c29b7f9 Author: Eric Barboni AuthorDate: Fri Jun 2 14:46:50 2023 +0200 force rat version --- .asf.yaml | 2 +- Jenkinsfile.groovy | 2 +- README.md | 2 +- netbeans-jakartaee-war-archetype/README.md | 2 +- netbeans-jakartaee-war-archetype/pom.xml | 2 +- .../src/main/resources/META-INF/archetype-post-generate.groovy | 2 +- .../src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- pom.xml| 7 ++- 8 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 13b58d0..6c12892 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -6,7 +6,7 @@ # "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 +# https://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, diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 6eb19ef..63b4777 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -7,7 +7,7 @@ * "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 + * https://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 diff --git a/README.md b/README.md index a48b893..2b4ff86 100755 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ "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 + https://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 diff --git a/netbeans-jakartaee-war-archetype/README.md b/netbeans-jakartaee-war-archetype/README.md index a2f53e5..0957624 100644 --- a/netbeans-jakartaee-war-archetype/README.md +++ b/netbeans-jakartaee-war-archetype/README.md @@ -8,7 +8,7 @@ "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 + https://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 diff --git a/netbeans-jakartaee-war-archetype/pom.xml b/netbeans-jakartaee-war-archetype/pom.xml index 0361e97..07ae85e 100644 --- a/netbeans-jakartaee-war-archetype/pom.xml +++ b/netbeans-jakartaee-war-archetype/pom.xml @@ -9,7 +9,7 @@ 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 + https://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 diff --git a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy b/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy index 0cadbc3..3e2c833 100644 --- a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy +++ b/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy @@ -7,7 +7,7 @@ * "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 + * https://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 diff --git a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 7283f2a..5db397e 100644 --- a/netbeans-jakartaee-war-archetype/src/main/resources/META-INF/maven/archetype-metada
[netbeans] branch master updated: Enable sub-pixel anti-aliasing for the splash screen progress text.
This is an automated email from the ASF dual-hosted git repository. ebakke 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 c556867ded Enable sub-pixel anti-aliasing for the splash screen progress text. c556867ded is described below commit c556867dedd6280a2814ae7e076536fc2a1f4de1 Author: Eirik Bakke AuthorDate: Sat Jan 21 22:36:16 2023 -0500 Enable sub-pixel anti-aliasing for the splash screen progress text. --- .../src/org/netbeans/core/startup/Splash.java | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/platform/core.startup/src/org/netbeans/core/startup/Splash.java b/platform/core.startup/src/org/netbeans/core/startup/Splash.java index c9985ca2cb..1338029986 100644 --- a/platform/core.startup/src/org/netbeans/core/startup/Splash.java +++ b/platform/core.startup/src/org/netbeans/core/startup/Splash.java @@ -27,7 +27,9 @@ import java.awt.image.BufferedImage; import java.io.DataOutputStream; import java.io.IOException; import java.util.Arrays; +import java.util.HashMap; import java.util.Locale; +import java.util.Map; import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.StringTokenizer; @@ -643,8 +645,7 @@ public final class Splash implements Stamps.Updater { image.paintIcon(comp, graphics, 0, 0); } // turn anti-aliasing on for the splash text -graphics.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, -RenderingHints.VALUE_TEXT_ANTIALIAS_ON); +configureDefaultRenderingHints(graphics); if (versionBox != null) { String buildNumber = System.getProperty("netbeans.buildnumber"); @@ -676,6 +677,18 @@ public final class Splash implements Stamps.Updater { } } +/* A simplified version of org.openide.awt.GraphicsUtils.configureDefaultRenderingHints. (We +can't use the org.openide.awt module here.) */ +public static void configureDefaultRenderingHints(Graphics2D graphics) { +Map ret = +(Map) (Toolkit.getDefaultToolkit().getDesktopProperty("awt.font.desktophints")); +if (ret == null) { +ret = new HashMap(); +ret.put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); +} +graphics.addRenderingHints(ret); +} + private static class SplashDialog extends JDialog implements ActionListener { /** generated Serialized Version UID */ static final long serialVersionUID = 5185644855500178404L; - 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
[netbeans] branch master updated: Add support for GlassFish 7.0.5 - This is mainly a maintenance release that contains bug fixes and updates of various components - Bump the GlassFish version in som
This is an automated email from the ASF dual-hosted git repository. pepness 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 6bcd0c9a14 Add support for GlassFish 7.0.5 - This is mainly a maintenance release that contains bug fixes and updates of various components - Bump the GlassFish version in some tests new 6af13f6a3e Merge pull request #6002 from pepness/glassfish-7.0.5 6bcd0c9a14 is described below commit 6bcd0c9a14af892d7222d1f142acb030e094ed15 Author: José Contreras AuthorDate: Tue May 30 15:13:21 2023 -0600 Add support for GlassFish 7.0.5 - This is mainly a maintenance release that contains bug fixes and updates of various components - Bump the GlassFish version in some tests --- .../modules/glassfish/common/Bundle.properties | 1 + .../modules/glassfish/common/ServerDetails.java| 14 .../glassfish/tooling/admin/AdminFactory.java | 1 + .../glassfish/tooling/data/GlassFishVersion.java | 10 - .../server/config/ConfigBuilderProvider.java | 7 +- .../glassfish/tooling/admin/AdminFactoryTest.java | 4 ++-- .../tooling/data/GlassFishVersionTest.java | 6 +++-- .../glassfish/tooling/utils/EnumUtilsTest.java | 26 +++--- 8 files changed, 50 insertions(+), 19 deletions(-) diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties index 8ad89e3c67..ba40e9cd3e 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties @@ -171,6 +171,7 @@ STR_701_SERVER_NAME=GlassFish Server 7.0.1 STR_702_SERVER_NAME=GlassFish Server 7.0.2 STR_703_SERVER_NAME=GlassFish Server 7.0.3 STR_704_SERVER_NAME=GlassFish Server 7.0.4 +STR_705_SERVER_NAME=GlassFish Server 7.0.5 # CommonServerSupport.java MSG_FLAKEY_NETWORK=Network communication problemCould not establish \ diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java index 66eda85288..36c0d30b05 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java @@ -345,6 +345,17 @@ public enum ServerDetails { "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.4/glassfish-7.0.4.zip";, // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.4/glassfish-7.0.4.zip";, // NOI18N "http://www.eclipse.org/legal/epl-2.0"; //NOI18N +), + +/** + * details for an instance of GlassFish Server 7.0.5 + */ +GLASSFISH_SERVER_7_0_5(NbBundle.getMessage(ServerDetails.class, "STR_705_SERVER_NAME", new Object[]{}), // NOI18N +"deployer:gfv700ee10", // NOI18N +705, + "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.5/glassfish-7.0.5.zip";, // NOI18N + "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.5/glassfish-7.0.5.zip";, // NOI18N +"http://www.eclipse.org/legal/epl-2.0"; //NOI18N ); /** @@ -356,6 +367,7 @@ public enum ServerDetails { public static WizardDescriptor.InstantiatingIterator getInstantiatingIterator() { return new ServerWizardIterator(new ServerDetails[]{ +GLASSFISH_SERVER_7_0_5, GLASSFISH_SERVER_7_0_4, GLASSFISH_SERVER_7_0_3, GLASSFISH_SERVER_7_0_2, @@ -384,6 +396,7 @@ public enum ServerDetails { GLASSFISH_SERVER_3_0_1, GLASSFISH_SERVER_3}, new ServerDetails[]{ +GLASSFISH_SERVER_7_0_5, GLASSFISH_SERVER_7_0_4, GLASSFISH_SERVER_7_0_3, GLASSFISH_SERVER_7_0_2, @@ -452,6 +465,7 @@ public enum ServerDetails { case GF_7_0_2: return GLASSFISH_SERVER_7_0_2.getVersion(); case GF_7_0_3: return GLASSFISH_SERVER_7_0_3.getVersion(); case GF_7_0_4: return GLASSFISH_SERVER_7_0_4.getVersion(); +case GF_7_0_5: return GLASSFISH_SERVER_7_0_5.getVersion(); default: return -1; } } diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java index 1945d149fc..201e3b688f 100644 --- a/enterpri