[netbeans] branch NETBEANS-4029 created (now abe985c)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. at abe985c [NETBEANS-4029] Fix feature dialog This branch includes the following new commits: new abe985c [NETBEANS-4029] Fix feature dialog 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: [NETBEANS-4029] Fix feature dialog
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit abe985cafc7df5d26f72a18cc84364bc386c5963 Author: Hector Espert AuthorDate: Thu Apr 9 23:21:11 2020 +0200 [NETBEANS-4029] Fix feature dialog --- .../ide/ergonomics/fod/ConfigurationPanel.java | 32 +++--- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java index be78b57..6f98a8a 100644 --- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java +++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java @@ -24,9 +24,11 @@ import java.awt.EventQueue; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; @@ -142,29 +144,39 @@ public class ConfigurationPanel extends JPanel implements Runnable { downloadLabel.setVisible(true); activateButton.setVisible(true); downloadButton.setVisible(true); -StringBuilder sbDownload = new StringBuilder(); - + +List downloadStringList = new ArrayList<>(); + // collect descriptions from features contributing installed extras for (FeatureInfo fi : extrasMap.values()) { String s = required ? fi.getExtraModulesRequiredText() : fi.getExtraModulesRecommendedText(); -if (s != null) { -if (sbDownload.length() > 0) { -sbDownload.append("\n"); -} -sbDownload.append(s); +if (!downloadStringList.contains(s)) { +downloadStringList.add(s); } } + if (required) { activateButton.setEnabled(false); } else { activateButton.setEnabled(true); } -String lblDownloadMsg = sbDownload.toString(); +String lblDownloadMsg = ""; +if (!downloadStringList.isEmpty()) { +StringBuilder sbDownload = new StringBuilder(""); +for (int i = 0; i < downloadStringList.size(); i++) { +sbDownload.append(downloadStringList.get(i)); +if (i > 0 || i < downloadStringList.size() - 1) { +sbDownload.append(""); +} +} + +sbDownload.append(""); +lblDownloadMsg = sbDownload.toString(); +} -String list = ""; if (!missingModules.isEmpty()) { StringBuilder sb = new StringBuilder(); for (FeatureInfo.ExtraModuleInfo s : missingModules) { @@ -173,7 +185,7 @@ public class ConfigurationPanel extends JPanel implements Runnable { } sb.append(s.displayName()); } -list = sb.toString(); +String list = sb.toString(); if (required) { lblDownloadMsg = NbBundle.getMessage(ConfigurationPanel.class, "MSG_MissingRequiredModules", displayName, list); activateButton.setEnabled(false); - 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 NETBEANS-4029 updated (a49d845 -> df60dd9)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard a49d845 WIP discard abe985c [NETBEANS-4029] Fix feature dialog new df60dd9 [NETBEANS-4029] Fix feature dialog This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a49d845) \ N -- N -- N refs/heads/NETBEANS-4029 (df60dd9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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: .../org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java| 3 +-- 1 file changed, 1 insertion(+), 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] 01/01: [NETBEANS-4029] Fix feature dialog
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit df60dd98a3bdb494e0c0f913283957cf81100356 Author: Hector Espert AuthorDate: Thu Apr 9 23:21:11 2020 +0200 [NETBEANS-4029] Fix feature dialog --- .../ide/ergonomics/fod/ConfigurationPanel.java | 53 ++ 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java index be78b57..f038985 100644 --- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java +++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java @@ -24,9 +24,11 @@ import java.awt.EventQueue; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; @@ -49,7 +51,6 @@ import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.autoupdate.ui.api.PluginManager; import org.openide.awt.Mnemonics; -import org.openide.modules.SpecificationVersion; import org.openide.util.Exceptions; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor.Task; @@ -93,7 +94,7 @@ public class ConfigurationPanel extends JPanel implements Runnable { public void setInfo(FeatureInfo info, String displayName, Collection toInstall, Collection missingModules, Map extrasMap, boolean required) { -this.extrasFilter = new HashSet(); +this.extrasFilter = new HashSet<>(); this.featureInfo = info; this.featureInstall = toInstall; boolean activateNow = toInstall.isEmpty() && missingModules.isEmpty(); @@ -142,29 +143,17 @@ public class ConfigurationPanel extends JPanel implements Runnable { downloadLabel.setVisible(true); activateButton.setVisible(true); downloadButton.setVisible(true); -StringBuilder sbDownload = new StringBuilder(); - + // collect descriptions from features contributing installed extras -for (FeatureInfo fi : extrasMap.values()) { -String s = required -? fi.getExtraModulesRequiredText() -: fi.getExtraModulesRecommendedText(); -if (s != null) { -if (sbDownload.length() > 0) { -sbDownload.append("\n"); -} -sbDownload.append(s); -} -} +List downloadStringList = collectDescriptionsFromFeatures(extrasMap.values(), required); +String lblDownloadMsg = generateDownloadMessageFromDescriptions(downloadStringList); + if (required) { activateButton.setEnabled(false); } else { activateButton.setEnabled(true); } -String lblDownloadMsg = sbDownload.toString(); - -String list = ""; if (!missingModules.isEmpty()) { StringBuilder sb = new StringBuilder(); for (FeatureInfo.ExtraModuleInfo s : missingModules) { @@ -173,7 +162,7 @@ public class ConfigurationPanel extends JPanel implements Runnable { } sb.append(s.displayName()); } -list = sb.toString(); +String list = sb.toString(); if (required) { lblDownloadMsg = NbBundle.getMessage(ConfigurationPanel.class, "MSG_MissingRequiredModules", displayName, list); activateButton.setEnabled(false); @@ -194,6 +183,32 @@ public class ConfigurationPanel extends JPanel implements Runnable { org.openide.awt.Mnemonics.setLocalizedText(downloadButton, btnDownloadMsg); } } + +private List collectDescriptionsFromFeatures(Collection features, boolean required) { +List descriptionsList = new ArrayList<>(); +for (FeatureInfo fi : features) { +String s = required ? fi.getExtraModulesRequiredText(): fi.getExtraModulesRecommendedText(); +if (!descriptionsList.contains(s)) { +descriptionsList.add(s); +} +} +return descriptionsList; +} + +private String generateDownloadMessageFromDescriptions(List descriptions) {
[netbeans] branch NETBEANS-4029 updated: WIP
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/NETBEANS-4029 by this push: new a49d845 WIP a49d845 is described below commit a49d845789657842b5343b6b3d4e780a3e35b217 Author: Hector Espert AuthorDate: Thu Apr 9 23:36:33 2020 +0200 WIP --- .../ide/ergonomics/fod/ConfigurationPanel.java | 52 -- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java index 6f98a8a..8620080 100644 --- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java +++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java @@ -145,17 +145,9 @@ public class ConfigurationPanel extends JPanel implements Runnable { activateButton.setVisible(true); downloadButton.setVisible(true); -List downloadStringList = new ArrayList<>(); - // collect descriptions from features contributing installed extras -for (FeatureInfo fi : extrasMap.values()) { -String s = required -? fi.getExtraModulesRequiredText() -: fi.getExtraModulesRecommendedText(); -if (!downloadStringList.contains(s)) { -downloadStringList.add(s); -} -} +List downloadStringList = collectDescriptionsFromFeatures(extrasMap.values(), required); +String lblDownloadMsg = generateDownloadMessageFromDescriptions(downloadStringList); if (required) { activateButton.setEnabled(false); @@ -163,20 +155,6 @@ public class ConfigurationPanel extends JPanel implements Runnable { activateButton.setEnabled(true); } -String lblDownloadMsg = ""; -if (!downloadStringList.isEmpty()) { -StringBuilder sbDownload = new StringBuilder(""); -for (int i = 0; i < downloadStringList.size(); i++) { -sbDownload.append(downloadStringList.get(i)); -if (i > 0 || i < downloadStringList.size() - 1) { -sbDownload.append(""); -} -} - -sbDownload.append(""); -lblDownloadMsg = sbDownload.toString(); -} - if (!missingModules.isEmpty()) { StringBuilder sb = new StringBuilder(); for (FeatureInfo.ExtraModuleInfo s : missingModules) { @@ -206,6 +184,32 @@ public class ConfigurationPanel extends JPanel implements Runnable { org.openide.awt.Mnemonics.setLocalizedText(downloadButton, btnDownloadMsg); } } + +private List collectDescriptionsFromFeatures(Collection features, boolean required) { +List descriptionsList = new ArrayList<>(); +for (FeatureInfo fi : features) { +String s = required ? fi.getExtraModulesRequiredText(): fi.getExtraModulesRecommendedText(); +if (!descriptionsList.contains(s)) { +descriptionsList.add(s); +} +} +return descriptionsList; +} + +private String generateDownloadMessageFromDescriptions(List descriptions) { +StringBuilder sbDownload = new StringBuilder(); +if (!descriptions.isEmpty()) { +sbDownload.append(""); +for (int i = 0; i < descriptions.size(); i++) { +sbDownload.append(descriptions.get(i)); +if (i > 0 || i < descriptions.size() - 1) { +sbDownload.append(""); +} +} +sbDownload.append(""); +} +return sbDownload.toString(); +} @Override public void removeNotify() { - 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: Fix apisupport.ant tests
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 6cc2ff62a1f5c1acfd77b746694c2a32be73350c Author: Hector Espert AuthorDate: Fri Apr 17 20:36:54 2020 +0200 Fix apisupport.ant tests --- .gitignore | 2 +- .travis.yml| 2 +- apisupport/apisupport.ant/build.xml| 13 .../html4j/nbproject/project.properties| 2 +- .../javafx/nbproject/project.properties| 2 +- .../platform5/core/core/META-INF/manifest.mf | 2 + .../random/modules/ext/stuff/META-INF/manifest.mf | 1 + .../random/modules/random/META-INF/manifest.mf | 3 + .../apisupport/project/ApisupportAntUtilsTest.java | 4 +- .../AvoidModuleListInProjectConstructorTest.java | 2 +- .../apisupport/project/DialogDisplayerImpl.java| 70 ++ .../modules/apisupport/project/EvaluatorTest.java | 6 +- .../apisupport/project/ModuleDependencyTest.java | 5 +- .../apisupport/project/NbModuleProjectTest.java| 5 +- .../project/NbModuleProviderImplTest.java | 2 - .../apisupport/project/ProjectXMLManagerTest.java | 4 +- .../modules/apisupport/project/UseFxTest.java | 1 - .../apisupport/project/UseHtml4JavaTest.java | 1 - .../queries/AccessibilityQueryImplTest.java| 14 ++--- .../queries/AntArtifactProviderImplTest.java | 7 ++- .../project/queries/ClassPathProviderImplTest.java | 6 +- .../queries/GlobalJavadocForBinaryImplTest.java| 3 +- .../project/queries/JavadocForBinaryImplTest.java | 2 +- .../project/queries/SourceForBinaryImplTest.java | 22 +++ .../project/queries/SourceLevelQueryImplTest.java | 2 +- .../queries/SubprojectProviderImplTest.java| 14 +++-- .../queries/UnitTestForSourceQueryImplTest.java| 20 +++ .../project/spi/BrandingSupportTest.java | 3 +- .../project/suite/BuildZipDistributionTest.java| 1 - .../apisupport/project/ui/ModuleActionsTest.java | 4 +- .../ui/wizard/LibraryStartVisualPanelTest.java | 2 +- .../project/universe/ModuleListTest.java | 9 +-- .../apisupport/project/universe/TestEntryTest.java | 2 +- 33 files changed, 162 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index 35528c1..0245b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -100,4 +100,4 @@ derby.log /groovy/gradle/netbeans-gradle-tooling/.gradle/ /groovy/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.jar /groovy/gradle/release/modules/gradle/daemon-loader/.gradle/ -/nbbuild/misc/prepare-bundles/target/ \ No newline at end of file +/nbbuild/misc/prepare-bundles/target/ diff --git a/.travis.yml b/.travis.yml index 348e149..b115979 100644 --- a/.travis.yml +++ b/.travis.yml @@ -459,7 +459,7 @@ matrix: - ant $OPTS clean - ant $OPTS build script: -#- ant $OPTS -f apisupport/apisupport.ant test +- ant $OPTS -f apisupport/apisupport.ant test - ant $OPTS -f apisupport/apisupport.project test - ant $OPTS -f apisupport/apisupport.refactoring test - ant $OPTS -f apisupport/apisupport.wizards test diff --git a/apisupport/apisupport.ant/build.xml b/apisupport/apisupport.ant/build.xml index 66938dc..14789a6 100644 --- a/apisupport/apisupport.ant/build.xml +++ b/apisupport/apisupport.ant/build.xml @@ -40,5 +40,18 @@ + + + + + + + + + + + + + diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties index 8c80113..5137752 100644 --- a/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties +++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -javac.source=1.6 +javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties index 8c80113..5137752 100644 --- a/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties +++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -javac.source=1.6 +javac.source=1.8
[netbeans] branch apisupport-ant-tests updated (4766679 -> 6cc2ff6)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard 4766679 Fix apisupport.ant tests new 6cc2ff6 Fix apisupport.ant tests This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4766679) \ N -- N -- N refs/heads/apisupport-ant-tests (6cc2ff6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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: apisupport/apisupport.ant/build.xml | 13 + .../example-external-projects/suite3/nbplatform/.gitkeep| 1 - .../nbplatform/platform5/core/core/META-INF/manifest.mf | 2 ++ .../random/modules/ext/stuff/META-INF/manifest.mf | 1 + .../nbplatform/random/modules/random/META-INF/manifest.mf | 3 +++ .../project/queries/ClassPathProviderImplTest.java | 2 +- .../project/queries/SubprojectProviderImplTest.java | 10 ++ .../modules/apisupport/project/universe/ModuleListTest.java | 2 +- .../modules/apisupport/project/universe/TestEntryTest.java | 2 +- 9 files changed, 28 insertions(+), 8 deletions(-) delete mode 100644 apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/.gitkeep create mode 100644 apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/platform5/core/core/META-INF/manifest.mf create mode 100644 apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/random/modules/ext/stuff/META-INF/manifest.mf create mode 100644 apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/random/modules/random/META-INF/manifest.mf - 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 apisupport-ant-tests updated (6cc2ff6 -> e3c9c0d)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard 6cc2ff6 Fix apisupport.ant tests new e3c9c0d Fix apisupport.ant tests This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6cc2ff6) \ N -- N -- N refs/heads/apisupport-ant-tests (e3c9c0d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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: .../apisupport/project/ui/customizer/SingleModulePropertiesTest.java | 5 +++-- 1 file changed, 3 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 apisupport-ant-tests created (now 4766679)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. at 4766679 Fix apisupport.ant tests This branch includes the following new commits: new 4766679 Fix apisupport.ant tests 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: Fix apisupport.ant tests
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 4766679eb3a8db936d4116277b8b1f6e36dbba3c Author: Hector Espert AuthorDate: Fri Apr 17 20:36:54 2020 +0200 Fix apisupport.ant tests --- .gitignore | 2 +- .travis.yml| 2 +- .../html4j/nbproject/project.properties| 2 +- .../javafx/nbproject/project.properties| 2 +- .../suite3/nbplatform/.gitkeep | 1 + .../apisupport/project/ApisupportAntUtilsTest.java | 4 +- .../AvoidModuleListInProjectConstructorTest.java | 2 +- .../apisupport/project/DialogDisplayerImpl.java| 70 ++ .../modules/apisupport/project/EvaluatorTest.java | 6 +- .../apisupport/project/ModuleDependencyTest.java | 5 +- .../apisupport/project/NbModuleProjectTest.java| 5 +- .../project/NbModuleProviderImplTest.java | 2 - .../apisupport/project/ProjectXMLManagerTest.java | 4 +- .../modules/apisupport/project/UseFxTest.java | 1 - .../apisupport/project/UseHtml4JavaTest.java | 1 - .../queries/AccessibilityQueryImplTest.java| 14 ++--- .../queries/AntArtifactProviderImplTest.java | 7 ++- .../project/queries/ClassPathProviderImplTest.java | 4 +- .../queries/GlobalJavadocForBinaryImplTest.java| 3 +- .../project/queries/JavadocForBinaryImplTest.java | 2 +- .../project/queries/SourceForBinaryImplTest.java | 22 +++ .../project/queries/SourceLevelQueryImplTest.java | 2 +- .../queries/SubprojectProviderImplTest.java| 4 +- .../queries/UnitTestForSourceQueryImplTest.java| 20 +++ .../project/spi/BrandingSupportTest.java | 3 +- .../project/suite/BuildZipDistributionTest.java| 1 - .../apisupport/project/ui/ModuleActionsTest.java | 4 +- .../ui/wizard/LibraryStartVisualPanelTest.java | 2 +- .../project/universe/ModuleListTest.java | 9 +-- 29 files changed, 136 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore index 35528c1..0245b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -100,4 +100,4 @@ derby.log /groovy/gradle/netbeans-gradle-tooling/.gradle/ /groovy/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.jar /groovy/gradle/release/modules/gradle/daemon-loader/.gradle/ -/nbbuild/misc/prepare-bundles/target/ \ No newline at end of file +/nbbuild/misc/prepare-bundles/target/ diff --git a/.travis.yml b/.travis.yml index 348e149..b115979 100644 --- a/.travis.yml +++ b/.travis.yml @@ -459,7 +459,7 @@ matrix: - ant $OPTS clean - ant $OPTS build script: -#- ant $OPTS -f apisupport/apisupport.ant test +- ant $OPTS -f apisupport/apisupport.ant test - ant $OPTS -f apisupport/apisupport.project test - ant $OPTS -f apisupport/apisupport.refactoring test - ant $OPTS -f apisupport/apisupport.wizards test diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties index 8c80113..5137752 100644 --- a/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties +++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -javac.source=1.6 +javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties index 8c80113..5137752 100644 --- a/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties +++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -javac.source=1.6 +javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/.gitkeep b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/.gitkeep new file mode 100644 index 000..8b13789 --- /dev/null +++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/.gitkeep @@ -0,0 +1 @@ + diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ApisupportAntUtilsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport
[netbeans] 01/01: Fix apisupport.ant tests
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git commit e3c9c0d502f4698f3a43013847509ff1275c67e9 Author: Hector Espert AuthorDate: Fri Apr 17 20:36:54 2020 +0200 Fix apisupport.ant tests --- .gitignore | 2 +- .travis.yml| 2 +- apisupport/apisupport.ant/build.xml| 13 .../html4j/nbproject/project.properties| 2 +- .../javafx/nbproject/project.properties| 2 +- .../platform5/core/core/META-INF/manifest.mf | 2 + .../random/modules/ext/stuff/META-INF/manifest.mf | 1 + .../random/modules/random/META-INF/manifest.mf | 3 + .../apisupport/project/ApisupportAntUtilsTest.java | 4 +- .../AvoidModuleListInProjectConstructorTest.java | 2 +- .../apisupport/project/DialogDisplayerImpl.java| 70 ++ .../modules/apisupport/project/EvaluatorTest.java | 6 +- .../apisupport/project/ModuleDependencyTest.java | 5 +- .../apisupport/project/NbModuleProjectTest.java| 5 +- .../project/NbModuleProviderImplTest.java | 2 - .../apisupport/project/ProjectXMLManagerTest.java | 4 +- .../modules/apisupport/project/UseFxTest.java | 1 - .../apisupport/project/UseHtml4JavaTest.java | 1 - .../queries/AccessibilityQueryImplTest.java| 14 ++--- .../queries/AntArtifactProviderImplTest.java | 7 ++- .../project/queries/ClassPathProviderImplTest.java | 6 +- .../queries/GlobalJavadocForBinaryImplTest.java| 3 +- .../project/queries/JavadocForBinaryImplTest.java | 2 +- .../project/queries/SourceForBinaryImplTest.java | 22 +++ .../project/queries/SourceLevelQueryImplTest.java | 2 +- .../queries/SubprojectProviderImplTest.java| 14 +++-- .../queries/UnitTestForSourceQueryImplTest.java| 20 +++ .../project/spi/BrandingSupportTest.java | 3 +- .../project/suite/BuildZipDistributionTest.java| 1 - .../apisupport/project/ui/ModuleActionsTest.java | 4 +- .../ui/customizer/SingleModulePropertiesTest.java | 5 +- .../ui/wizard/LibraryStartVisualPanelTest.java | 2 +- .../project/universe/ModuleListTest.java | 9 +-- .../apisupport/project/universe/TestEntryTest.java | 2 +- 34 files changed, 165 insertions(+), 78 deletions(-) diff --git a/.gitignore b/.gitignore index 35528c1..0245b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -100,4 +100,4 @@ derby.log /groovy/gradle/netbeans-gradle-tooling/.gradle/ /groovy/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.jar /groovy/gradle/release/modules/gradle/daemon-loader/.gradle/ -/nbbuild/misc/prepare-bundles/target/ \ No newline at end of file +/nbbuild/misc/prepare-bundles/target/ diff --git a/.travis.yml b/.travis.yml index 348e149..b115979 100644 --- a/.travis.yml +++ b/.travis.yml @@ -459,7 +459,7 @@ matrix: - ant $OPTS clean - ant $OPTS build script: -#- ant $OPTS -f apisupport/apisupport.ant test +- ant $OPTS -f apisupport/apisupport.ant test - ant $OPTS -f apisupport/apisupport.project test - ant $OPTS -f apisupport/apisupport.refactoring test - ant $OPTS -f apisupport/apisupport.wizards test diff --git a/apisupport/apisupport.ant/build.xml b/apisupport/apisupport.ant/build.xml index 66938dc..14789a6 100644 --- a/apisupport/apisupport.ant/build.xml +++ b/apisupport/apisupport.ant/build.xml @@ -40,5 +40,18 @@ + + + + + + + + + + + + + diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties index 8c80113..5137752 100644 --- a/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties +++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -javac.source=1.6 +javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties index 8c80113..5137752 100644 --- a/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties +++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under
[netbeans] branch travis_cache created (now 8065691)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch travis_cache in repository https://gitbox.apache.org/repos/asf/netbeans.git. at 8065691 [TRAVIS] Enable cache This branch includes the following new commits: new 8065691 [TRAVIS] Enable cache 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: [TRAVIS] Enable cache
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch travis_cache in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 80656912ee5a626cb206b7a475b4abee3190d2d3 Author: Hector Espert AuthorDate: Fri Apr 17 22:23:15 2020 +0200 [TRAVIS] Enable cache --- .travis.yml | 5 + 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 348e149..071047e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,12 +23,17 @@ addons: - xvfb - openjfx - libgfortran3 + install: - export PATH="$PATH:$TRAVIS_BUILD_DIR/nbbuild/travis" - export DISPLAY=:99.0 - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - sleep 3 +cache: + directories: + - $HOME/.hgexternalcache + matrix: include: - name: Check line endings and verify RAT report - 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 NETBEANS-4029 updated (8d4bfc7 -> 299b19f)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard 8d4bfc7 [NETBEANS-4029] Fix feature dialog add 04192f7 [NETBEANS-3428] Update FlatLaf from 0.28 to 0.29 add efe3cf4 [NETBEANS-4135] Update FlatLaf from 0.29 to 0.30 add 017eae0 Merge pull request #2060 from DevCharly/flatlaf-0.29 add 1718236 [NETBEANS-4118] Moved Gradle Tooling into it's own module and to version 6.3 add 7d7104b [NETBEANS-4030] FlatLaf and Nimbus: fixed selection not painted in libraries category in project dialog add 83ea2d3 Merge pull request #2050 from DevCharly/flatlaf-libraries-selection add 974f4d7 [NETBEANS-4167] Fix null token on { in yaml files add 6738ea3 Revert "[NETBEANS-4039] Added SPI for Preferred Color Profile Changes" add ee7360b Update platform/core.windows/manifest.mf add c1bd16d Merge pull request #2088 from apache/revert-2039-NETBEANS-4039 add a46fa29 [NETBEANS-4127] Adjust maven profiler to provide jvmargs as separate options add e752764 Merge pull request #2068 from errael/master add d7215ef NETBEANS-4154 Payara Platform 5.202 support in Apache NetBeans IDE add 103e252 NETBEANS-4154 simplify payara version list add b2ce313 Merge pull request #2073 from jGauravGupta/NETBEANS-4154 add a39a723 [NETBEANS-4071] Fix plexus class setup for maven embedder add 67505fb Merge pull request #2087 from matthiasblaesing/NETBEANS-4071 add c51b172 [NETBEANS-4143] Dont quote args in common case; fixes terminal startup in cygwin. add 760297d Merge pull request #2071 from errael/FixTermStartup add 299b19f [NETBEANS-4029] Fix feature dialog This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8d4bfc7) \ N -- N -- N refs/heads/NETBEANS-4029 (299b19f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org-netbeans-modules-payara-common.sig | 1 + .../modules/payara/common/Bundle.properties| 24 +- .../modules/payara/common/PayaraInstance.java | 3 +- .../modules/payara/common/ServerDetails.java | 333 +++-- .../wizards/AddDomainLocationVisualPanel.java | 2 +- .../modules/payara/common/wizards/Retriever.java | 105 +++ .../common/wizards/ServerWizardIterator.java | 9 +- .../payara/micro/project/VersionRepository.java| 1 + .../org-netbeans-modules-payara-tooling.sig| 3 +- .../modules/payara/tooling/admin/AdminFactory.java | 1 + .../modules/payara/tooling/data/PayaraVersion.java | 9 +- groovy/gradle.htmlui/nbproject/project.xml | 4 +- groovy/gradle.java.coverage/nbproject/project.xml | 4 +- groovy/gradle.java/nbproject/project.xml | 4 +- groovy/gradle.javaee/nbproject/project.xml | 4 +- groovy/gradle.kit/nbproject/project.xml| 4 +- groovy/gradle.persistence/nbproject/project.xml| 4 +- groovy/gradle.spring/nbproject/project.xml | 4 +- groovy/gradle.test/nbproject/project.xml | 12 +- groovy/gradle/apichanges.xml | 46 ++- groovy/gradle/external/binaries-list | 1 - groovy/gradle/manifest.mf | 4 +- groovy/gradle/nbproject/project.properties | 3 +- groovy/gradle/nbproject/project.xml| 38 +-- .../project.xml => groovy/libs.gradle/build.xml| 19 +- .../libs.gradle}/external/binaries-list| 3 +- .../external/gradle-tooling-api-6.3-license.txt} | 4 +- .../external/gradle-tooling-api-6.3-notice.txt}| 0 groovy/libs.gradle/manifest.mf | 6 + .../libs.gradle}/nbproject/project.properties | 10 +- .../libs.gradle}/nbproject/project.xml | 22 +- .../netbeans/modules/libs/gradle/Bundle.properties | 3 +- .../modules/nativeexecution/NativeProcessInfo.java | 6 + .../netbeans/modules/languages/yaml/YamlLexer.java | 44 +-- .../data/testfiles/issue_NETBEANS-4167.yaml.txt| 3 + .../issue_NETBEANS-4167.yaml.txt.tokens.txt| 7 + .../modules/languages/yaml/YamlLexerTest.java | 5 + ide/options.editor/nbproject/project.xml | 9 - .../modules/options/colors/ColorModel.java | 19
[netbeans] branch travis_cache updated (8065691 -> 0ee6b09)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch travis_cache in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard 8065691 [TRAVIS] Enable cache add 6738ea3 Revert "[NETBEANS-4039] Added SPI for Preferred Color Profile Changes" add ee7360b Update platform/core.windows/manifest.mf add c1bd16d Merge pull request #2088 from apache/revert-2039-NETBEANS-4039 add a46fa29 [NETBEANS-4127] Adjust maven profiler to provide jvmargs as separate options add e752764 Merge pull request #2068 from errael/master add d7215ef NETBEANS-4154 Payara Platform 5.202 support in Apache NetBeans IDE add 103e252 NETBEANS-4154 simplify payara version list add b2ce313 Merge pull request #2073 from jGauravGupta/NETBEANS-4154 add a39a723 [NETBEANS-4071] Fix plexus class setup for maven embedder add 67505fb Merge pull request #2087 from matthiasblaesing/NETBEANS-4071 add c51b172 [NETBEANS-4143] Dont quote args in common case; fixes terminal startup in cygwin. add 760297d Merge pull request #2071 from errael/FixTermStartup add 0ee6b09 [TRAVIS] Enable cache This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8065691) \ N -- N -- N refs/heads/travis_cache (0ee6b09) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org-netbeans-modules-payara-common.sig | 1 + .../modules/payara/common/Bundle.properties| 24 +- .../modules/payara/common/PayaraInstance.java | 3 +- .../modules/payara/common/ServerDetails.java | 333 +++-- .../wizards/AddDomainLocationVisualPanel.java | 2 +- .../modules/payara/common/wizards/Retriever.java | 105 +++ .../common/wizards/ServerWizardIterator.java | 9 +- .../payara/micro/project/VersionRepository.java| 1 + .../org-netbeans-modules-payara-tooling.sig| 3 +- .../modules/payara/tooling/admin/AdminFactory.java | 1 + .../modules/payara/tooling/data/PayaraVersion.java | 9 +- .../modules/nativeexecution/NativeProcessInfo.java | 6 + ide/options.editor/nbproject/project.xml | 9 - .../modules/options/colors/ColorModel.java | 19 +- .../maven/indexer/NexusRepositoryIndexerImpl.java | 23 +- .../maven/newproject/MavenWizardIterator.java | 4 +- platform/core.windows/apichanges.xml | 20 -- platform/core.windows/manifest.mf | 3 +- platform/core.windows/nbproject/project.xml| 7 +- .../netbeans/core/windows/options/LafPanel.java| 70 +++-- .../options/spi/PreferredColorProfileSupport.java | 50 .../modules/maven/profiler/RunCheckerImpl.java | 19 +- .../profiler/nbimpl/actions/ProfilerLauncher.java | 10 +- 23 files changed, 293 insertions(+), 438 deletions(-) delete mode 100644 platform/core.windows/src/org/netbeans/core/windows/options/spi/PreferredColorProfileSupport.java - 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 apisupport-ant-tests updated (e3c9c0d -> 5f990e0)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard e3c9c0d Fix apisupport.ant tests add 6738ea3 Revert "[NETBEANS-4039] Added SPI for Preferred Color Profile Changes" add ee7360b Update platform/core.windows/manifest.mf add c1bd16d Merge pull request #2088 from apache/revert-2039-NETBEANS-4039 add a46fa29 [NETBEANS-4127] Adjust maven profiler to provide jvmargs as separate options add e752764 Merge pull request #2068 from errael/master add d7215ef NETBEANS-4154 Payara Platform 5.202 support in Apache NetBeans IDE add 103e252 NETBEANS-4154 simplify payara version list add b2ce313 Merge pull request #2073 from jGauravGupta/NETBEANS-4154 add a39a723 [NETBEANS-4071] Fix plexus class setup for maven embedder add 67505fb Merge pull request #2087 from matthiasblaesing/NETBEANS-4071 add c51b172 [NETBEANS-4143] Dont quote args in common case; fixes terminal startup in cygwin. add 760297d Merge pull request #2071 from errael/FixTermStartup add 5f990e0 Fix apisupport.ant tests This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e3c9c0d) \ N -- N -- N refs/heads/apisupport-ant-tests (5f990e0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org-netbeans-modules-payara-common.sig | 1 + .../modules/payara/common/Bundle.properties| 24 +- .../modules/payara/common/PayaraInstance.java | 3 +- .../modules/payara/common/ServerDetails.java | 333 +++-- .../wizards/AddDomainLocationVisualPanel.java | 2 +- .../modules/payara/common/wizards/Retriever.java | 105 +++ .../common/wizards/ServerWizardIterator.java | 9 +- .../payara/micro/project/VersionRepository.java| 1 + .../org-netbeans-modules-payara-tooling.sig| 3 +- .../modules/payara/tooling/admin/AdminFactory.java | 1 + .../modules/payara/tooling/data/PayaraVersion.java | 9 +- .../modules/nativeexecution/NativeProcessInfo.java | 6 + ide/options.editor/nbproject/project.xml | 9 - .../modules/options/colors/ColorModel.java | 19 +- .../maven/indexer/NexusRepositoryIndexerImpl.java | 23 +- .../maven/newproject/MavenWizardIterator.java | 4 +- platform/core.windows/apichanges.xml | 20 -- platform/core.windows/manifest.mf | 3 +- platform/core.windows/nbproject/project.xml| 7 +- .../netbeans/core/windows/options/LafPanel.java| 70 +++-- .../options/spi/PreferredColorProfileSupport.java | 50 .../modules/maven/profiler/RunCheckerImpl.java | 19 +- .../profiler/nbimpl/actions/ProfilerLauncher.java | 10 +- 23 files changed, 293 insertions(+), 438 deletions(-) delete mode 100644 platform/core.windows/src/org/netbeans/core/windows/options/spi/PreferredColorProfileSupport.java - 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: [TRAVIS] Retry webcommon javascript2.jquery module
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 a05bfc2 [TRAVIS] Retry webcommon javascript2.jquery module new a6db3da Merge pull request #2045 from hectorespert/retry_webcommon_javascript2_jquery a05bfc2 is described below commit a05bfc229bfb98c3f98b953c70adcd6b59dd8f38 Author: Hector Espert AuthorDate: Tue Mar 24 20:58:51 2020 +0100 [TRAVIS] Retry webcommon javascript2.jquery module --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ee7585..8e2c310 100644 --- a/.travis.yml +++ b/.travis.yml @@ -520,7 +520,7 @@ matrix: - hide-logs.sh ant $OPTS -f webcommon/javascript2.extdoc test - hide-logs.sh ant $OPTS -f webcommon/javascript2.extjs test - hide-logs.sh ant $OPTS -f webcommon/javascript2.jade test -- hide-logs.sh ant $OPTS -f webcommon/javascript2.jquery test +- travis_retry hide-logs.sh ant $OPTS -f webcommon/javascript2.jquery test - hide-logs.sh ant $OPTS -f webcommon/javascript2.jsdoc test - hide-logs.sh ant $OPTS -f webcommon/javascript2.json test - hide-logs.sh ant $OPTS -f webcommon/javascript2.knockout test - 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 NETBEANS-4029 updated (4b432f8 -> 8d4bfc7)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard 4b432f8 Tests discard df60dd9 [NETBEANS-4029] Fix feature dialog add 8d4bfc7 [NETBEANS-4029] Fix feature dialog This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4b432f8) \ N -- N -- N refs/heads/NETBEANS-4029 (8d4bfc7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ergonomics/ide.ergonomics/nbproject/project.properties | 3 ++- 1 file changed, 2 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] branch NETBEANS-4029 updated (df60dd9 -> 4b432f8)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from df60dd9 [NETBEANS-4029] Fix feature dialog add 4b432f8 Tests No new revisions were added by this update. Summary of changes: .../ide/ergonomics/fod/ConfigurationPanel.java | 24 ++-- .../ide/ergonomics/fod/ConfigurationPanelTest.java | 150 + .../ide/ergonomics/fod/TestBundle.properties | 2 + .../ide/ergonomics/fod/TestBundle2.properties | 3 + 4 files changed, 171 insertions(+), 8 deletions(-) create mode 100644 ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanelTest.java - 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-website] 01/01: Upgrade to gradle 6.3
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch upgrade_gradle_version in repository https://gitbox.apache.org/repos/asf/netbeans-website.git commit 68a35492d80b82c0f4b4e9c5751242cd6ef009d7 Author: Hector Espert AuthorDate: Tue Mar 31 21:21:01 2020 +0200 Upgrade to gradle 6.3 --- netbeans.apache.org/build.gradle| 8 netbeans.apache.org/gradle/deps.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.jar | Bin 54783 -> 55741 bytes .../gradle/wrapper/gradle-wrapper.properties| 3 +-- netbeans.apache.org/gradlew | 8 netbeans.apache.org/gradlew.bat | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/netbeans.apache.org/build.gradle b/netbeans.apache.org/build.gradle index 55f5c97..1c45a2a 100644 --- a/netbeans.apache.org/build.gradle +++ b/netbeans.apache.org/build.gradle @@ -206,7 +206,7 @@ task buildSite(dependsOn: ["preprocessContent", "bake"], } -task("run", type: JavaExec, group: "Run", overwrite: true) { +task run(type: JavaExec, group: "Run") { def wDir = new File(buildDir, "tomcat") @@ -216,14 +216,14 @@ task("run", type: JavaExec, group: "Run", overwrite: true) { } main "TomcatMain" -classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/main") +classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main") args = [bakedDir, 8080, "SHUTDOWN", 8088] workingDir = wDir } -task("stop", type: JavaExec, group: "Run", overwrite: true) { +task stop(type: JavaExec, group: "Run") { main "TomcatStopMain" -classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/main") +classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main") args = ["SHUTDOWN", 8082] } diff --git a/netbeans.apache.org/gradle/deps.gradle b/netbeans.apache.org/gradle/deps.gradle index 1e86767..2c1d522 100644 --- a/netbeans.apache.org/gradle/deps.gradle +++ b/netbeans.apache.org/gradle/deps.gradle @@ -22,7 +22,7 @@ buildscript { tomcat "org.apache.tomcat.embed:tomcat-embed-logging-juli:${libs.tomcatJuli}" } libs = [ -groovy: "2.4.11", +groovy: "2.5.10", jbake: "2.5.1", snakeYaml: "1.18", gradle: "3.5.1", diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar index 19c760f..457aad0 100644 Binary files a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar and b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar differ diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties index d212895..a4b4429 100644 --- a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties +++ b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun Jun 04 17:14:53 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip diff --git a/netbeans.apache.org/gradlew b/netbeans.apache.org/gradlew index 4453cce..af6708f 100755 --- a/netbeans.apache.org/gradlew +++ b/netbeans.apache.org/gradlew @@ -28,16 +28,16 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'''/g;1s/^/'/;\$s/\$/' /" ; done echo " " } diff --git a/netbeans.apache.org/gradlew.bat b/netbeans.apache.org/gradlew.bat index e95643d..0f8d593 100644 --- a/netbeans.apache.org/gradlew.bat +++ b/netbeans.apache.org/gradlew.bat @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and
[netbeans-website] branch upgrade_gradle_version created (now 68a3549)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch upgrade_gradle_version in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. at 68a3549 Upgrade to gradle 6.3 This branch includes the following new commits: new 68a3549 Upgrade to gradle 6.3 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-website] branch upgrade_gradle_version updated (68a3549 -> a3e8ac6)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch upgrade_gradle_version in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. from 68a3549 Upgrade to gradle 6.3 add a3e8ac6 Remove wrapper config No new revisions were added by this update. Summary of changes: netbeans.apache.org/build.gradle | 4 1 file changed, 4 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: [TRAVIS] Add java modules
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 6b5649e [TRAVIS] Add java modules new 0401f36 Merge pull request #2032 from hectorespert/travis_java_modules 6b5649e is described below commit 6b5649e5d5fdf994b73ae739ad5844a6372f1641 Author: Hector Espert AuthorDate: Wed Mar 18 19:57:02 2020 +0100 [TRAVIS] Add java modules --- .travis.yml | 59 +-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f49eb5..2ee7585 100644 --- a/.travis.yml +++ b/.travis.yml @@ -339,7 +339,7 @@ matrix: - ant $OPTS build script: #- ant $OPTS -f java/ant.debugger test -- ant $OPTS -f java/ant.freeform test +- hide-logs.sh ant $OPTS -f java/ant.freeform test #- ant $OPTS -f java/ant.grammar test - ant $OPTS -f java/api.debugger.jpda test - ant $OPTS -f java/api.java test @@ -347,12 +347,67 @@ matrix: #- ant $OPTS -f java/beans test - ant $OPTS -f java/classfile test - ant $OPTS -f java/dbschema test -Dtest.config=stable +#- ant $OPTS -f java/debugger.jpda test +- hide-logs.sh ant $OPTS -f java/debugger.jpda.js test +- hide-logs.sh ant $OPTS -f java/debugger.jpda.projects test +- hide-logs.sh ant $OPTS -f java/debugger.jpda.projectsui test +#- ant $OPTS -f java/debugger.jpda.truffle test +#- ant $OPTS -f java/debugger.jpda.ui test +- travis_wait hide-logs.sh ant $OPTS -f java/editor.htmlui test +#- travis_wait 30 hide-logs.sh ant $OPTS -f java/form test - ant $OPTS -f java/hudson.maven test - ant $OPTS -f java/java.completion test -- ant $OPTS -f java/java.hints.declarative test +- hide-logs.sh ant $OPTS -f java/java.hints.declarative test +#- ant $OPTS -f java/java.kit test +#- ant $OPTS -f java/java.lexer test +#- ant $OPTS -f java/java.lexer test +#- ant $OPTS -f java/java.lsp.server test +#- ant $OPTS -f java/java.metrics test +- ant $OPTS -f java/java.module.graph test +- ant $OPTS -f java/java.navigation test +#- ant $OPTS -f java/java.openjdk.project test +- ant $OPTS -f java/java.platform test +- ant $OPTS -f java/java.platform.ui test +- ant $OPTS -f java/java.preprocessorbridge test +- hide-logs.sh ant $OPTS -f java/java.project test +#- ant $OPTS -f java/java.project.ui test +#- ant $OPTS -f java/java.source test +#- ant $OPTS -f java/java.source.ant test - ant $OPTS -f java/java.source.base test +- ant $OPTS -f java/java.source.compat8 test +- ant $OPTS -f java/java.source.nbjavac test +- ant $OPTS -f java/java.source.queriesimpl test +#- ant $OPTS -f java/java.sourceui test +- ant $OPTS -f java/java.testrunner test +- ant $OPTS -f java/java.testrunner.ant test +#- ant $OPTS -f java/javadoc test +- ant $OPTS -f java/javawebstart test +#- ant $OPTS -f java/jellytools.java test +#- ant $OPTS -f java/jshell.support test +#- ant $OPTS -f java/junit test +- ant $OPTS -f java/junit.ant.ui test +- ant $OPTS -f java/lib.nbjavac test +#- ant $OPTS -f java/maven test +#- ant $OPTS -f java/maven.embedder test +- ant $OPTS -f java/maven.grammar test +#- ant $OPTS -f java/maven.hints test +#- ant $OPTS -f java/maven.htmlui test +- ant $OPTS -f java/maven.indexer test +- ant $OPTS -f java/maven.junit test +- ant $OPTS -f java/maven.model test +- ant $OPTS -f java/maven.osgi test +#- ant $OPTS -f java/performance test +#- ant $OPTS -f java/performance.java test +#- ant $OPTS -f java/projectimport.eclipse.core test +#- ant $OPTS -f java/refactoring.java test +- ant $OPTS -f java/spellchecker.bindings.java test #- ant $OPTS -f java/spi.java.hints test - ant $OPTS -f java/spring.beans test +- ant $OPTS -f java/testng test +#- ant $OPTS -f java/testng.ant test +#- ant $OPTS -f java/testng.ui test +- ant $OPTS -f java/whitelist test +- ant $OPTS -f java/xml.jaxb test - name: Test Java modules with nb-javac on Java 11 jdk: openjdk8 - To unsubscribe, e-mail
[netbeans-website] branch master updated: Upgrade to Gradle 6.3 (#466)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new 0bca999 Upgrade to Gradle 6.3 (#466) 0bca999 is described below commit 0bca9998d7584213491a87cc1a16c19822eb3142 Author: Hector Espert AuthorDate: Thu Apr 2 08:25:40 2020 +0200 Upgrade to Gradle 6.3 (#466) * Upgrade to gradle 6.3 * Remove wrapper config --- netbeans.apache.org/build.gradle| 12 netbeans.apache.org/gradle/deps.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.jar | Bin 54783 -> 55741 bytes .../gradle/wrapper/gradle-wrapper.properties| 3 +-- netbeans.apache.org/gradlew | 8 netbeans.apache.org/gradlew.bat | 2 +- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/netbeans.apache.org/build.gradle b/netbeans.apache.org/build.gradle index 55f5c97..7ddd139 100644 --- a/netbeans.apache.org/build.gradle +++ b/netbeans.apache.org/build.gradle @@ -206,7 +206,7 @@ task buildSite(dependsOn: ["preprocessContent", "bake"], } -task("run", type: JavaExec, group: "Run", overwrite: true) { +task run(type: JavaExec, group: "Run") { def wDir = new File(buildDir, "tomcat") @@ -216,17 +216,13 @@ task("run", type: JavaExec, group: "Run", overwrite: true) { } main "TomcatMain" -classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/main") +classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main") args = [bakedDir, 8080, "SHUTDOWN", 8088] workingDir = wDir } -task("stop", type: JavaExec, group: "Run", overwrite: true) { +task stop(type: JavaExec, group: "Run") { main "TomcatStopMain" -classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/main") +classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main") args = ["SHUTDOWN", 8082] } - -wrapper { -gradleVersion = libs.gradle -} diff --git a/netbeans.apache.org/gradle/deps.gradle b/netbeans.apache.org/gradle/deps.gradle index 1e86767..2c1d522 100644 --- a/netbeans.apache.org/gradle/deps.gradle +++ b/netbeans.apache.org/gradle/deps.gradle @@ -22,7 +22,7 @@ buildscript { tomcat "org.apache.tomcat.embed:tomcat-embed-logging-juli:${libs.tomcatJuli}" } libs = [ -groovy: "2.4.11", +groovy: "2.5.10", jbake: "2.5.1", snakeYaml: "1.18", gradle: "3.5.1", diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar index 19c760f..457aad0 100644 Binary files a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar and b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar differ diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties index d212895..a4b4429 100644 --- a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties +++ b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun Jun 04 17:14:53 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip diff --git a/netbeans.apache.org/gradlew b/netbeans.apache.org/gradlew index 4453cce..af6708f 100755 --- a/netbeans.apache.org/gradlew +++ b/netbeans.apache.org/gradlew @@ -28,16 +28,16 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'''/g;1s/^/'/;\$s/\$/' /" ; done echo " " } diff --git a/netbeans.apache.org/gradlew.bat b/netbeans.apache.org/g
[netbeans] branch NETBEANS-4029 updated (299b19f -> fd9a785)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard 299b19f [NETBEANS-4029] Fix feature dialog add 66a6ca3 Using activateModules for download as well as activate buttons. Making the activateModules more stateless add 5c4ce62 Merge pull request #2062 from jtulach/FoDUseModuleActivation add 64d07bc [NETBEANS-4083] Add missing validation in new maven project dialog add 4d61753 Merge pull request #2053 from errael/ValidationsForMavenProjectCreation add 5aea1fb [NETBEANS-4177] Add another check for valid parameter list position to avoid exception if sourcecode is incorrect add 976501a Merge pull request #2082 from graben/NETBEANS-4177 add 605b4f3 [NETBEANS-4084] Fix Gradle Projects Wizard to remember the last used Project Directory add 9393d69 Merge pull request #2096 from lkishalmi/NETBEANS-4084 add 00465e5 [NETBEANS-4173] Update FlatLaf from 0.30 to 0.31 add 601151b Merge pull request #2094 from DevCharly/flatlaf-0.31 add d30ce07 [NETBEANS-4206] Only set project location once directly from PROJECT_PARENT_FOLDER add b440455 Merge pull request #2097 from errael/MavenCreateNewModule add 834bd75 Preventing AssertionError from javac due to use of incorrect scope on JDK12+ add 12200ba Merge branch 'master' into avoid-assert-in-scope add 439d079 Merge pull request #2083 from jlahoda/avoid-assert-in-scope add d2e893c [NETBEANS-346] Tabs, characters, and the right Margin don't line up add 1a8548d Merge pull request #2076 from eirikbakke/NETBEANS-346 add 439859c [TRAVIS] Enable cache add 2eb871f Merge pull request #2085 from apache/travis_cache add 41f57c5 [Travis] Retry java module add b7cde74 Merge pull request #2101 from apache/hectorespert-patch-1 add 05e9abe If cancel happens while Analyzer is running, AssertionError is thrown. Rather ignore all exception happening while the parser is cancelled. add f445170 Merge pull request #2095 from jlahoda/ignore-cancel-in-analyzer add fce86d5 Adding end-of-line switcher. add 81339c2 Merge pull request #2049 from jlahoda/eol-switcher add 5523e9c Trying to lock npm package versions. add 047990a More fixing of dependency versions. add 1294d90 Adding back package-lock.json add 524295e Merge pull request #2105 from jlahoda/lock-npm-module-versions add 1286226 [TRAVIS] RUn tests for enterprise modules add b602c6b Merge pull request #2098 from apache/enterprise_tests add 4243806 NETBEANS-4209: Update Truffle debugging for GraalVM 20.1.0, fixed a number of issues including NETBEANS-4208 and small corrections. add 5222352 Merge pull request #2100 from entlicher/TruffleDebugUpdate2020-04 add fd9a785 [NETBEANS-4029] Fix feature dialog This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (299b19f) \ N -- N -- N refs/heads/NETBEANS-4029 (fd9a785) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .travis.yml| 9 +- .../websvc.websvcapi/nbproject/project.properties | 2 +- .../websvc.wsstackapi/nbproject/project.properties | 2 +- ergonomics/ide.ergonomics/java.properties | 2 +- .../ide/ergonomics/fod/ConfigurationPanel.java | 97 +-- .../ide/ergonomics/fod/ModulesInstaller.java | 51 +- .../newproject/ProjectAttributesPanelVisual.java | 4 +- .../modules/editor/lib2/view/FontInfo.java | 14 +- .../modules/editor/impl/crlf/CRLFStatus.java | 226 +++ .../debugger/jpda/truffle/DebugManagerHandler.java | 55 +- .../debugger/jpda/truffle/LanguageName.java| 73 ++ .../jpda/truffle/access/TruffleAccess.java | 48 +- .../jpda/truffle/access/TruffleStrataProvider.java | 4 +- .../debugger/jpda/truffle/ast/TruffleNode.java | 34 +- .../jpda/truffle/ast/model/ASTNodeModel.java | 10 +- .../truffle/ast/model/ASTTreeExpansionModel.java | 2 +- .../breakpoints/TruffleBreakpointsHandler.java | 11 +- .../jpda/truffle/frames/TruffleStackFrame.java | 18 +- .../models/DebuggingTruffleActionsProvider.java| 2 +- .../frames/models/DebuggingTruffleTreeModel.java | 2 +- ...
[netbeans] branch hectorespert-patch-1 created (now 41f57c5)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. at 41f57c5 [Travis] Retry java module This branch includes the following new commits: new 41f57c5 [Travis] Retry java module 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: [Travis] Retry java module
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 41f57c51ebe7e88e4e2d8069439a41585248283d Author: Hector Espert AuthorDate: Thu Apr 23 18:34:40 2020 +0200 [Travis] Retry java module --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 348e149..1fa0e30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -449,7 +449,7 @@ matrix: - ant $OPTS build script: - ant $OPTS -f java/java.completion test -- ant $OPTS -f java/refactoring.java test-unit +- travis_retry ant $OPTS -f java/refactoring.java test-unit - name: Test apisupport modules jdk: openjdk8 - 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 NETBEANS-4029 updated (fd9a785 -> 607523d)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from fd9a785 [NETBEANS-4029] Fix feature dialog add 607523d Check string is not null No new revisions were added by this update. Summary of changes: .../org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java | 4 +++- 1 file changed, 3 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] branch NETBEANS-4029 updated (607523d -> dba9e54)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 607523d Check string is not null add dba9e54 Remove unused import No new revisions were added by this update. Summary of changes: .../src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java | 1 - 1 file changed, 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] branch apisupport-ant-tests updated (ed51d62 -> 015f86a)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard ed51d62 Disable test classes discard 6913bca Fix apisupport.ant tests add 5aea1fb [NETBEANS-4177] Add another check for valid parameter list position to avoid exception if sourcecode is incorrect add 976501a Merge pull request #2082 from graben/NETBEANS-4177 add 605b4f3 [NETBEANS-4084] Fix Gradle Projects Wizard to remember the last used Project Directory add 9393d69 Merge pull request #2096 from lkishalmi/NETBEANS-4084 add 00465e5 [NETBEANS-4173] Update FlatLaf from 0.30 to 0.31 add 601151b Merge pull request #2094 from DevCharly/flatlaf-0.31 add d30ce07 [NETBEANS-4206] Only set project location once directly from PROJECT_PARENT_FOLDER add b440455 Merge pull request #2097 from errael/MavenCreateNewModule add 834bd75 Preventing AssertionError from javac due to use of incorrect scope on JDK12+ add 12200ba Merge branch 'master' into avoid-assert-in-scope add 439d079 Merge pull request #2083 from jlahoda/avoid-assert-in-scope add d2e893c [NETBEANS-346] Tabs, characters, and the right Margin don't line up add 1a8548d Merge pull request #2076 from eirikbakke/NETBEANS-346 add 439859c [TRAVIS] Enable cache add 2eb871f Merge pull request #2085 from apache/travis_cache add 41f57c5 [Travis] Retry java module add b7cde74 Merge pull request #2101 from apache/hectorespert-patch-1 add 05e9abe If cancel happens while Analyzer is running, AssertionError is thrown. Rather ignore all exception happening while the parser is cancelled. add f445170 Merge pull request #2095 from jlahoda/ignore-cancel-in-analyzer add fce86d5 Adding end-of-line switcher. add 81339c2 Merge pull request #2049 from jlahoda/eol-switcher add 5523e9c Trying to lock npm package versions. add 047990a More fixing of dependency versions. add 1294d90 Adding back package-lock.json add 524295e Merge pull request #2105 from jlahoda/lock-npm-module-versions add 1286226 [TRAVIS] RUn tests for enterprise modules add b602c6b Merge pull request #2098 from apache/enterprise_tests add 4243806 NETBEANS-4209: Update Truffle debugging for GraalVM 20.1.0, fixed a number of issues including NETBEANS-4208 and small corrections. add 5222352 Merge pull request #2100 from entlicher/TruffleDebugUpdate2020-04 add 794f30a [NETBEANS-3580] : Fixed lambda debug breakpoint issue by processing all location event coming from vm (#2055) add 12ec73d [NETBEANS-3311] Convert TextBlock to String Function call parameter fix (#2089) add abcc339 [NETBEANS-4037] Attempting to avoid querying the SourceForBinaryQuery for the same root more than once. add 98c980c Merge pull request #2092 from jlahoda/NETBEANS-4037 add 32ac21a Update used groovy libraries to 2.5.11. Fixes NETBEANS-4172 add 0dc75ef Merge pull request #2077 from svenreimers/issue/NETBEANS-4172 add d773a36 [NETBEANS-3985] : Removed pack200 from netbeans installer, because its not supported by jdk from version 14 onwards add cc205d5 [NETBEANS-3985] : Added comments and commented pack200 related code add 9e0096f [NETBEANS-3985] : Addressed code review comments add e1769d2 Merge pull request #2107 from singh-akhilesh/pack200-remove-from-nb-installer add 1138ef0 [NETBEANS-3707] Fixed colors used for PHP add eff032a Merge pull request #2081 from KacerCZ/netbeans-3707 add e4b0ac0 [NETBEANS-4239] Fixed NPE in GradleCompilerOptionsQuery add 5d07434 Fix ant property to exclude tests add 19d005b Define test.javac.excludes property add c0ec859 Merge pull request #2104 from hectorespert/fix_ant_exclude_tests add 0f24931 [NETBEANS-4176] Unescape javadoc title after parsing add 7ae2b79 Merge pull request #2080 from Rahul-khandelwal/NETBEANS-4176 add bf47a2f [NETBEANS-4159] Switch to ElementKindVisitor8 as base class (min runtime JDK) and add noop logger for unknown elements add e24181e Merge pull request #2074 from graben/NETBEANS-4159 add 0c3d198 Upgrading FreeMarker to Apache FreeMarker add f660aa9 Merge pull request #2067 from lkishalmi/freemarker-upgrade add ed9016b [NETBEANS-4070] fixed JavaDoc in tooltip (ctrl+mouse hover) duplicates the description of parameters of a method when the method overrides the parent method add aca67e6 Merge pull request #2047 from dmochalov/fix-java-doc-inherited add bdae36f [NETBEANS-3787] FlatLaf: fixed active tab painting if project tab colors enabled add 4d31fa0 Merge pull request #2048 from DevCharly/flatlaf-project-color-tab-fix add 1746864 Fix apisupport.ant tests add 015f86a Disable test classes This update added new revisions after undoing
[netbeans] branch apisupport-ant-tests updated (015f86a -> 1e30458)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard 015f86a Disable test classes discard 1746864 Fix apisupport.ant tests add 1e30458 Fix apisupport.ant tests This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (015f86a) \ N -- N -- N refs/heads/apisupport-ant-tests (1e30458) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .travis.yml | 2 +- .../netbeans/modules/apisupport/project/ui/ModuleLogicalViewTest.java | 1 - .../org/netbeans/modules/apisupport/project/ui/SuiteOperationsTest.java | 1 - 3 files changed, 1 insertion(+), 3 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 apisupport-ant-tests updated (1e30458 -> d0d6ad8)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard 1e30458 Fix apisupport.ant tests add 699727a [TRAVIS] Add missing license to correct failing verification add d0d6ad8 Fix apisupport.ant tests This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1e30458) \ N -- N -- N refs/heads/apisupport-ant-tests (d0d6ad8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ide/libs.freemarker/nbproject/project.properties | 2 +- ide/libs.freemarker/nbproject/project.xml | 4 +- .../libs/freemarker/FreemarkerFactory.java | 4 +- .../org/netbeans/api/templates/ProcessorTest.java | 6 +-- .../licenses/Apache-2.0-freemarker | 5 --- nbbuild/licenses/freemarker| 46 -- 6 files changed, 8 insertions(+), 59 deletions(-) copy ide/libs.freemarker/external/freemarker-2.3.30-license.txt => nbbuild/licenses/Apache-2.0-freemarker (98%) delete mode 100644 nbbuild/licenses/freemarker - 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: Commit author validation
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch commit_validation in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 1c9ebd40435083e79375ed580c4425b5f2b50a9d Author: Hector Espert AuthorDate: Sat May 2 17:05:38 2020 +0200 Commit author validation Proposal of commit author validation using a GitHub action --- .github/workflows/commits.yml | 19 +++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/commits.yml b/.github/workflows/commits.yml new file mode 100644 index 000..890afda --- /dev/null +++ b/.github/workflows/commits.yml @@ -0,0 +1,19 @@ +name: Check commits +on: + push: + pull_request: + +jobs: + check: +name: Verify commits +runs-on: ubuntu-latest +steps: +- name: Check author name and email + uses: hectorespert/check-commit-author-action@1.0.0 + with: +# The GITHUB_TOKEN secret +repo-token: ${{ secrets.GITHUB_TOKEN }} +# Fails on commits using Github private email address, like netbe...@users.noreply.github.com +allow_private_email: false +# Author name should be match this regex +allow_name_regex: '^[A-Z]' # TODO: Improve regex - 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 commit_validation created (now 1c9ebd4)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch commit_validation in repository https://gitbox.apache.org/repos/asf/netbeans.git. at 1c9ebd4 Commit author validation This branch includes the following new commits: new 1c9ebd4 Commit author validation 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] branch commit_validation updated (1c9ebd4 -> 0378694)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch commit_validation in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 1c9ebd4 Commit author validation add 0378694 Update action version No new revisions were added by this update. Summary of changes: .github/workflows/commits.yml | 2 +- 1 file changed, 1 insertion(+), 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] branch commit_validation updated (0378694 -> d86af49)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch commit_validation in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 0378694 Update action version add d86af49 Update action version No new revisions were added by this update. Summary of changes: .github/workflows/commits.yml | 2 +- 1 file changed, 1 insertion(+), 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] branch apisupport-ant-tests updated (6913bca -> ed51d62)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 6913bca Fix apisupport.ant tests add ed51d62 Disable test classes No new revisions were added by this update. Summary of changes: .../netbeans/modules/apisupport/project/ui/ModuleLogicalViewTest.java | 3 ++- .../netbeans/modules/apisupport/project/ui/SuiteOperationsTest.java| 1 + 2 files changed, 3 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] branch enterprise_tests created (now 1286226)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch enterprise_tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. at 1286226 [TRAVIS] RUn tests for enterprise modules This branch includes the following new commits: new 1286226 [TRAVIS] RUn tests for enterprise modules 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: [TRAVIS] RUn tests for enterprise modules
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch enterprise_tests in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 1286226e674594d19874e676194965b120f17e30 Author: Hector Espert AuthorDate: Wed Apr 22 20:33:23 2020 +0200 [TRAVIS] RUn tests for enterprise modules --- .travis.yml | 2 ++ enterprise/websvc.websvcapi/nbproject/project.properties | 2 +- enterprise/websvc.wsstackapi/nbproject/project.properties | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 348e149..995bcc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -593,6 +593,8 @@ matrix: - ant $OPTS build script: - ant $OPTS -f enterprise/spring.webmvc test +- ant $OPTS -f enterprise/websvc.websvcapi test +- ant $OPTS -f enterprise/websvc.wsstackapi test - name: Test groovy modules on Java 8 jdk: openjdk8 diff --git a/enterprise/websvc.websvcapi/nbproject/project.properties b/enterprise/websvc.websvcapi/nbproject/project.properties index 62a0c39..ddd8d03 100644 --- a/enterprise/websvc.websvcapi/nbproject/project.properties +++ b/enterprise/websvc.websvcapi/nbproject/project.properties @@ -16,7 +16,7 @@ # under the License. javac.compilerargs=-Xlint:unchecked -javac.source=1.6 +javac.source=1.8 javadoc.overview=${basedir}/overview.html javadoc.arch=${basedir}/arch.xml diff --git a/enterprise/websvc.wsstackapi/nbproject/project.properties b/enterprise/websvc.wsstackapi/nbproject/project.properties index 9d16890..cc4f166 100644 --- a/enterprise/websvc.wsstackapi/nbproject/project.properties +++ b/enterprise/websvc.wsstackapi/nbproject/project.properties @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -javac.source=1.6 +javac.source=1.8 javac.compilerargs=-Xlint:unchecked javadoc.arch=${basedir}/arch.xml - 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 commit_validation updated (d86af49 -> 0129db8)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch commit_validation in repository https://gitbox.apache.org/repos/asf/netbeans.git. from d86af49 Update action version add 0129db8 Create .authors.yml No new revisions were added by this update. Summary of changes: .../javafx/nbproject/project.properties => .authors.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) copy apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties => .authors.yml (90%) - 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 commit_validation updated (d198222 -> 1a3bd4a)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch commit_validation in repository https://gitbox.apache.org/repos/asf/netbeans.git. from d198222 Update .authors.yml add 1a3bd4a Update commits.yml No new revisions were added by this update. Summary of changes: .github/workflows/commits.yml | 20 +++- 1 file changed, 11 insertions(+), 9 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 commit_validation updated (e8eb8e8 -> d198222)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch commit_validation in repository https://gitbox.apache.org/repos/asf/netbeans.git. from e8eb8e8 Update commits.yml add d198222 Update .authors.yml No new revisions were added by this update. Summary of changes: .authors.yml | 2 +- 1 file changed, 1 insertion(+), 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] branch commit_validation updated (0129db8 -> e8eb8e8)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch commit_validation in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 0129db8 Create .authors.yml add e8eb8e8 Update commits.yml No new revisions were added by this update. Summary of changes: .github/workflows/commits.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 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: Fix Spring Web MVC 3.2.x wrong version
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 c3e597c Fix Spring Web MVC 3.2.x wrong version new e497c1d Merge pull request #2348 from pepness/spring-mvc-3 c3e597c is described below commit c3e597c0e2acf62d4cb7e578b478b2a128ba6e7b Author: Jose Contreras AuthorDate: Sun Sep 6 17:36:12 2020 -0500 Fix Spring Web MVC 3.2.x wrong version --- .../org/netbeans/modules/spring/webmvc/resources/Bundle.properties| 2 +- .../netbeans/modules/spring/webmvc/resources/spring-webmvc-3.0.xml| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties index deefe5e..43a638f 100644 --- a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties +++ b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties @@ -25,4 +25,4 @@ Templates/SpringFramework/SimpleFormController.java=Simple Form Controller Templates/SpringFramework/index.jsp=View page spring-webmvc5=Spring Web MVC 5.2.2 spring-webmvc4=Spring Web MVC 4.3.25 -spring-webmvc3=Spring Web MVC 3.2.7 +spring-webmvc3=Spring Web MVC 3.2.18 diff --git a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-3.0.xml b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-3.0.xml index f18b233..4f13198 100644 --- a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-3.0.xml +++ b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-3.0.xml @@ -25,7 +25,7 @@ org.netbeans.modules.spring.webmvc.resources.Bundle classpath - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-webmvc-3.2.7.RELEASE.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-webmvc-3.2.18.RELEASE.jar!/ src @@ -37,7 +37,7 @@ maven-dependencies -org.springframework:spring-webmvc:3.2.7.RELEASE:jar +org.springframework:spring-webmvc:3.2.18.RELEASE: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
[netbeans] branch master updated: Check Javadoc build
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 c69484f Check Javadoc build new 6d4d683 Merge pull request #2415 from hectorespert/ci_build_doc c69484f is described below commit c69484fe6e1eaef7ac05d09b9441096ddde66644 Author: Hector Espert AuthorDate: Fri Oct 2 18:02:37 2020 +0200 Check Javadoc build --- .github/workflows/main.yml | 28 1 file changed, 28 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 55319db..16dfb78 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,6 +104,34 @@ jobs: - name: Test Netbeans Build System run: ant -Dcluster.config=basic localtest + + linux-javadoc: +name: Check Javadoc build +runs-on: ubuntu-18.04 +env: + ANT_OPTS: -Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json +steps: + - name: Checkout +uses: actions/checkout@v2 + + - name: Caching dependencies +uses: actions/cache@v2 +with: + path: ~/.hgexternalcache + key: ${{ runner.os }}-${{ hashFiles('**/external/binaries-list') }} + restore-keys: ${{ runner.os }}- + + - name: Get maven coordinates +run: ant getallmavencoordinates + + - name: Build nbms +run: ant build-nbms + + - name: Build source zips +run: ant build-source-zips + + - name: Build javadoc +run: ant build-javadoc linux-php: name: Linux build of PHP cluster - 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-website] branch hectorespert-patch-1 created (now 5d72d9f)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. at 5d72d9f Create blank.yml This branch includes the following new commits: new 5d72d9f Create blank.yml 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-website] 01/01: Create blank.yml
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans-website.git commit 5d72d9fa9a47f1f4553d22a1935af84d719a92f9 Author: Hector Espert AuthorDate: Fri Oct 9 14:13:52 2020 +0200 Create blank.yml --- .github/workflows/blank.yml | 33 + 1 file changed, 33 insertions(+) diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml new file mode 100644 index 000..9ddbd2e --- /dev/null +++ b/.github/workflows/blank.yml @@ -0,0 +1,33 @@ +# This is a basic workflow to help you get started with Actions + +name: CI + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the master branch +on: + push: +branches: [ master ] + pull_request: +branches: [ master ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: +# The type of runner that the job will run on +runs-on: ubuntu-latest + +# Steps represent a sequence of tasks that will be executed as part of the job +steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + # Runs a single command using the runners shell + - name: Run a one-line script +run: echo Hello, world! + + # Runs a set of commands using the runners shell + - name: Run a multi-line script +run: | + echo Add other actions to build, + echo test, and deploy your project. - 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: Hacktoberfest opt-in
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch hectorespert-patch-2 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit df1173f3ded161e13cce3783a2a27d10bc7fc279 Author: Hector Espert AuthorDate: Sun Oct 4 11:01:40 2020 +0200 Hacktoberfest opt-in The rules for participating in the hacktoberfest have changed this year --- .asf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.asf.yaml b/.asf.yaml index 8573b40..cc9c65c 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -19,6 +19,7 @@ github: homepage: https://netbeans.apache.org/ labels: - netbeans +- hacktoberfest # Hacktoberfest topic features: wiki: false issues: false - 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 hectorespert-patch-2 created (now df1173f)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-2 in repository https://gitbox.apache.org/repos/asf/netbeans.git. at df1173f Hacktoberfest opt-in This branch includes the following new commits: new df1173f Hacktoberfest opt-in 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] branch hectorespert-patch-1 updated (a0febf0 -> 44072c3)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from a0febf0 Create Jenkinsfile.groovy add 44072c3 Update Jenkinsfile.groovy No new revisions were added by this update. Summary of changes: nbbuild/jenkins/linux/Jenkinsfile.groovy | 14 -- 1 file changed, 12 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 hectorespert-patch-1 updated (08c8bcf -> d7f254f)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 08c8bcf Publish rat reports add d7f254f Fix artifacts No new revisions were added by this update. Summary of changes: nbbuild/jenkins/linux/Jenkinsfile.groovy | 2 +- 1 file changed, 1 insertion(+), 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: Create Jenkinsfile.groovy
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit a0febf043582b66acb09919ed0c2c39e7f02cdb5 Author: Hector Espert AuthorDate: Sat Oct 10 20:16:21 2020 +0200 Create Jenkinsfile.groovy --- nbbuild/jenkins/linux/Jenkinsfile.groovy | 33 1 file changed, 33 insertions(+) diff --git a/nbbuild/jenkins/linux/Jenkinsfile.groovy b/nbbuild/jenkins/linux/Jenkinsfile.groovy new file mode 100644 index 000..095695a --- /dev/null +++ b/nbbuild/jenkins/linux/Jenkinsfile.groovy @@ -0,0 +1,33 @@ +/* + * 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. + */ + +pipeline { +agent { +node { +label 'ubuntu' +} +} +stages { +stage("Print env") { +steps { +sh 'printenv' +} +} +} +} - 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 hectorespert-patch-1 created (now a0febf0)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. at a0febf0 Create Jenkinsfile.groovy This branch includes the following new commits: new a0febf0 Create Jenkinsfile.groovy 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] branch hectorespert-patch-1 updated (05abfc7 -> cb42c22)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 05abfc7 Update Jenkinsfile.groovy add cb42c22 Test rat report No new revisions were added by this update. Summary of changes: nbbuild/jenkins/linux/Jenkinsfile.groovy | 15 +-- 1 file changed, 13 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 hectorespert-patch-1 updated (990b809 -> ecca5b8)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 990b809 Update Jenkinsfile.groovy add ecca5b8 Update Jenkinsfile.groovy No new revisions were added by this update. Summary of changes: nbbuild/jenkins/linux/Jenkinsfile.groovy | 9 +++-- 1 file changed, 3 insertions(+), 6 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 hectorespert-patch-1 updated (ecca5b8 -> 08c8bcf)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from ecca5b8 Update Jenkinsfile.groovy add 08c8bcf Publish rat reports No new revisions were added by this update. Summary of changes: nbbuild/jenkins/linux/Jenkinsfile.groovy | 8 +++- 1 file changed, 7 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] branch hectorespert-patch-1 updated (d7f254f -> dbc140d)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from d7f254f Fix artifacts add dbc140d Verify libs and licenses No new revisions were added by this update. Summary of changes: nbbuild/jenkins/linux/Jenkinsfile.groovy | 10 -- 1 file changed, 8 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 hectorespert-patch-1 updated (44072c3 -> 05abfc7)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 44072c3 Update Jenkinsfile.groovy add 05abfc7 Update Jenkinsfile.groovy No new revisions were added by this update. Summary of changes: nbbuild/jenkins/linux/Jenkinsfile.groovy | 9 +++-- 1 file changed, 7 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 hectorespert-patch-1 updated (46e4361 -> 17df456)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 46e4361 Clean jobs from Travis add 17df456 Run build No new revisions were added by this update. Summary of changes: nbbuild/jenkins/linux/Jenkinsfile.groovy | 5 ++--- 1 file changed, 2 insertions(+), 3 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 hectorespert-patch-1 updated (cb42c22 -> 990b809)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from cb42c22 Test rat report add 990b809 Update Jenkinsfile.groovy No new revisions were added by this update. Summary of changes: nbbuild/jenkins/linux/Jenkinsfile.groovy | 2 +- 1 file changed, 1 insertion(+), 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] branch hectorespert-patch-1 updated (dbc140d -> 46e4361)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from dbc140d Verify libs and licenses add 46e4361 Clean jobs from Travis No new revisions were added by this update. Summary of changes: .travis.yml | 11 +-- 1 file changed, 1 insertion(+), 10 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-website] branch master updated: Fix build task
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new 2742a10 Fix build task new 7c0a2d7 Merge pull request #492 from hectorespert/fix_build 2742a10 is described below commit 2742a10c10bf6c23682e830971cdb6d68fd9a6df Author: Hector Espert AuthorDate: Fri Oct 9 15:16:44 2020 +0200 Fix build task --- netbeans.apache.org/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbeans.apache.org/build.gradle b/netbeans.apache.org/build.gradle index e3787bc..7ddf37b 100644 --- a/netbeans.apache.org/build.gradle +++ b/netbeans.apache.org/build.gradle @@ -223,6 +223,8 @@ task buildSite(dependsOn: ["preprocessContent", "bake"], } +build.dependsOn buildSite + task run(type: JavaExec, group: "Run") { def wDir = new File(buildDir, "tomcat") - 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-website] branch hectorespert-patch-1 updated (6fae689 -> c8ebdaf)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. from 6fae689 Enable GitHub action WIP add c8ebdaf Website CI Job No new revisions were added by this update. Summary of changes: .github/workflows/main.yml | 44 +++- 1 file changed, 19 insertions(+), 25 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-website] branch hectorespert-patch-1 updated (c8ebdaf -> c76f931)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. from c8ebdaf Website CI Job add c76f931 Cache dependencies No new revisions were added by this update. Summary of changes: .github/workflows/main.yml | 10 ++ 1 file changed, 10 insertions(+) - 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-website] 01/01: Enable GitHub action WIP
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans-website.git commit 6fae6896b981fd301f071bc0df24e98f409cc0bf Author: Hector Espert AuthorDate: Fri Oct 9 15:52:27 2020 +0200 Enable GitHub action WIP --- .github/workflows/main.yml | 33 + 1 file changed, 33 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000..9ddbd2e --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,33 @@ +# This is a basic workflow to help you get started with Actions + +name: CI + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the master branch +on: + push: +branches: [ master ] + pull_request: +branches: [ master ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: +# The type of runner that the job will run on +runs-on: ubuntu-latest + +# Steps represent a sequence of tasks that will be executed as part of the job +steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + # Runs a single command using the runners shell + - name: Run a one-line script +run: echo Hello, world! + + # Runs a set of commands using the runners shell + - name: Run a multi-line script +run: | + echo Add other actions to build, + echo test, and deploy your project. - 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-website] branch hectorespert-patch-1 created (now 6fae689)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. at 6fae689 Enable GitHub action WIP This branch includes the following new commits: new 6fae689 Enable GitHub action WIP 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] branch master updated (5b96857 -> 9f2b595)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 5b96857 Merge pull request #2424 from sdedic/sdedic/modularizing2 new a17d182 Add ant task to display generated Javadoc new 5797de5 Update README.md new 9f2b595 Merge pull request #2419 from hectorespert/show-javadoc The 4455 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: README.md | 9 + nbbuild/build.xml | 4 2 files changed, 13 insertions(+) - 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-website] branch master updated (7c0a2d7 -> 0a98702)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. from 7c0a2d7 Merge pull request #492 from hectorespert/fix_build new 82f5f0c Update build instructions new 724a1a6 Update index.asciidoc new edf5a84 Update index.asciidoc new 0a98702 Merge pull request #490 from Rareitor/patch-4 The 1236 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: netbeans.apache.org/src/content/download/dev/index.asciidoc | 13 - 1 file changed, 8 insertions(+), 5 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 hectorespert-patch-1 updated (1eb61fd -> e3e78d0)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 1eb61fd Update README.md add e3e78d0 Create marker.txt No new revisions were added by this update. Summary of changes: marker.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 marker.txt - 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: Upgrade JDBC PostgreSQL from 42.2.10 to 42.2.16
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 69e39ab Upgrade JDBC PostgreSQL from 42.2.10 to 42.2.16 new 758669d Merge pull request #2284 from pepness/postgresql-42.2.14 69e39ab is described below commit 69e39abc0c95be04d7aa711af52ba9cc9e550f61 Author: Jose Contreras AuthorDate: Fri Jul 31 13:58:40 2020 -0500 Upgrade JDBC PostgreSQL from 42.2.10 to 42.2.16 --- ide/db.drivers/external/binaries-list | 2 +- ...{postgresql-42.2.10-license.txt => postgresql-42.2.16-license.txt} | 4 ++-- ide/db.drivers/nbproject/project.properties | 4 ++-- ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties | 2 +- .../src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml | 4 ++-- ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ide/db.drivers/external/binaries-list b/ide/db.drivers/external/binaries-list index 3fdc822..c427258 100644 --- a/ide/db.drivers/external/binaries-list +++ b/ide/db.drivers/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -338AF492789FD198DBD52735A22B1946030ECC96 org.postgresql:postgresql:42.2.10 \ No newline at end of file +A9EE12F737BD5DC7D046E4C065E391D38D6A3CFC org.postgresql:postgresql:42.2.16 diff --git a/ide/db.drivers/external/postgresql-42.2.10-license.txt b/ide/db.drivers/external/postgresql-42.2.16-license.txt similarity index 97% rename from ide/db.drivers/external/postgresql-42.2.10-license.txt rename to ide/db.drivers/external/postgresql-42.2.16-license.txt index cd15a01..d9498c7 100644 --- a/ide/db.drivers/external/postgresql-42.2.10-license.txt +++ b/ide/db.drivers/external/postgresql-42.2.16-license.txt @@ -1,9 +1,9 @@ Name: PostgreSQL JDBC Driver -Version: 42.2.10 +Version: 42.2.16 Description: Allows Java programs to interact with a PostgreSQL database License: BSD-postgresql Origin: https://jdbc.postgresql.org/about/license.html -Files: postgresql-42.2.10.jar +Files: postgresql-42.2.16.jar Comment: Out-of-the-box support for Postgres Java database applications Copyright (c) 1997, PostgreSQL Global Development Group diff --git a/ide/db.drivers/nbproject/project.properties b/ide/db.drivers/nbproject/project.properties index 341c05e..ab9e9e2 100644 --- a/ide/db.drivers/nbproject/project.properties +++ b/ide/db.drivers/nbproject/project.properties @@ -17,6 +17,6 @@ javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 -release.external/postgresql-42.2.10.jar=modules/ext/postgresql-42.2.10.jar +release.external/postgresql-42.2.16.jar=modules/ext/postgresql-42.2.16.jar jnlp.indirect.jars=\ -modules/ext/postgresql-42.2.10.jar +modules/ext/postgresql-42.2.16.jar diff --git a/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties b/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties index d735f47..40f444d 100644 --- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties +++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties @@ -20,6 +20,6 @@ OpenIDE-Module-Display-Category=Database OpenIDE-Module-Short-Description=JDBC database drivers OpenIDE-Module-Long-Description=\ This plugin provides JDBC database drivers for an improved out-of-the-box experience when developing database applications. \ -The following driver is included in this plugin: PostgreSQL JDBC 4.2 Driver Version: 42.2.10 +The following driver is included in this plugin: PostgreSQL JDBC 4.2 Driver Version: 42.2.16 PostgreSQLDriver=PostgreSQL JDBC Driver MySQLDriver=MySQL JDBC Driver diff --git a/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml b/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml index c8f4c5c..54056b0 100644 --- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml +++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml @@ -25,7 +25,7 @@ org.netbeans.modules.db.drivers.Bundle classpath - jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-42.2.10.jar!/ + jar:nbinst://org.netbeans.modules.db.drivers/modules/ext/postgresql-42.2.16.jar!/ src @@ -38,7 +38,7 @@ maven-dependencies -org.postgresql:postgresql:42.2.10:jar +org.postgresql:postgresql:42.2.16:jar diff --git a/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml b/ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml index 0ad52a6..6247279 100
[netbeans] branch master updated: Change repo link in documentation
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 db3307a Change repo link in documentation new dd94b02 Merge pull request #2416 from hectorespert/change_repo_on_doc db3307a is described below commit db3307ab8e3f7203feac80b6912a9a7531aaa2f1 Author: Hector Espert AuthorDate: Fri Oct 2 17:57:56 2020 +0200 Change repo link in documentation --- nbbuild/antsrc/org/netbeans/nbbuild/Arch-default-arch-where.xsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Arch-default-arch-where.xsl b/nbbuild/antsrc/org/netbeans/nbbuild/Arch-default-arch-where.xsl index 1aad6d1..71da3d7 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/Arch-default-arch-where.xsl +++ b/nbbuild/antsrc/org/netbeans/nbbuild/Arch-default-arch-where.xsl @@ -27,7 +27,8 @@ The sources for the module are in the -http://hg.netbeans.org/;>NetBeans Mercurial repositories. +https://gitbox.apache.org/repos/asf?p=netbeans.git;>Apache Git repositories +or in the https://github.com/apache/netbeans;>GitHub repositories. - 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 hectorespert-patch-1 created (now 1eb61fd)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. at 1eb61fd Update README.md No new revisions were added by this update. - 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 commit_validation updated (1a3bd4a -> 64b544e)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch commit_validation in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 1a3bd4a Update commits.yml add 64b544e Delete .authors.yml No new revisions were added by this update. Summary of changes: .authors.yml | 20 1 file changed, 20 deletions(-) delete mode 100644 .authors.yml - 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 commit_validation updated (64b544e -> ea9376d)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch commit_validation in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 64b544e Delete .authors.yml add ea9376d Update commits.yml No new revisions were added by this update. Summary of changes: .github/workflows/commits.yml | 2 -- 1 file changed, 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: Fix Spring Web MVC 5.2.9 integration
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 90c1a8e Fix Spring Web MVC 5.2.9 integration new c62fb59 Merge pull request #2380 from pepness/fix-spring-5.2.9 90c1a8e is described below commit 90c1a8ef3fbc10e22c4496826fb6a8570671e7af Author: Jose Contreras AuthorDate: Sat Sep 19 20:01:02 2020 -0500 Fix Spring Web MVC 5.2.9 integration --- .../org/netbeans/modules/spring/webmvc/resources/Bundle.properties| 2 +- .../netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties index 43a638f..f7fe4b8 100644 --- a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties +++ b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties @@ -23,6 +23,6 @@ OpenIDE-Module-Long-Description=Provides support for extending a web project wit Templates/SpringFramework/AbstractController.java=Abstract Controller Templates/SpringFramework/SimpleFormController.java=Simple Form Controller Templates/SpringFramework/index.jsp=View page -spring-webmvc5=Spring Web MVC 5.2.2 +spring-webmvc5=Spring Web MVC 5.2.9 spring-webmvc4=Spring Web MVC 4.3.25 spring-webmvc3=Spring Web MVC 3.2.18 diff --git a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml index b6e01ab..eebf64b 100644 --- a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml +++ b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml @@ -25,7 +25,7 @@ org.netbeans.modules.spring.webmvc.resources.Bundle classpath - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webmvc-5.2.2.RELEASE.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webmvc-5.2.9.RELEASE.jar!/ src @@ -36,7 +36,7 @@ maven-dependencies -org.springframework:spring-webmvc:5.2.2.RELEASE:jar +org.springframework:spring-webmvc:5.2.9.RELEASE: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
[netbeans-website] branch master updated: Update footer.gsp
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new b0a0aef Update footer.gsp new 614bd7b Merge pull request #496 from mitchellhislop/patch-1 b0a0aef is described below commit b0a0aef198be42d628aaf8210c55d354ee649d11 Author: Mitchell Hislop AuthorDate: Thu Oct 15 14:29:03 2020 -0500 Update footer.gsp Updating copyright year to 2020 --- netbeans.apache.org/src/content/templates/footer.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbeans.apache.org/src/content/templates/footer.gsp b/netbeans.apache.org/src/content/templates/footer.gsp index d8c2963..b176fea 100644 --- a/netbeans.apache.org/src/content/templates/footer.gsp +++ b/netbeans.apache.org/src/content/templates/footer.gsp @@ -93,7 +93,7 @@ -Copyright 2017-2019 https://www.apache.org;>The Apache Software Foundation. +Copyright 2017-2020 https://www.apache.org;>The Apache Software Foundation. Licensed under the Apache https://www.apache.org/licenses/;>license, version 2.0 Apache, Apache NetBeans, NetBeans, the Apache feather logo and the Apache NetBeans logo are trademarks of https://www.apache.org;>The Apache Software Foundation. - 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: [NETBEANS-4500] Fixed tests for PHP Editor on Windows
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 fa7acbc [NETBEANS-4500] Fixed tests for PHP Editor on Windows new f21769a Merge pull request #2223 from KacerCZ/netbeans-4500-fix-php-editor-tests fa7acbc is described below commit fa7acbcde97aa081c42dca2696e8129258cb5493 Author: Tomas Prochazka AuthorDate: Mon Jun 29 20:54:43 2020 +0200 [NETBEANS-4500] Fixed tests for PHP Editor on Windows - Use UTF-8 when opening files. - Use system-specific directory separators. - Enabled tests in Github Actions. --- .github/workflows/main.yml | 2 +- .travis.yml| 1 + .../netbeans/modules/csl/api/test/CslTestBase.java | 2 +- .../editor/verification/IntroduceSuggestion.java | 5 +++-- ...Suggestion.php.testIntroduceSuggestion_01.hints | 2 +- .../php/editor/js/JsFormatterEmbeddedTest.java | 12 .../php/editor/parser/PhpParserErrorTest.java | 12 .../modules/php/editor/verification/HintsTest.java | 22 ++ 8 files changed, 53 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 29ef6f5..abab7a7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,7 +62,7 @@ jobs: ant -f php/php.composer test ant -f php/php.dbgp test ant -f php/php.doctrine2 test - # ant -f php/php.editor test + ant -f php/php.editor test ant -f php/php.latte test ant -f php/php.nette.tester test ant -f php/php.phpunit test diff --git a/.travis.yml b/.travis.yml index a73199c..12dc8ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -679,6 +679,7 @@ matrix: - ant $OPTS -f php/php.composer test #- ant $OPTS -f php/php.dbgp test - ant $OPTS -f php/php.doctrine2 test +# PHP Editor tests can't be run on Travis because they run 90 minutes. #- ant $OPTS -f php/php.editor test - ant $OPTS -f php/php.latte test - ant $OPTS -f php/php.nette.tester test diff --git a/ide/csl.api/test/unit/src/org/netbeans/modules/csl/api/test/CslTestBase.java b/ide/csl.api/test/unit/src/org/netbeans/modules/csl/api/test/CslTestBase.java index bb1448f..711b019 100644 --- a/ide/csl.api/test/unit/src/org/netbeans/modules/csl/api/test/CslTestBase.java +++ b/ide/csl.api/test/unit/src/org/netbeans/modules/csl/api/test/CslTestBase.java @@ -423,7 +423,7 @@ public abstract class CslTestBase extends NbTestCase { } InputStream is = fo.getInputStream(); -BufferedReader reader = new BufferedReader(new InputStreamReader(is)); +BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8)); while (true) { String line = reader.readLine(); diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestion.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestion.java index c5c0e085..b622ffc 100644 --- a/php/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestion.java +++ b/php/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceSuggestion.java @@ -18,6 +18,7 @@ */ package org.netbeans.modules.php.editor.verification; +import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.Collection; @@ -465,11 +466,11 @@ public class IntroduceSuggestion extends SuggestionRule { int length = fileName.length(); if (length > 30) { fileName = fileName.substring(length - 30); -final int indexOf = fileName.indexOf("/"); +final int indexOf = fileName.indexOf(File.separator); if (indexOf != -1) { //NOI18N fileName = fileName.substring(indexOf); } -fileName = String.format("...%s/%s.php", fileName, className); //NOI18N +fileName = String.format("...%s%s%s.php", fileName, File.separator, className); //NOI18N } return Bundle.IntroduceHintClassDesc(classNameWithNsPart, fileName); } diff --git a/php/php.editor/test/unit/data/testfiles/verification/testIntroduceSuggestion.php.testIntroduceSuggestion_01.hints b/php/php.editor/test/unit/data/testfiles/verification/testIntroduceSuggestion.php.testIntroduceSuggestion_01.hints index 16058db..6162b63 100644 --- a/php/php.editor/test/unit/data/testfiles/verification/testIntroduceSuggestion.php.testIntroduceSuggestion_01.hints +++
[netbeans] branch master updated: [NETBEANS-4487] Enabled PHP tests in GitHub Actions
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 0cc79f4 [NETBEANS-4487] Enabled PHP tests in GitHub Actions new 526e0ae Merge pull request #2221 from KacerCZ/netbeans-4487-enable-php-debugger-in-travis 0cc79f4 is described below commit 0cc79f451f5e9d8cf8c218f728de13d41375f25b Author: Tomas Prochazka AuthorDate: Mon Jun 29 14:52:59 2020 +0200 [NETBEANS-4487] Enabled PHP tests in GitHub Actions https://issues.apache.org/jira/browse/NETBEANS-4487 Enabled PHP tests on Linux in GitHub Actions. Added note why tests can't be enabled in Travis. --- .github/workflows/main.yml | 178 + .travis.yml| 38 -- 2 files changed, 149 insertions(+), 67 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index abab7a7..9fc1c2d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,36 +45,38 @@ jobs: - name: Test run: ant -f platform/core.network test - - name: Test PHP modules + - name: Test PHP cluster +env: + OPTS: -Dtest-unit-sys-prop.ignore.random.failures=true run: | - ant -f php/hudson.php test - ant -f php/languages.neon test - ant -f php/php.api.annotation test - ant -f php/php.api.documentation test - ant -f php/php.api.executable test - ant -f php/php.api.framework test - ant -f php/php.api.phpmodule test - ant -f php/php.api.testing test - ant -f php/php.apigen test - ant -f php/php.atoum test - ant -f php/php.code.analysis test - ant -f php/php.codeception test - ant -f php/php.composer test - ant -f php/php.dbgp test - ant -f php/php.doctrine2 test - ant -f php/php.editor test - ant -f php/php.latte test - ant -f php/php.nette.tester test - ant -f php/php.phpunit test - ant -f php/php.project test - ant -f php/php.refactoring test - ant -f php/php.smarty test - ant -f php/php.symfony test - ant -f php/php.symfony2 test - ant -f php/php.twig test - ant -f php/php.zend test - ant -f php/php.zend2 test - ant -f php/spellchecker.bindings.php test + ant $OPTS -f php/hudson.php test + ant $OPTS -f php/languages.neon test + ant $OPTS -f php/php.api.annotation test + ant $OPTS -f php/php.api.documentation test + ant $OPTS -f php/php.api.executable test + ant $OPTS -f php/php.api.framework test + ant $OPTS -f php/php.api.phpmodule test + ant $OPTS -f php/php.api.testing test + ant $OPTS -f php/php.apigen test + ant $OPTS -f php/php.atoum test + ant $OPTS -f php/php.code.analysis test + ant $OPTS -f php/php.codeception test + ant $OPTS -f php/php.composer test + ant $OPTS -f php/php.dbgp test + ant $OPTS -f php/php.doctrine2 test + ant $OPTS -f php/php.editor test + ant $OPTS -f php/php.latte test + ant $OPTS -f php/php.nette.tester test + ant $OPTS -f php/php.phpunit test + ant $OPTS -f php/php.project test + ant $OPTS -f php/php.refactoring test + ant $OPTS -f php/php.smarty test + ant $OPTS -f php/php.symfony test + ant $OPTS -f php/php.symfony2 test + ant $OPTS -f php/php.twig test + ant $OPTS -f php/php.zend test + ant $OPTS -f php/php.zend2 test + ant $OPTS -f php/spellchecker.bindings.php test linux: name: Check Build System @@ -98,6 +100,124 @@ jobs: - name: Test Netbeans Build System run: ant -Dcluster.config=basic localtest + + linux-php: +name: Linux build of PHP cluster +runs-on: ubuntu-18.04 +env: + DISPLAY: ":99.0" + OPTS: -Dcluster.config=php -Dtest-unit-sys-prop.ignore.random.failures=true +steps: + - name: Checkout +uses: actions/checkout@v2 + + - name: Caching dependencies +uses: actions/cache@v2 +with: + path: ~/.hgexternalcache + key: ${{ runner.os }}-${{ hashFiles('**/external/binaries-list') }} + restore-keys: ${{ runner.os }}- + + - name: Setup PHP +uses: shivammathur/setup-php@2.3.1 +with: + php-version: '7.4' + tools: pecl + extensions: xdebug + ini-values: xdebug.remote_enable=on + + - name: Launch Xvfb +run: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & + + - name: Clean +run: ant $OPTS clean + + - name: Build +run: ant $OPTS build +
[netbeans] branch master updated (0cb76bd -> 9039b98)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 0cb76bd [NETBEANS-4528] Setting classname for GradleTestcase add d5cbd37 GitHub actions badge add bb2809d Add badge link new 9039b98 Merge pull request #2182 from apache/hectorespert-patch-1 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: README.md | 2 ++ 1 file changed, 2 insertions(+) - 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 #2182 from apache/hectorespert-patch-1
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 9039b983ecd65a58d75f6f32128e9e39331e3923 Merge: 0cb76bd bb2809d Author: Hector Espert AuthorDate: Tue Jul 7 08:54:31 2020 +0200 Merge pull request #2182 from apache/hectorespert-patch-1 GitHub actions badge README.md | 2 ++ 1 file changed, 2 insertions(+) - 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 apisupport-ant-tests updated (5a92585 -> 4d4d402)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 5a92585 Fix apisupport.ant tests add f5f3c9f [NETBEANS-4050] - cleanup uses of EMPTY_LIST, EMPTY_SET, EMPTY_MAP add 36cfe28 Merge pull request #2075 from BradWalker/cleanup_EMPTY_LIST add 8b1d9e8 [NETBEANS-4341] Disable maven global cache add 866c00f Merge pull request #2177 from matthiasblaesing/NETBEANS-4341 add c78cd55 [NETBEANS-3413] Implicit inheritance of PHPDoc descriptions add b8fa73e Merge pull request #2122 from KacerCZ/netbeans-3413 add 47e7a89 [NETBEANS-4338] Code Sniffer - updated link to homepage add d10e7e5 Merge pull request #2140 from KacerCZ/netbeans-4338 add ec69f71 [NETBEANS-4368] Fix test file navigation dialog add 3e41cd0 Merge pull request #2155 from KacerCZ/netbeans-4368 add f0f6f89 [NETBEANS-4339] PHP Mess Detector - added option to use custom rule set file add 31908a7 Merge pull request #2160 from KacerCZ/netbeans-4339-phpmd-rule-file add f1f3b46 [NETBEANS-3311] Convert TextBlock to String, Function call parameter fix test case fix (#2172) add 96e9559 Update asm from 7.2 to 8.0.1 add 2e7a2e9 [NETBEANS-4337] Code Sniffer standard is optional add afd1a95 Merge pull request #2149 from KacerCZ/netbeans-4337 add df7fe82 [NETBEANS-2623] Added Composer actions to update autoloader and run script add 1102d73 Merge pull request #2173 from KacerCZ/netbeans-2623-composer-actions add 4142b0c Registering Graal.js as a Java library add aa0cf42 Allow selection of execution via Graal.js or Nashorn add 1014e73 run, debug actions shall be enabled even JavaC isn't present add e6c864f Merge remote-tracking branch 'origin/master' into NashornGotRemovedIn15 add ee12427a Each library must have a display name add cf5196c Removing debug message add 957b12f Use javaPlatform boot classpath when searching for nashorn launcher add d121173 Merge pull request #2106 from JaroslavTulach/NashornGotRemovedIn15 add aa266cb Do not blindly cast to IndexedClassDecl while reassigning anonymous class numbers, as the class decl may not be IndexedClassDecl. add 5282f47 Test Netbeans build system add a9d6a47 Merge pull request #2187 from hectorespert/local_tests add 6b515ec [NETBEANS-3413] Implicit inheritance of PHPDoc descriptions - fixed code completion tests add cf0ae24 Merge pull request #2189 from KacerCZ/netbeans-3413-fix-completion-test add 7d4dca6 [NETBEANS-4367] Fix the platform application launcher script (for MacOS/Linux) to properly take default_cachedir setting into account add 289e483 [NETBEANS-4356] Code Completion must check also superclass/superinterface methods when determining if cast is required. add 1cd99db [NETBEANS-2790] Do not throw ClosedWatchServiceException on Shutdown. add d49fd82 Fix tests for Neon language add 0d66999 Merge pull request #2190 from KacerCZ/neon-tests-fix add 18d0b9d [NETBEANS-4464] Fixed unit tests for Atoum on Windows add c357538 [NETBEANS-4463] Fixed unit tests for Codeception on Windows add 14b897c Merge pull request #2198 from KacerCZ/netbeans-4463-fix-codeception-tests add 5f3f8f5 [NETBEANS-4459] - remove use of deprecated field in Logger add 93483cc Merge pull request #2195 from BradWalker/update_logger_global add 260e2c4 Merge branch 'master' into netbeans-4464-fix-atoum-tests add 5f1b7da Merge pull request #2199 from KacerCZ/netbeans-4464-fix-atoum-tests add 081d26f [NETBEANS-4431]: Added option to create new file in Java project as record type add d84a5d7 Added tests for PHP modules in Windows build add c067f12 Merge pull request #2202 from KacerCZ/test-php-modules add 01bdf51 [NETBEANS-4480] Fixed tests for PHP Project on Windows add b986ae2 [NETBEANS-4479] Fixed tests for PHPUnit on Windows add ddf52b6 Move JavaFX related functionality to JavaFX cluster add e955df4 Merge '12.0+' into MoveToJavaFXCluster add 35542e7 Adding missing license add c17a078 Localized error messages from ModuleManager add bc31e77 Enable download when simple activation fails add 700af67 Merge remote-tracking branch 'dukescript/MoveToJavaFXCluster' add cf2174f Display error message when JavaFX cluster cannot be enabled add 301398c [NETBEANS-4294] Donation of original AutoSave module to Apache NetBeans add 1d2191d [NETBEANS-4294] Fixed incorrect option section name in module description add a6f8529 [NETBEANS-4294] Fixed module versioning and added autosave module as editor.kit dependency as well nbbuild/cluster.properties build pipeline add ea888c2 [NETBEANS-4294] Included license information for form file add b987288
[netbeans] branch master updated: Test Netbeans build system
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 5282f47 Test Netbeans build system new a9d6a47 Merge pull request #2187 from hectorespert/local_tests 5282f47 is described below commit 5282f47e0225d06f5fbdd5650c125d3be27dc3da Author: Hector Espert AuthorDate: Sun Jun 14 01:28:09 2020 +0200 Test Netbeans build system --- .github/workflows/main.yml | 23 ++ nbbuild/build.xml | 2 +- .../unit/src/org/netbeans/nbbuild/TestBase.java| 9 - 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1ae04eb..9eb514b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,3 +44,26 @@ jobs: - name: Test run: ant -f platform/core.network test + + linux: +name: Check Build System +runs-on: ubuntu-18.04 +steps: + - name: Checkout +uses: actions/checkout@v2 + + - name: Caching dependencies +uses: actions/cache@v2 +with: + path: ~/.hgexternalcache + key: ${{ runner.os }}-${{ hashFiles('**/external/binaries-list') }} + restore-keys: ${{ runner.os }}- + + - name: Clean +run: ant -Dcluster.config=basic clean + + - name: Build +run: ant -Dcluster.config=basic build + + - name: Test Netbeans Build System +run: ant -Dcluster.config=basic localtest diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 45bc1f3..eb17890 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1377,7 +1377,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d - + diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/TestBase.java b/nbbuild/test/unit/src/org/netbeans/nbbuild/TestBase.java index 90fff86..3d6e734 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/TestBase.java +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/TestBase.java @@ -281,21 +281,12 @@ abstract class TestBase extends NbTestCase { public void checkAccept(String host, int port) { } @Override -public void checkMemberAccess(Class clazz, int which) { -} -@Override -public void checkSystemClipboardAccess() { -} -@Override public void checkSetFactory() { } @Override public void checkCreateClassLoader() { } @Override -public void checkAwtEventQueueAccess() { -} -@Override public void checkPrintJobAccess() { } @Override - 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: Test Netbeans build system
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 5282f47 Test Netbeans build system new a9d6a47 Merge pull request #2187 from hectorespert/local_tests 5282f47 is described below commit 5282f47e0225d06f5fbdd5650c125d3be27dc3da Author: Hector Espert AuthorDate: Sun Jun 14 01:28:09 2020 +0200 Test Netbeans build system --- .github/workflows/main.yml | 23 ++ nbbuild/build.xml | 2 +- .../unit/src/org/netbeans/nbbuild/TestBase.java| 9 - 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1ae04eb..9eb514b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,3 +44,26 @@ jobs: - name: Test run: ant -f platform/core.network test + + linux: +name: Check Build System +runs-on: ubuntu-18.04 +steps: + - name: Checkout +uses: actions/checkout@v2 + + - name: Caching dependencies +uses: actions/cache@v2 +with: + path: ~/.hgexternalcache + key: ${{ runner.os }}-${{ hashFiles('**/external/binaries-list') }} + restore-keys: ${{ runner.os }}- + + - name: Clean +run: ant -Dcluster.config=basic clean + + - name: Build +run: ant -Dcluster.config=basic build + + - name: Test Netbeans Build System +run: ant -Dcluster.config=basic localtest diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 45bc1f3..eb17890 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1377,7 +1377,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d - + diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/TestBase.java b/nbbuild/test/unit/src/org/netbeans/nbbuild/TestBase.java index 90fff86..3d6e734 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/TestBase.java +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/TestBase.java @@ -281,21 +281,12 @@ abstract class TestBase extends NbTestCase { public void checkAccept(String host, int port) { } @Override -public void checkMemberAccess(Class clazz, int which) { -} -@Override -public void checkSystemClipboardAccess() { -} -@Override public void checkSetFactory() { } @Override public void checkCreateClassLoader() { } @Override -public void checkAwtEventQueueAccess() { -} -@Override public void checkPrintJobAccess() { } @Override - 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 (05c8e34 -> d1e49d5)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 05c8e34 Merge pull request #2206 from KacerCZ/netbeans-4483-fix-nette-tester-tests new b986ae2 [NETBEANS-4479] Fixed tests for PHPUnit on Windows new 35d1b38 Merge branch 'master' into netbeans-4479-fix-phpunit-tests new d1e49d5 Merge pull request #2204 from KacerCZ/netbeans-4479-fix-phpunit-tests The 4080 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/workflows/main.yml | 2 +- .../org/netbeans/modules/php/phpunit/commands/PhpUnitTest.java | 9 ++--- 2 files changed, 7 insertions(+), 4 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: [NETBEANS-4487] Fixed tests for PHP Debugger on Windows
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 6cd3289 [NETBEANS-4487] Fixed tests for PHP Debugger on Windows new 1448238 Merge pull request #2209 from KacerCZ/netbeans-4487-fix-php-debugger-tests 6cd3289 is described below commit 6cd3289be447d1d57f94c365ae6aec04c5512d2c Author: Tomas Prochazka AuthorDate: Sun Jun 21 11:20:11 2020 +0200 [NETBEANS-4487] Fixed tests for PHP Debugger on Windows https://issues.apache.org/jira/browse/NETBEANS-4487 - Fixed mapper tests. - Disabled always failing part of debugger test. - Enabled tests in Github Actions. --- .github/workflows/main.yml | 2 +- .../unit/src/org/netbeans/modules/php/dbgp/DebuggerTest.java | 9 + .../unit/src/org/netbeans/modules/php/dbgp/URIMapperTest.java| 5 ++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f2e107f..a491549 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: # ant -f php/php.code.analysis test ant -f php/php.codeception test ant -f php/php.composer test - # ant -f php/php.dbgp test + ant -f php/php.dbgp test ant -f php/php.doctrine2 test # ant -f php/php.editor test # ant -f php/php.latte test diff --git a/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/DebuggerTest.java b/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/DebuggerTest.java index 4d87f18..4659418 100644 --- a/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/DebuggerTest.java +++ b/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/DebuggerTest.java @@ -80,10 +80,11 @@ public class DebuggerTest extends NbTestCase { assertNotNull(scriptFile); assertTrue(scriptFile.exists()); final TestWrapper testWrapper = new TestWrapper(getTestForSuspendState(sessionId)); -addBreakpoint(scriptFo, 48, testWrapper, new RunContinuation(sessionId)); +addBreakpoint(scriptFo, 27, testWrapper, new RunContinuation(sessionId)); startDebugging(sessionId, scriptFile); sessionId.isInitialized(true); -testWrapper.assertTested();//sometimes, randomly fails +// always fails +// testWrapper.assertTested(); } // #254298 @@ -306,7 +307,7 @@ public class DebuggerTest extends NbTestCase { return scriptFo; } -private String gePHPInterpreter() { +private String getPHPInterpreter() { String command = DebuggerOptions.getGlobalInstance().getPhpInterpreter(); if (command == null) { /*TODO: use more sophisticated code here for individual platforms @@ -336,7 +337,7 @@ public class DebuggerTest extends NbTestCase { } private void startDebugging(final SessionId sessionId, File scriptFile) { -final ProcessBuilder processBuilder = new ProcessBuilder(new String[]{gePHPInterpreter(), scriptFile.getAbsolutePath()}); +final ProcessBuilder processBuilder = new ProcessBuilder(new String[]{getPHPInterpreter(), scriptFile.getAbsolutePath()}); processBuilder.directory(scriptFile.getParentFile()); processBuilder.environment().put("XDEBUG_CONFIG", "idekey=" + sessionId.getId()); //NOI18N final DebuggerOptions options = DebuggerOptions.getGlobalInstance(); diff --git a/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/URIMapperTest.java b/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/URIMapperTest.java index b7cad90..2436b29 100644 --- a/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/URIMapperTest.java +++ b/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/URIMapperTest.java @@ -27,7 +27,6 @@ import java.util.Collections; import java.util.List; import org.netbeans.junit.NbTestCase; import org.openide.filesystems.FileUtil; -import static org.junit.Assert.*; import org.openide.util.Pair; /** @@ -50,8 +49,8 @@ public class URIMapperTest extends NbTestCase { protected void setUp() throws Exception { super.setUp(); sourceFolderBase = getWorkDir(); -String currentDir = new File(".").getCanonicalPath(); // NOI18N -webServerURIBase = URI.create("file://" + currentDir + "/dbgtest2/");//NOI18N +File currentDir = new File(".").getCanonicalFile(); // NOI18N +webServerURIBase = URI.create(currentDir.toURI().toString() + "/dbgtest2/").normalize(); // NOI18N webServerURIBaseFile = new File(webServerURIBase); webServerURIBaseFile.mkdir();
[netbeans] branch master updated: [NETBEANS-4483] Fixed unit tests for Nette Tester
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 691b880 [NETBEANS-4483] Fixed unit tests for Nette Tester new 05c8e34 Merge pull request #2206 from KacerCZ/netbeans-4483-fix-nette-tester-tests 691b880 is described below commit 691b880903620ee7a05949b5a0b9a9e624ba93eb Author: Tomas Prochazka AuthorDate: Sat Jun 20 23:42:28 2020 +0200 [NETBEANS-4483] Fixed unit tests for Nette Tester https://issues.apache.org/jira/browse/NETBEANS-4483 - Directory separators had to be replaced with system-dependent value. - Because Windows use \ as separator, replacement text has to be quoted. - Updated test to match line numbers after license change. - Enabled tests in Travis and Github Actions --- .github/workflows/main.yml | 2 +- .travis.yml| 2 +- php/php.nette.tester/test/unit/data/coverage.xml | 24 +++--- .../nette/tester/coverage/CloverLogParserTest.java | 21 --- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f2e107f..a8cba1d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,7 +64,7 @@ jobs: ant -f php/php.doctrine2 test # ant -f php/php.editor test # ant -f php/php.latte test - # ant -f php/php.nette.tester test + ant -f php/php.nette.tester test # ant -f php/php.phpunit test # ant -f php/php.project test ant -f php/php.refactoring test diff --git a/.travis.yml b/.travis.yml index afdce8f..8bfe27e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -681,7 +681,7 @@ matrix: - ant $OPTS -f php/php.doctrine2 test #- ant $OPTS -f php/php.editor test #- ant $OPTS -f php/php.latte test -#- ant $OPTS -f php/php.nette.tester test +- ant $OPTS -f php/php.nette.tester test - ant $OPTS -f php/php.phpunit test - ant $OPTS -f php/php.project test - ant $OPTS -f php/php.refactoring test diff --git a/php/php.nette.tester/test/unit/data/coverage.xml b/php/php.nette.tester/test/unit/data/coverage.xml index 1ee4014..86d8065 100644 --- a/php/php.nette.tester/test/unit/data/coverage.xml +++ b/php/php.nette.tester/test/unit/data/coverage.xml @@ -22,23 +22,23 @@ - - + + - + + + + + + + + - - - - - - - - - + + diff --git a/php/php.nette.tester/test/unit/src/org/netbeans/modules/php/nette/tester/coverage/CloverLogParserTest.java b/php/php.nette.tester/test/unit/src/org/netbeans/modules/php/nette/tester/coverage/CloverLogParserTest.java index a33e60e..8171843 100644 --- a/php/php.nette.tester/test/unit/src/org/netbeans/modules/php/nette/tester/coverage/CloverLogParserTest.java +++ b/php/php.nette.tester/test/unit/src/org/netbeans/modules/php/nette/tester/coverage/CloverLogParserTest.java @@ -32,10 +32,6 @@ import org.netbeans.junit.NbTestCase; import org.netbeans.modules.php.spi.testing.coverage.Coverage; import org.netbeans.modules.php.spi.testing.coverage.FileMetrics; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; - public class CloverLogParserTest extends NbTestCase { public CloverLogParserTest(String name) { @@ -55,32 +51,32 @@ public class CloverLogParserTest extends NbTestCase { assertEquals(new File(getDataDir(), "testdata/Calculator.php").getAbsolutePath(), file.getPath()); FileMetrics metrics = file.getMetrics(); assertNotNull(metrics); -assertEquals(72, metrics.getLineCount()); +assertEquals(49, metrics.getLineCount()); assertEquals(7, metrics.getStatements()); assertEquals(6, metrics.getCoveredStatements()); assertNotNull(file.getLines()); assertEquals(9, file.getLines().size()); Coverage.Line line = file.getLines().get(0); -assertEquals(47, line.getNumber()); +assertEquals(23, line.getNumber()); assertEquals(1, line.getHitCount()); line = file.getLines().get(1); -assertEquals(50, line.getNumber()); +assertEquals(26, line.getNumber()); assertEquals(1, line.getHitCount()); line = file.getLines().get(2); -assertEquals(54, line.getNumber()); +assertEquals(30, line.getNumber()); assertEquals(1, line.getHitCount()); line = file.getLines().get(7); -asser
[netbeans] branch master updated: [NETBEANS-3898] skip hidden files in ModuleList.doScanNetBeansOrgSources
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 fb50e23 [NETBEANS-3898] skip hidden files in ModuleList.doScanNetBeansOrgSources new e963a30 Merge pull request #2152 from errael/SkipHiddenFiles fb50e23 is described below commit fb50e2344fd036414dba51a5b8602f3b8bdae517 Author: Ernie Rael AuthorDate: Sat May 23 17:34:16 2020 +0100 [NETBEANS-3898] skip hidden files in ModuleList.doScanNetBeansOrgSources --- .../org/netbeans/modules/apisupport/project/universe/ModuleList.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleList.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleList.java index 256e0ef..2154e48 100644 --- a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleList.java +++ b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ModuleList.java @@ -469,8 +469,8 @@ public final class ModuleList { continue; } String name = kid.getName(); -if (EXCLUDED_DIR_NAMES.contains(name)) { -// #61579: known to not be project dirs, so skip to save time. +if (name.startsWith(".") || EXCLUDED_DIR_NAMES.contains(name)) { // NOI18N +// #61579/[NETBEANS-3898]: known to not be project dirs, so skip to save time. continue; } String newPathPrefix = (pathPrefix != null) ? pathPrefix + "/" + name : name; // NOI18N - 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 (d1e49d5 -> eca3911)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from d1e49d5 Merge pull request #2204 from KacerCZ/netbeans-4479-fix-phpunit-tests new 01bdf51 [NETBEANS-4480] Fixed tests for PHP Project on Windows new 406fe3b Merge branch 'master' into netbeans-4480-fix-php-project-tests new eca3911 Merge pull request #2205 from KacerCZ/netbeans-4480-fix-php-project-tests The 4083 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/workflows/main.yml | 2 +- .../connections/transfer/TransferFileTest.java | 23 +++--- .../netbeans/modules/php/project/ui/UtilsTest.java | 5 +++-- 3 files changed, 16 insertions(+), 14 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: Added tests for PHP modules in Windows build
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 d84a5d7 Added tests for PHP modules in Windows build new c067f12 Merge pull request #2202 from KacerCZ/test-php-modules d84a5d7 is described below commit d84a5d743c0f9e581c30468ced1db2166dd63d2f Author: Tomas Prochazka AuthorDate: Fri Jun 19 17:08:01 2020 +0200 Added tests for PHP modules in Windows build --- .github/workflows/main.yml | 35 ++- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b1ebd4e..f2e107f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,12 +45,37 @@ jobs: - name: Test run: ant -f platform/core.network test - - name: PHP / Atoum test -run: ant -f php/php.atoum test + - name: Test PHP modules +run: | + ant -f php/hudson.php test + ant -f php/languages.neon test + ant -f php/php.api.annotation test + ant -f php/php.api.documentation test + ant -f php/php.api.executable test + ant -f php/php.api.framework test + ant -f php/php.api.phpmodule test + ant -f php/php.api.testing test + ant -f php/php.apigen test + ant -f php/php.atoum test + # ant -f php/php.code.analysis test + ant -f php/php.codeception test + ant -f php/php.composer test + # ant -f php/php.dbgp test + ant -f php/php.doctrine2 test + # ant -f php/php.editor test + # ant -f php/php.latte test + # ant -f php/php.nette.tester test + # ant -f php/php.phpunit test + # ant -f php/php.project test + ant -f php/php.refactoring test + # ant -f php/php.smarty test + # ant -f php/php.symfony test + # ant -f php/php.symfony2 test + ant -f php/php.twig test + ant -f php/php.zend test + ant -f php/php.zend2 test + ant -f php/spellchecker.bindings.php test - - name: PHP / Codeception test -run: ant -f php/php.codeception test - linux: name: Check Build System runs-on: ubuntu-18.04 - 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 (93483cc -> 5f1b7da)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 93483cc Merge pull request #2195 from BradWalker/update_logger_global new 18d0b9d [NETBEANS-4464] Fixed unit tests for Atoum on Windows new 260e2c4 Merge branch 'master' into netbeans-4464-fix-atoum-tests new 5f1b7da Merge pull request #2199 from KacerCZ/netbeans-4464-fix-atoum-tests The 4041 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/workflows/main.yml | 5 - php/php.atoum/test/unit/data/coverage.xml | 4 ++-- .../netbeans/modules/php/atoum/coverage/CloverLogParserTest.java| 6 +- 3 files changed, 11 insertions(+), 4 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: Move macOS tests to GitHub action
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 3dccfed Move macOS tests to GitHub action new 0636a9e Merge pull request #2180 from hectorespert/github_macos_action 3dccfed is described below commit 3dccfed705d19d1ed1ca0eb2550da911d9cc210d Author: Hector Espert AuthorDate: Mon Jun 8 20:39:31 2020 +0200 Move macOS tests to GitHub action --- .github/workflows/main.yml | 27 +++ .travis.yml| 23 --- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f2e107f..10f0c43 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -98,3 +98,30 @@ jobs: - name: Test Netbeans Build System run: ant -Dcluster.config=basic localtest + + macos: +name: MacOS build +runs-on: macos-10.15 +steps: + - uses: actions/checkout@v2 + + - uses: actions/cache@v2 +with: + path: | +~/.hgexternalcache +~/Library/Caches/Homebrew + key: ${{ runner.os }}-${{ hashFiles('**/external/binaries-list') }} + restore-keys: ${{ runner.os }}- + + - run: brew install ant + + - name: Clean +run: ant clean + + - name: Build +run: ant build + + - name: Test +run: | + ant -f platform/masterfs.macosx test + ant -f platform/core.network test diff --git a/.travis.yml b/.travis.yml index afdce8f..f7350fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -714,26 +714,3 @@ matrix: - ant $OPTS build script: - nbbuild/travis/scripting.sh - -- name: MacOS tests - language: minimal - os: osx - osx_image: xcode10.1 - addons: -homebrew: - packages: -- openjdk@11 -- ant - update: true - env: -- OPTS="-silent -Dcluster.config=platform -Dpermit.jdk9.builds=true -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest-unit-sys-prop.ignore.random.failures=true -Dvanilla.javac.exists=true" - install: -- sudo ln -sfn /usr/local/opt/openjdk@11/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-11.jdk -- export PATH="/usr/local/opt/openjdk@11/bin:$PATH" -- export JAVA_HOME=`/usr/libexec/java_home -v 11` - before_script: -- ant $OPTS clean -- ant $OPTS build - script: -- ant $OPTS -f platform/masterfs.macosx test -- ant $OPTS -f platform/core.network test - 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: Continuous build in Windows
This is an automated email from the ASF dual-hosted git repository. hectorespert 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 272d199 Continuous build in Windows new fb64095 Merge pull request #2158 from hectorespert/github_windows_action 272d199 is described below commit 272d199b725636916908951cee5c82a358df5452 Author: Hector Espert AuthorDate: Tue May 26 21:07:19 2020 +0200 Continuous build in Windows --- .github/workflows/main.yml | 46 + .../utils/hname/win/HostnameUtilsWinTest.java | 48 ++ 2 files changed, 94 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000..1ae04eb --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,46 @@ +# 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. + +name: Apache Netbeans Continuous Integration + +on: + push: + pull_request: + +jobs: + windows: +name: Windows build +runs-on: windows-2019 +steps: + - name: Checkout +uses: actions/checkout@v2 + + - name: Caching dependencies +uses: actions/cache@v2 +with: + path: ~/.hgexternalcache + key: ${{ runner.os }}-${{ hashFiles('**/external/binaries-list') }} + restore-keys: ${{ runner.os }}- + + - name: Clean +run: ant clean + + - name: Build +run: ant build + + - name: Test +run: ant -f platform/core.network test diff --git a/platform/core.network/test/unit/src/org/netbeans/core/network/utils/hname/win/HostnameUtilsWinTest.java b/platform/core.network/test/unit/src/org/netbeans/core/network/utils/hname/win/HostnameUtilsWinTest.java new file mode 100644 index 000..56d11a2 --- /dev/null +++ b/platform/core.network/test/unit/src/org/netbeans/core/network/utils/hname/win/HostnameUtilsWinTest.java @@ -0,0 +1,48 @@ +/* + * 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. + */ +package org.netbeans.core.network.utils.hname.win; + +import com.sun.jna.Platform; +import org.netbeans.junit.NbTestCase; + +/** + * + * @author Hector Espert + */ +public class HostnameUtilsWinTest extends NbTestCase { + +public HostnameUtilsWinTest(String name) { +super(name); +} + +@Override +public boolean canRun() { +return super.canRun() && Platform.isWindows(); +} + +public void testGetComputerName() throws Exception { +assertNotNull(HostnameUtilsWin.getComputerName()); +} + +public void testGetHostName() throws Exception { +assertNotNull(HostnameUtilsWin.getHostName(true)); +assertNotNull(HostnameUtilsWin.getHostName(false)); +} + +} - 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 (fb64095 -> e952ff5)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from fb64095 Merge pull request #2158 from hectorespert/github_windows_action new fa01fbc Test SimpleNotificationDisplayer implementation new 27497bd Rename NotificationDisplayerTest.java to SimpleNotificationDisplayerTest.java new e952ff5 Merge pull request #1953 from hectorespert/openide_awt_notifications The 3995 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: .../openide/awt/NotificationCategoryFactory.java | 6 +- .../awt/NotificationCategoryFactoryTest.java | 20 ++--- .../awt/SimpleNotificationDisplayerTest.java | 94 ++ .../unit/src/org/openide/awt/TestBundle.properties | 6 +- 4 files changed, 112 insertions(+), 14 deletions(-) create mode 100644 platform/openide.awt/test/unit/src/org/openide/awt/SimpleNotificationDisplayerTest.java - 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 (e952ff5 -> 97a3bda)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from e952ff5 Merge pull request #1953 from hectorespert/openide_awt_notifications new edbbaf4 Improve testing in notifications module new 6da69e0 Add expected message in StatusLineElementTest.java new 97a3bda Merge pull request #1979 from hectorespert/test_notification_module The 3998 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: .../modules/notifications/StatusLineElement.java | 3 +- .../notifications/filter/CategoryFilter.java | 2 +- .../notifications/filter/FilterRepository.java | 7 +- .../notifications/filter/NotificationFilter.java | 4 +- .../modules/notifications/filter/Util.java | 6 +- .../notifications/NotificationSettingsTest.java} | 31 ++- .../notifications/StatusLineElementTest.java} | 32 +-- .../notifications/filter/FilterRepositoryTest.java | 124 .../filter/NotificationFilterTest.java | 88 + .../notifications/filter/TestPreferences.java | 220 + .../notifications/filter/TitleFilterTest.java} | 34 ++-- .../modules/notifications/filter/UtilTest.java}| 34 ++-- 12 files changed, 512 insertions(+), 73 deletions(-) copy ide/notifications/{src/org/netbeans/modules/notifications/StatusLineElement.java => test/unit/src/org/netbeans/modules/notifications/NotificationSettingsTest.java} (58%) copy ide/notifications/{src/org/netbeans/modules/notifications/StatusLineElement.java => test/unit/src/org/netbeans/modules/notifications/StatusLineElementTest.java} (53%) create mode 100644 ide/notifications/test/unit/src/org/netbeans/modules/notifications/filter/FilterRepositoryTest.java create mode 100644 ide/notifications/test/unit/src/org/netbeans/modules/notifications/filter/NotificationFilterTest.java create mode 100644 ide/notifications/test/unit/src/org/netbeans/modules/notifications/filter/TestPreferences.java copy ide/notifications/{src/org/netbeans/modules/notifications/filter/Util.java => test/unit/src/org/netbeans/modules/notifications/filter/TitleFilterTest.java} (61%) copy ide/notifications/{src/org/netbeans/modules/notifications/filter/Util.java => test/unit/src/org/netbeans/modules/notifications/filter/UtilTest.java} (57%) - 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 hectorespert-patch-1 created (now d5cbd37)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. at d5cbd37 GitHub actions badge No new revisions were added by this update. - 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 hectorespert-patch-1 created (now d5cbd37)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. at d5cbd37 GitHub actions badge This branch includes the following new commits: new d5cbd37 GitHub actions badge 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: GitHub actions badge
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit d5cbd379323caf967f8610ed74ed5792acfe4052 Author: Hector Espert AuthorDate: Thu Jun 11 20:16:55 2020 +0200 GitHub actions badge Add GitHub actions budge in the README file --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 776230e..4ed35ef 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,8 @@ Apache NetBeans is an open source development environment, tooling platform, and application framework. ### Build status + * GitHub actions + * ![Apache Netbeans Continuous Integration](https://github.com/apache/netbeans/workflows/Apache%20Netbeans%20Continuous%20Integration/badge.svg) * TravisCI: * [![Build Status](https://travis-ci.org/apache/netbeans.svg?branch=master)](https://travis-ci.org/apache/netbeans) * Apache Jenkins: - 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 hectorespert-patch-1 updated (d5cbd37 -> bb2809d)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from d5cbd37 GitHub actions badge add bb2809d Add badge link No new revisions were added by this update. Summary of changes: README.md | 2 +- 1 file changed, 1 insertion(+), 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] branch hectorespert-patch-1 updated (d5cbd37 -> bb2809d)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch hectorespert-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from d5cbd37 GitHub actions badge add bb2809d Add badge link No new revisions were added by this update. Summary of changes: README.md | 2 +- 1 file changed, 1 insertion(+), 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] 02/02: Load ant tasks
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch gradle_build_system in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 65ae0c89fc1d02a5e1823bc1d2e9a5282cede7a9 Author: Hector Espert AuthorDate: Sun Dec 6 23:10:12 2020 +0100 Load ant tasks --- build.gradle | 26 ++ gradle.properties | 1 + 2 files changed, 27 insertions(+) diff --git a/build.gradle b/build.gradle index d7e8f5c..c40b916 100644 --- a/build.gradle +++ b/build.gradle @@ -4,3 +4,29 @@ * This is a general purpose Gradle build. * Learn more about Gradle by exploring our samples at https://docs.gradle.org/6.7.1/samples */ + +/* + * Load + */ +ant.importBuild('nbbuild/build.xml') { antTargetName -> +'ant-' + antTargetName +} + +tasks.matching { task -> +task.name.startsWith('ant-') +}*.group = 'Ant' + +task clean(type: Delete) { +group = 'Clean' +dependsOn = ['ant-clean'] +delete rootProject.buildDir +} + +task build() { +group = 'Build' +dependsOn = ['ant-build'] +mustRunAfter = ['clean'] +doLast { +println 'Hello world!' +} +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000..6b1823d --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.daemon=false - 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