[netbeans] branch delivery updated: Fix HCL Lexer heredoc error on trailing space.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 2eb467f10c Fix HCL Lexer heredoc error on trailing space.
2eb467f10c is described below
commit 2eb467f10ce624d5900781234ab87eac59a21bc5
Author: Laszlo Kishalmi
AuthorDate: Tue Apr 18 15:24:11 2023 -0700
Fix HCL Lexer heredoc error on trailing space.
---
.../org/netbeans/modules/languages/hcl/HCLHereDocAdaptor.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLHereDocAdaptor.java
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLHereDocAdaptor.java
index 9773e53472..ebbdc6 100644
---
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLHereDocAdaptor.java
+++
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLHereDocAdaptor.java
@@ -51,14 +51,14 @@ public abstract class HCLHereDocAdaptor extends Lexer {
protected boolean heredocEndAhead(String partialHeredoc) {
int n = 1;
int c = _input.LA(1);
+// NewLines are part of heredoc content, but
+// heredoc marker and it's leading space are not
+while (Character.isWhitespace(c) && c != '\n') {
+c = _input.LA(++n);
+}
if (c == '\n') {
-//NewLines are part of heredoc content
return false;
}
-// heredoc marker and it's leading space are not part of the heredoc
content
-while (Character.isWhitespace(c)) {
-c = _input.LA(++n);
-}
for (int v = 0; v < currentHereDocVar.length(); v++) {
if (this._input.LA(n + v) != currentHereDocVar.charAt(v)) {
return 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-jenkins-lib] branch ebarboni-patch-3 created (now 9cb2239)
This is an automated email from the ASF dual-hosted git repository. skygo pushed a change to branch ebarboni-patch-3 in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git at 9cb2239 jdk 20 for release80 apidoc This branch includes the following new commits: new 9cb2239 jdk 20 for release80 apidoc 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-jenkins-lib] 01/01: jdk 20 for release80 apidoc
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch ebarboni-patch-3 in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git commit 9cb223932cd26a68cbaa84c6396046dc8d0ad632 Author: Eric Barboni AuthorDate: Tue Apr 18 23:10:27 2023 +0200 jdk 20 for release80 apidoc This is related to #87 but make it separate. --- meta/netbeansrelease.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json index 851..fd907a9 100644 --- a/meta/netbeansrelease.json +++ b/meta/netbeansrelease.json @@ -998,6 +998,7 @@ "position": "27", "ant": "ant_latest", "jdk": "jdk_11_latest", +"jdktoolapidoc" : "jdk_20_latest", "jdk_apidoc": "https://docs.oracle.com/en/java/javase/11/docs/api/;, "maven": "maven_3_latest", "versionName": "18", - 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-jenkins-lib] branch ebarboni-patch-2 created (now 3d7e0ad)
This is an automated email from the ASF dual-hosted git repository. skygo pushed a change to branch ebarboni-patch-2 in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git at 3d7e0ad change apidoc generation This branch includes the following new commits: new 3d7e0ad change apidoc generation 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-jenkins-lib] 01/01: change apidoc generation
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch ebarboni-patch-2
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
commit 3d7e0ad569c5abbf804869d4b26b398983408213
Author: Eric Barboni
AuthorDate: Tue Apr 18 22:52:33 2023 +0200
change apidoc generation
Instead of publishing to nightlies apidoc for release juste use artefact
for maven artefact generations.
Relax apidoc generation on releaseXXX branches.
---
vars/asfMainNetBeansBuild.groovy | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index bf80ddc..0e716ea 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -206,7 +206,7 @@ def call(Map params = [:]) {
}
}
-stage ('Released javadoc rebuild') {
+stage ('Release branch javadoc rebuild to nightlies') {
tools {
jdk tooling.jdktool
}
@@ -215,7 +215,6 @@ def call(Map params = [:]) {
//expression { BRANCH_NAME ==~ /release[0-9]+/ }
branch pattern : "release\\d+",comparator:"REGEXP"
//wait for modern 1.4.1
-expression { month !='Invalid'}
}
}
@@ -225,6 +224,7 @@ def call(Map params = [:]) {
withAnt(installation: tooling.myAnt) {
sh "ant"
}
+// use jdk version aligned to max supported
withAnt(installation: tooling.myAnt, jdk:
tooling.jdktoolapidoc) {
sh "ant build-javadoc
-Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip"
}
@@ -410,15 +410,11 @@ def doParallelClusters(cconfigs) {
// additionnal target to have maven ready
-// javadoc build
+// javadoc build for maven artefacts, do
the more we can using jdk of build.
sh "ant -f
build-${clustername}-temp/build.xml build-nbms build-source-zips
generate-uc-catalog -Dcluster.config=release -Ddo.build.windows.launchers=true
-Dmetabuild.branch=${branch}"
-sh "ant -f
build-${clustername}-temp/build.xml build-javadoc
-Djavadoc.web.root='${apidocurl}' -Dmodules-javadoc-date='${date}'
-Datom-date='${atomdate}' -Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip
-Dmetabuild.branch=${branch}"
+sh "ant -f
build-${clustername}-temp/build.xml build-javadoc
-Djavadoc.web.root='${apidocurl}' -Dmodules-javadoc-date='${date}'
-Datom-date='${atomdate}' -Dmetabuild.branch=${branch}"
sh "cp -r
build-${clustername}-temp/nbbuild/nbms/** dist${versionnedpath}nbms/"
-
-// apidoc
-
publishToNightlies("/netbeans/apidocs/${env.BRANCH_NAME}","**/WEBZIP.zip")
-
-junit testResults:
"build-${clustername}-temp/nbbuild/build/javadoc/checklinks-errors.xml",
allowEmptyResults:true
+
def netbeansbase =
"build-${clustername}-temp/nbbuild"
sh "ant -f
build-${clustername}-temp/build.xml getallmavencoordinates
-Dmetabuild.branch=${branch}"
withMaven(maven:tooling.myMaven,jdk:tooling.jdktool,publisherStrategy:
'EXPLICIT',mavenLocalRepo: localRepo,options:[artifactsPublisher(disabled:
true)])
-
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-jenkins-lib] branch master updated: Add metadata for NetBeans 18-rc1.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 52d1723 Add metadata for NetBeans 18-rc1.
new 7d810de Merge pull request #86 from neilcsmith-net/nb180
52d1723 is described below
commit 52d1723a9831fcf85631fcb6b2da3854a8a5319f
Author: Neil C Smith
AuthorDate: Tue Apr 18 15:26:17 2023 +0100
Add metadata for NetBeans 18-rc1.
---
meta/netbeansrelease.json | 31 +++
1 file changed, 31 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index 89a389c..851 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -994,6 +994,37 @@
"year": "-"
}
},
+"release180": {
+"position": "27",
+"ant": "ant_latest",
+"jdk": "jdk_11_latest",
+"jdk_apidoc": "https://docs.oracle.com/en/java/javase/11/docs/api/;,
+"maven": "maven_3_latest",
+"versionName": "18",
+"vsixVersion": "18.0.0",
+"mavenversion": "RELEASE180",
+"tlp": "true",
+"apidocurl": "https://bits.netbeans.org/18/javadoc;,
+"update_url":
"https://netbeans.apache.org/nb/updates/18/updates.xml.gz?{$netbeans.hash.code};,
+"plugin_url":
"https://netbeans.apache.org/nb/plugins/18/catalog.xml.gz;,
+"publish_apidoc":"true",
+"milestones": {
+"931459385aafc6c12a637a2687736c55399cdda8": {
+"version": "rc1",
+"position": "1"
+}
+},
+"releasedate": {
+"day": "-",
+"month": "-",
+"year": "-"
+},
+"previousreleasedate": {
+"day": "21",
+"month": "02",
+"year": "2023"
+}
+},
"master": {
"position": "5",
"ant": "ant_latest",
-
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 release180 created (now 931459385a)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch release180 in repository https://gitbox.apache.org/repos/asf/netbeans.git at 931459385a Merge pull request #5837 from mbien/enable-preview-hint-update 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 delivery created (now 931459385a)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git at 931459385a Merge pull request #5837 from mbien/enable-preview-hint-update 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-jenkins-lib] branch master updated: release date for 17 and master previous date updated
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 0945d63 release date for 17 and master previous date updated
0945d63 is described below
commit 0945d635ff4adb5a7383c6888d8f022362662ca1
Author: Eric Barboni
AuthorDate: Tue Apr 18 12:13:23 2023 +0200
release date for 17 and master previous date updated
---
meta/netbeansrelease.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index 08f8a09..89a389c 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -954,9 +954,9 @@
}
},
"releasedate": {
-"day": "-",
-"month": "-",
-"year": "-"
+"day": "21",
+"month": "02",
+"year": "2023"
},
"previousreleasedate": {
"day": "30",
@@ -1014,9 +1014,9 @@
"year": "-"
},
"previousreleasedate": {
-"day": "30",
-"month": "11",
-"year": "2022"
+"day": "21",
+"month": "02",
+"year": "2023"
}
}
}
-
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-jenkins-lib] branch master updated: change credentials
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 688309e change credentials
688309e is described below
commit 688309e37a5ba9d18c1facf7dcf4c94d76a8319d
Author: Eric Barboni
AuthorDate: Tue Apr 18 11:01:31 2023 +0200
change credentials
---
jobs/netbeansnativetlp.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jobs/netbeansnativetlp.groovy b/jobs/netbeansnativetlp.groovy
index 6a4e66b..12b9210 100644
--- a/jobs/netbeansnativetlp.groovy
+++ b/jobs/netbeansnativetlp.groovy
@@ -24,7 +24,7 @@ organizationFolder('NetBeans/netbeans-native-TLP') {
github {
repoOwner('apache')
apiUri('https://api.github.com')
-credentialsId('ASF CI for Github PRs etc')
+credentialsId('ASF_Cloudbees_Jenkins_ci-builds')
traits {
sourceWildcardFilter {
includes('netbeans-native*')
-
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 (434c0b605 -> af87648f0)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git from 434c0b605 Merge pull request #648 from ebarboni/master add f3bdc5cb6 Update .htaccess for NetBeans 18 new af87648f0 Merge pull request #650 from apache/htaccess-nb18 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: netbeans.apache.org/src/content/.htaccess | 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-website] 01/01: Merge pull request #650 from apache/htaccess-nb18
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git commit af87648f060fdad590bd61a4dfbdbe47d1974229 Merge: 434c0b605 f3bdc5cb6 Author: Neil C Smith AuthorDate: Tue Apr 18 09:58:05 2023 +0100 Merge pull request #650 from apache/htaccess-nb18 Update .htaccess for NetBeans 18 netbeans.apache.org/src/content/.htaccess | 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-website] 01/01: Update .htaccess for NetBeans 18
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch htaccess-nb18 in repository https://gitbox.apache.org/repos/asf/netbeans-website.git commit f3bdc5cb694eb789965d56c1411d27f1b5e328af Author: Neil C Smith AuthorDate: Tue Apr 18 09:56:30 2023 +0100 Update .htaccess for NetBeans 18 --- netbeans.apache.org/src/content/.htaccess | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/netbeans.apache.org/src/content/.htaccess b/netbeans.apache.org/src/content/.htaccess index de8a6dfe8..63da31967 100644 --- a/netbeans.apache.org/src/content/.htaccess +++ b/netbeans.apache.org/src/content/.htaccess @@ -35,8 +35,10 @@ Redirect 302 /nb/updates/16/ https://netbeans-vm1.apache.org/uc/16/ Redirect 302 /nb/plugins/16/ https://plugins.netbeans.apache.org/data/16/ Redirect 302 /nb/updates/17/ https://netbeans-vm1.apache.org/uc/17/ Redirect 302 /nb/plugins/17/ https://plugins.netbeans.apache.org/data/17/ +Redirect 302 /nb/updates/18/ https://netbeans-vm1.apache.org/uc/18/ +Redirect 302 /nb/plugins/18/ https://plugins.netbeans.apache.org/data/17/ Redirect 302 /nb/updates/dev/ https://netbeans-vm1.apache.org/uc/dev/ -Redirect 302 /nb/plugins/dev/ https://plugins.netbeans.apache.org/data/16/ +Redirect 302 /nb/plugins/dev/ https://plugins.netbeans.apache.org/data/17/ Redirect 302 /nb/issues_redirect.html https://netbeans.apache.org/participate/report-issue.html Redirect 302 /nb/report-issue https://netbeans.apache.org/participate/report-issue.html #cgi mirror script - 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 htaccess-nb18 created (now f3bdc5cb6)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch htaccess-nb18 in repository https://gitbox.apache.org/repos/asf/netbeans-website.git at f3bdc5cb6 Update .htaccess for NetBeans 18 This branch includes the following new commits: new f3bdc5cb6 Update .htaccess for NetBeans 18 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - 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
