[jira] [Commented] (NETBEANS-2555) When running any test, standard output is not shown in the panel to the right of the test file result.
[ https://issues.apache.org/jira/browse/NETBEANS-2555?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16843322#comment-16843322 ] Mark Flacy commented on NETBEANS-2555: -- >From my perspective, option 2 is fine. While it would be nice to see test >output on the fly, it is sufficient to be able to click on a test that has >finished and see its output at that time. > When running any test, standard output is not shown in the panel to the right > of the test file result. > -- > > Key: NETBEANS-2555 > URL: https://issues.apache.org/jira/browse/NETBEANS-2555 > Project: NetBeans > Issue Type: Improvement > Components: gradle >Affects Versions: 11.0 >Reporter: Mark Flacy >Priority: Minor > > It isn't important that the output is available on the side panel while the > test is running; it is sufficient to me if the output is presented after the > tests have run if I select a specific test on the test panel. > I have a simple project at github that shows the behavior. > [https://github.com/Richard-Cranium/NB11GradleJunitExample] > The head of the master branch is the gradle based project that shows the > misleading behavior. -- This message was sent by Atlassian JIRA (v7.6.3#76005) - 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
[jira] [Commented] (NETBEANS-2417) update Gradle logo/icon
[ https://issues.apache.org/jira/browse/NETBEANS-2417?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16843285#comment-16843285 ] Lou H commented on NETBEANS-2417: - It _would_ be cool to see the elephants. But seems to be two issues: * Five of the icons have smaller icons overlaid (Java coffee and a "start arrows" icon), which seems to "technically" go against branding rules on Gradle's page. Is that an issue? * Since I'm trying a local NB build here anyway, I tried replacing the icons in the two folders mentioned above, but two of them in the New Project dialog are still the old ones (see attached) after a rebuild, so there may be others to replace. (Task and Project folder icons were fine.) Changing to a light theme doesn't help. I could make the change if those two issues are figured out. None of these icons were 32x32, they're all 16x16 or even smaller down to a crazy 8x8. Looks pretty cool though: !nb1.png! > update Gradle logo/icon > --- > > Key: NETBEANS-2417 > URL: https://issues.apache.org/jira/browse/NETBEANS-2417 > Project: NetBeans > Issue Type: Improvement > Components: projects - Gradle >Reporter: Jennifer Strater >Assignee: Jennifer Strater >Priority: Trivial > Attachments: nb1.png > > > Thanks again for adding support for Gradle to Netbeans. > The logo included in Netbeans for Gradle is the pre-2015 Gradleware logo. > We've recently published the newest Gradle elephant logos to > [https://gradle.com/brand/]. I'd be happy to help make this change if that's > easier for everyone. > Please let me know how I should proceed. -- This message was sent by Atlassian JIRA (v7.6.3#76005) - 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
[jira] [Updated] (NETBEANS-2417) update Gradle logo/icon
[ https://issues.apache.org/jira/browse/NETBEANS-2417?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Lou H updated NETBEANS-2417: Attachment: nb1.png > update Gradle logo/icon > --- > > Key: NETBEANS-2417 > URL: https://issues.apache.org/jira/browse/NETBEANS-2417 > Project: NetBeans > Issue Type: Improvement > Components: projects - Gradle >Reporter: Jennifer Strater >Assignee: Jennifer Strater >Priority: Trivial > Attachments: nb1.png > > > Thanks again for adding support for Gradle to Netbeans. > The logo included in Netbeans for Gradle is the pre-2015 Gradleware logo. > We've recently published the newest Gradle elephant logos to > [https://gradle.com/brand/]. I'd be happy to help make this change if that's > easier for everyone. > Please let me know how I should proceed. -- This message was sent by Atlassian JIRA (v7.6.3#76005) - 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: order release by hand
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 2a2c5d8 order release by hand
2a2c5d8 is described below
commit 2a2c5d82a3bb96a038f73ece546f87042836da17
Author: Eric Barboni
AuthorDate: Sun May 19 01:53:19 2019 +0200
order release by hand
---
meta/netbeansrelease.json | 4
1 file changed, 4 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index 6cb9960..9b3327b 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -1,5 +1,6 @@
{
"release90": {
+"position": "1",
"ant": "Ant (latest)",
"jdk": "JDK 1.8 (latest)",
"maven": "Maven 3.3.9",
@@ -14,6 +15,7 @@
}
},
"release100": {
+"position": "2",
"ant": "Ant (latest)",
"jdk": "JDK 1.8 (latest)",
"maven": "Maven 3.3.9",
@@ -28,6 +30,7 @@
}
},
"release110": {
+"position" : "3",
"ant": "Ant (latest)",
"jdk": "JDK 1.8 (latest)",
"maven": "Maven 3.3.9",
@@ -42,6 +45,7 @@
}
},
"master": {
+"position" : "4",
"ant": "Ant (latest)",
"jdk": "JDK 1.8 (latest)",
"maven": "Maven 3.3.9",
-
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 previous release info
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 c6d63ba Add previous release info
c6d63ba is described below
commit c6d63ba1d72a48c0532feb5c31411bb9a529e36b
Author: Eric Barboni
AuthorDate: Sat May 18 21:58:54 2019 +0200
Add previous release info
---
meta/netbeansrelease.json | 28
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index 7527db2..6cb9960 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -6,7 +6,12 @@
"releaseDate": "29 Jul 2018",
"atomreleaseDate": "2018-07-29T12:00:00Z",
"tlp": "false",
-"apidocurl": "https://bits.netbeans.org/9.0/javadoc;
+"apidocurl": "https://bits.netbeans.org/9.0/javadoc;,
+"previousrelease": {
+"day": "03",
+"month": "10",
+"year": "2016"
+}
},
"release100": {
"ant": "Ant (latest)",
@@ -15,7 +20,12 @@
"releaseDate": "27 Dec 2018",
"atomreleaseDate": "2018-12-27T12:00:00Z",
"tlp": "false",
-"apidocurl": "https://bits.netbeans.org/10.0/javadoc;
+"apidocurl": "https://bits.netbeans.org/10.0/javadoc;,
+"previousrelease": {
+"day": "29",
+"month": "07",
+"year": "2018"
+}
},
"release110": {
"ant": "Ant (latest)",
@@ -24,7 +34,12 @@
"releaseDate": "13 Feb 2019",
"atomreleaseDate": "2019-02-13T12:00:00Z",
"tlp": "false",
-"apidocurl": "https://bits.netbeans.org/11.0/javadoc;
+"apidocurl": "https://bits.netbeans.org/11.0/javadoc;,
+"previousrelease": {
+"day": "27",
+"month": "12",
+"year": "2018"
+}
},
"master": {
"ant": "Ant (latest)",
@@ -33,6 +48,11 @@
"releaseDate": "-",
"atomreleaseDate": "-",
"tlp": "true",
-"apidocurl": "https://bits.netbeans.org/dev/javadoc;
+"apidocurl": "https://bits.netbeans.org/dev/javadoc;,
+"previousrelease": {
+"day": "2019",
+"month": "04",
+"year": "04"
+}
}
}
\ No newline at end of file
-
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-tools] branch master updated: remove apidoc generation as it's handled by a jenkins lib now
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-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 2f2f2ac remove apidoc generation as it's handled by a jenkins lib now
2f2f2ac is described below
commit 2f2f2aca87da3fc371ef5aba7f73a43686b3879a
Author: Eric Barboni
AuthorDate: Sat May 18 19:24:10 2019 +0200
remove apidoc generation as it's handled by a jenkins lib now
---
buildscripts/conveniences/generatebuildscript.sh | 26 --
.../generated/Jenkinsfile-apidoc-master.groovy | 55 --
.../generated/Jenkinsfile-apidoc-release100.groovy | 55 --
.../generated/Jenkinsfile-apidoc-release110.groovy | 55 --
.../generated/Jenkinsfile-apidoc-release90.groovy | 55 --
5 files changed, 246 deletions(-)
diff --git a/buildscripts/conveniences/generatebuildscript.sh
b/buildscripts/conveniences/generatebuildscript.sh
index 84e215c..6fb81bc 100644
--- a/buildscripts/conveniences/generatebuildscript.sh
+++ b/buildscripts/conveniences/generatebuildscript.sh
@@ -106,13 +106,11 @@ for arelease in releaseinfo:
jdktool=arelease[3]
maventool=arelease[4]
anttool=arelease[5]
- apidocbuildFile = open
('generated/Jenkinsfile-apidoc-'+arelease[0]+'.groovy',"w")
mavenbuildfile = open ('generated/Jenkinsfile-maven-'
+arelease[0]+'.groovy',"w")
if branch=='refs/heads/master':
buildnumber = ""
else:
buildnumber = arelease[11]
-
write_pipelinebasic(apidocbuildFile,branch,jdktool,maventool,anttool,buildnumber)
write_pipelinebasic(mavenbuildfile ,tag,
jdktool,maventool,anttool,buildnumber)
## needed until we had mavenutil ready
@@ -137,34 +135,11 @@ for arelease in releaseinfo:
mavenbuildfile.write(" }\n")
mavenbuildfile.write(" }\n")
- write_pipelinecheckout(apidocbuildFile,branch,"")
if branch=='refs/heads/master':
write_pipelinecheckout(mavenbuildfile,tag,"")
else:
write_pipelinecheckout(mavenbuildfile,tag,"poll:false")
-## apidoc path do only build for javadoc
## build netbeans all needed for javadoc and nb-repository plugin
- apidocbuildFile.write(" stage('NetBeans Builds') {\n")
- apidocbuildFile.write(" steps {\n")
- apidocbuildFile.write(" dir ('netbeanssources'){\n")
- apidocbuildFile.write(" withAnt(installation:
'"+anttool+"') {\n")
- apidocbuildFile.write(" sh 'ant'\n")
-## master use default parameter
- if branch=='refs/heads/master':
- apidocbuildFile.write(" sh "+'"'+"ant build-javadoc
-Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip"+'"'+"\n")
- else:
- locale.setlocale(locale.LC_ALL,"en_US.utf8")
-##URL for javadoc
- javadocwebroot = arelease[9]
-##date for javadoc and for feed
- javadocdate = arelease[10].strftime('%-d %b %Y')
- atomdate = arelease[10].strftime('%Y-%m-%dT%H:%M:%SZ')
- apidocbuildFile.write(" sh "+'"'+"ant build-javadoc
-Djavadoc.web.root='"+javadocwebroot+"'
-Dmodules-javadoc-date='"+javadocdate+"' -Datom-date='"+atomdate+"'
-Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip"+'"'+"\n")
- apidocbuildFile.write(" }\n")
- apidocbuildFile.write(" }\n")
- apidocbuildFile.write(" archiveArtifacts 'WEBZIP.zip'\n")
- apidocbuildFile.write("}\n")
- apidocbuildFile.write(" }\n")
## build artefacts for maven
mavenbuildfile.write(" stage('NetBeans Builds') {\n")
@@ -193,6 +168,5 @@ for arelease in releaseinfo:
write_pipelineclose(mavenbuildfile)
- write_pipelineclose(apidocbuildFile)
diff --git
a/buildscripts/conveniences/generated/Jenkinsfile-apidoc-master.groovy
b/buildscripts/conveniences/generated/Jenkinsfile-apidoc-master.groovy
deleted file mode 100644
index 2136ccf..000
--- a/buildscripts/conveniences/generated/Jenkinsfile-apidoc-master.groovy
+++ /dev/null
@@ -1,55 +0,0 @@
-// generated by generatebuilscript.sh
-pipeline {
- agent { label 'ubuntu' }
- options {
- buildDiscarder(logRotator(numToKeepStr: '1'))
- disableConcurrentBuilds()
- }
- triggers {
- pollSCM('H/30 * * * * ')
- }
- environment {
- buildnumber = "${BUILD_TIMESTAMP}"
- }
- tools {
- maven 'Maven 3.3.9'
- jdk 'JDK 1.8 (latest)'
- }
- stages {
- stage('Informations') {
- steps {
- slackSend (channel:'#netbeans-builds', message:"STARTED: Job
'${env.JOB_NAME} [${env.BUILD_NUMBER}]' ($env.BUILD_URL), Branch we are
building is : refs/heads/master",color:'#f0f0f0')
- }
- }
- stage('SCM operation') {
- steps {
- dir ('netbeanssources') {
- echo 'Get NetBeans sources'
- checkout([$class: 'GitSCM', branches: [[name:
[jira] [Commented] (NETBEANS-2555) When running any test, standard output is not shown in the panel to the right of the test file result.
[ https://issues.apache.org/jira/browse/NETBEANS-2555?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16843210#comment-16843210 ] Laszlo Kishalmi commented on NETBEANS-2555: --- Well, there is no "easy" solution of this issue. As Gradle swallows the the test output. In order to access those: # We may try to reenable the test output logging by augmenting the build process and tunnel it to the test execution display. # We can try to locate the test report.xml and load the output from there when the suite is finished. # We might read the output.bin files after the test session has been finished, though it requires some Gradle internals. I'd probably go with option 2 though it would be a heuristic result only and no real time per testcase output can be collected just by testsuite. > When running any test, standard output is not shown in the panel to the right > of the test file result. > -- > > Key: NETBEANS-2555 > URL: https://issues.apache.org/jira/browse/NETBEANS-2555 > Project: NetBeans > Issue Type: Improvement > Components: gradle >Affects Versions: 11.0 >Reporter: Mark Flacy >Priority: Minor > > It isn't important that the output is available on the side panel while the > test is running; it is sufficient to me if the output is presented after the > tests have run if I select a specific test on the test panel. > I have a simple project at github that shows the behavior. > [https://github.com/Richard-Cranium/NB11GradleJunitExample] > The head of the master branch is the gradle based project that shows the > misleading behavior. -- This message was sent by Atlassian JIRA (v7.6.3#76005) - 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: use quote for curl
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 ee5b06a use quote for curl
ee5b06a is described below
commit ee5b06a6bf9a5bc80759b2ed6871b1678252aac6
Author: Eric Barboni
AuthorDate: Sat May 18 18:39:54 2019 +0200
use quote for curl
---
vars/asfMainNetBeansBuild.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 1ac92cd..231eb2f 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -40,7 +40,7 @@ def call(Map params = [:]) {
steps{
script {
// test if we can do that
-sh 'curl
https://gitbox.apache.org/repos/asf?p=netbeans-jenkins-lib.git;a=blob_plain;f=meta/netbeansrelease.json
-o netbeansrelease.json'
+sh 'curl
"https://gitbox.apache.org/repos/asf?p=netbeans-jenkins-lib.git;a=blob_plain;f=meta/netbeansrelease.json;
-o netbeansrelease.json'
def releaseData = readJSON file: 'netbeansrelease.json'
sh 'rm -f netbeansrelease.json'
myAnt = releaseData[env.BRANCH_NAME].ant;
-
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
[jira] [Resolved] (NETBEANS-2550) NetBeans 11 does not show Gradle junit output
[ https://issues.apache.org/jira/browse/NETBEANS-2550?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Laszlo Kishalmi resolved NETBEANS-2550. --- Resolution: Duplicate I mark this duplicated in favor of NETBEANS-2555, as this issue has been reported as a part of NETBEANS-2527. I requested the reporter to create a separate improvement issue for that. I'm going to provide details there. > NetBeans 11 does not show Gradle junit output > - > > Key: NETBEANS-2550 > URL: https://issues.apache.org/jira/browse/NETBEANS-2550 > Project: NetBeans > Issue Type: Bug > Components: gradle, projects - Gradle >Affects Versions: 11.0 >Reporter: Andrea Paternesi >Priority: Major > > When launching test (Junit) Netbeans does not show any output. It does not > show either the System.out.println() nor the Log output in the consolle. > This is a serious problem. -- This message was sent by Atlassian JIRA (v7.6.3#76005) - 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: Use gitbox url for json
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 e90e372 Use gitbox url for json
e90e372 is described below
commit e90e372dfff9d84d7c2da9598bb9563d2e0afb66
Author: Eric Barboni
AuthorDate: Sat May 18 18:29:35 2019 +0200
Use gitbox url for json
---
vars/asfMainNetBeansBuild.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 6a825b4..1ac92cd 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -40,7 +40,7 @@ def call(Map params = [:]) {
steps{
script {
// test if we can do that
-sh 'curl
https://github.com/apache/netbeans-jenkins-lib/meta/netbeansrelease.json -o
netbeansrelease.json'
+sh 'curl
https://gitbox.apache.org/repos/asf?p=netbeans-jenkins-lib.git;a=blob_plain;f=meta/netbeansrelease.json
-o netbeansrelease.json'
def releaseData = readJSON file: 'netbeansrelease.json'
sh 'rm -f netbeansrelease.json'
myAnt = releaseData[env.BRANCH_NAME].ant;
-
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
[jira] [Updated] (NETBEANS-2527) Junit test results when run via gradle are incomplete.
[ https://issues.apache.org/jira/browse/NETBEANS-2527?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] ASF GitHub Bot updated NETBEANS-2527: - Labels: pull-request-available (was: ) > Junit test results when run via gradle are incomplete. > -- > > Key: NETBEANS-2527 > URL: https://issues.apache.org/jira/browse/NETBEANS-2527 > Project: NetBeans > Issue Type: Bug > Components: projects - Gradle >Affects Versions: 11.0 > Environment: Product Version: Apache NetBeans IDE 11.0 (Build > incubator-netbeans-release-404-on-20190319) > Java: 11.0.2; OpenJDK 64-Bit Server VM 11.0.2+9 > Runtime: OpenJDK Runtime Environment 11.0.2+9 > System: Mac OS X version 10.14.4 running on x86_64; UTF-8; en_US (nb) > Product Version: Apache NetBeans IDE 11.0 (Build > incubator-netbeans-release-404-on-20190319) > Java: 11.0.1; OpenJDK 64-Bit Server VM 11.0.1+13 > Runtime: OpenJDK Runtime Environment 11.0.1+13 > System: Linux version 4.4.172 running on amd64; UTF-8; en_US (nb) >Reporter: Mark Flacy >Assignee: Laszlo Kishalmi >Priority: Major > Labels: pull-request-available > Attachments: Gradle_false_positive.png, Maven_true_failures.png > > > When running the test task, the Gradle Test Run window shows ONLY ONE test > file result. All other test results are invisible. > > I have a simple project at github that shows the behavior. > [https://github.com/Richard-Cranium/NB11GradleJunitExample] > The head of the master branch is the gradle based project that shows the > misleading behavior. > The head of the maven-version branch has the same source files, but > configured to use maven instead. > The maven project's behavior when _Run -> Test Project_ is selected is what I > would expect from the gradle project's behavior when _Run -> Test Project_ is > selected against it. See the attached images. -- This message was sent by Atlassian JIRA (v7.6.3#76005) - 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 Release informations and adjust build for it
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 4b9ce6e Add Release informations and adjust build for it
4b9ce6e is described below
commit 4b9ce6e5d62b949e87f8c444c4eaa7e5c8ea0f84
Author: Eric Barboni
AuthorDate: Sat May 18 18:24:33 2019 +0200
Add Release informations and adjust build for it
---
README | 19 +++
meta/README | 22 ++
meta/netbeansrelease.json| 38 ++
vars/asfMainNetBeansBuild.groovy | 25 ++---
4 files changed, 89 insertions(+), 15 deletions(-)
diff --git a/README b/README
index 7af3655..fbfe60f 100644
--- a/README
+++ b/README
@@ -1 +1,20 @@
+
+
Shared Jenkins pipeline for Apache NetBeans Maven related builds
diff --git a/meta/README b/meta/README
new file mode 100644
index 000..fb3ddaa
--- /dev/null
+++ b/meta/README
@@ -0,0 +1,22 @@
+
+
+Json file containing release information for Apache NetBeans.
+
+Json cannot contains ASF Header
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
new file mode 100644
index 000..7527db2
--- /dev/null
+++ b/meta/netbeansrelease.json
@@ -0,0 +1,38 @@
+{
+"release90": {
+"ant": "Ant (latest)",
+"jdk": "JDK 1.8 (latest)",
+"maven": "Maven 3.3.9",
+"releaseDate": "29 Jul 2018",
+"atomreleaseDate": "2018-07-29T12:00:00Z",
+"tlp": "false",
+"apidocurl": "https://bits.netbeans.org/9.0/javadoc;
+},
+"release100": {
+"ant": "Ant (latest)",
+"jdk": "JDK 1.8 (latest)",
+"maven": "Maven 3.3.9",
+"releaseDate": "27 Dec 2018",
+"atomreleaseDate": "2018-12-27T12:00:00Z",
+"tlp": "false",
+"apidocurl": "https://bits.netbeans.org/10.0/javadoc;
+},
+"release110": {
+"ant": "Ant (latest)",
+"jdk": "JDK 1.8 (latest)",
+"maven": "Maven 3.3.9",
+"releaseDate": "13 Feb 2019",
+"atomreleaseDate": "2019-02-13T12:00:00Z",
+"tlp": "false",
+"apidocurl": "https://bits.netbeans.org/11.0/javadoc;
+},
+"master": {
+"ant": "Ant (latest)",
+"jdk": "JDK 1.8 (latest)",
+"maven": "Maven 3.3.9",
+"releaseDate": "-",
+"atomreleaseDate": "-",
+"tlp": "true",
+"apidocurl": "https://bits.netbeans.org/dev/javadoc;
+}
+}
\ No newline at end of file
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 54dc976..6a825b4 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -21,7 +21,7 @@
// this script is taken from olamy works on archiva-jenkins-lib for the Apache
Archiva project
def call(Map params = [:]) {
-// variable needed for apidoc
+// variable needed for apidoc
def myAnt = ""
def apidocurl = ""
def date = ""
@@ -40,26 +40,21 @@ def call(Map params = [:]) {
steps{
script {
// test if we can do that
-sh 'curl
https://netbeans.apache.org/community/index.html -o test.html'
-echo "curl over"
-// write a custom json with valid data
-writeFile(file: 'test.json', text: '{"release90":
{"ant": "Ant (latest)","jdk": "JDK 1.8 (latest)",
"maven": "Maven 3.3.9","releaseDate": "29 Jul 2018",
"atomreleaseDate": "2018-07-29T12:00:00Z","tlp": "false",
"apidocurl": "https://bits.netbeans.org/9.0/javadoc;
},"release100": {"ant": "Ant (latest)","jdk": "JDK 1.8
(latest)","maven": "Maven 3.3.9", [...]
-
-def foo = readJSON file: 'test.json'
-sh 'rm -f test.json'
-
-myAnt = foo[env.BRANCH_NAME].ant;
-apidocurl = foo[env.BRANCH_NAME].apidocurl
-date = foo[env.BRANCH_NAME].releaseDate
-atomdate = foo[env.BRANCH_NAME].atomreleaseDate
-jdktool = foo[env.BRANCH_NAME].jdk
+sh 'curl
https://github.com/apache/netbeans-jenkins-lib/meta/netbeansrelease.json -o
netbeansrelease.json'
+def releaseData = readJSON file: 'netbeansrelease.json'
+sh 'rm -f netbeansrelease.json'
+myAnt = releaseData[env.BRANCH_NAME].ant;
+apidocurl = releaseData[env.BRANCH_NAME].apidocurl
+date = releaseData[env.BRANCH_NAME].releaseDate
+atomdate =
[netbeans-tools] branch master updated: Tutorials
This is an automated email from the ASF dual-hosted git repository.
vieiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 3049f26 Tutorials
3049f26 is described below
commit 3049f26ce5bcd7adb5f59c54f2c55c4a585b8ca0
Author: vieiro
AuthorDate: Sat May 18 16:32:47 2019 +0200
Tutorials
---
.gitignore | 3 +
tutorials-convert/README.md| 18 +
tutorials-convert/nbactions.xml| 66 +++
tutorials-convert/pom.xml | 95
.../tools/tutorials/AsciidocPostProcessor.java | 240 +
.../tutorials/CustomAsciiDocDocumentBuilder.java | 544 +
...CustomAsciiDocDocumentBuilderWithoutTables.java | 47 ++
.../netbeans/tools/tutorials/ExternalLinksMap.java | 81 +++
.../netbeans/tools/tutorials/HTMLConverter.java| 268 ++
.../org/netbeans/tools/tutorials/Language.java | 66 +++
.../tools/tutorials/LocalizedTutorialSection.java | 91
.../tools/tutorials/TutorialsBundle.properties | 46 ++
.../tutorials/TutorialsBundle_es_CA.properties | 31 ++
.../tools/tutorials/TutorialsBundle_ja.properties | 31 ++
.../tutorials/TutorialsBundle_pt_BR.properties | 31 ++
.../tools/tutorials/TutorialsBundle_ru.properties | 31 ++
.../tutorials/TutorialsBundle_zh_CN.properties | 31 ++
.../tools/tutorials/index-template.mustache| 33 ++
.../tools/tutorials/section-template.mustache | 27 +
19 files changed, 1780 insertions(+)
diff --git a/.gitignore b/.gitignore
index 08e92ac..f7eea08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,6 @@
/html-convert/target/**
/html-convert/tutorials-asciidoc/**
/html-convert/external-links.txt
+/tutorials-convert/tutorials-asciidoc/**
+/tutorials-convert/target**
+/tutorials-convert/external-links.txt
diff --git a/tutorials-convert/README.md b/tutorials-convert/README.md
new file mode 100644
index 000..80bba1b
--- /dev/null
+++ b/tutorials-convert/README.md
@@ -0,0 +1,18 @@
+# tutorials-convert
+
+This tool reads the NetBeans tutorials in HTML format and converts them to
AsciiDoc format.
+
+The NetBeans platform tutorials can be found in
https://svn.netbeans.org/svn/platform~platform-content/trunk/tutorials/
+
+The NetBeans platform tutorial images can be found in
https://svn.netbeans.org/svn/platform~platform-content/trunk/images/
+
+
+## Getting started
+
+1. Check out the tutorials from SVN above in a directory "X".
+2. Check out the images from SVN above in directory "Y".
+2. Run `mvn package exec:java X Y`, where "X" is the directory in the previous
step.
+4. Open the `tutorials-asciidoc` directory to see the results.
+5. See the generated "external-links.txt" file to see referenced external
links.
+
+NOTE: This tool is expected to be run once, after that manual revision of
generated files should be done.
diff --git a/tutorials-convert/nbactions.xml b/tutorials-convert/nbactions.xml
new file mode 100644
index 000..24261f4
--- /dev/null
+++ b/tutorials-convert/nbactions.xml
@@ -0,0 +1,66 @@
+
+
+
+
+run
+
+jar
+
+
+process-classes
+exec:java
+
+
+C:\Users\avieiro\Downloads\NETBEANS\
+java
+
+
+
+debug
+
+jar
+
+
+process-classes
+org.codehaus.mojo:exec-maven-plugin:1.5.0:exec
+
+
+
-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}
-classpath %classpath org.netbeans.tools.tutorials.HTMLConverter
C:\Users\avieiro\Downloads\NETBEANS
+java
+true
+
+
+
+profile
+
+jar
+
+
+process-classes
+org.codehaus.mojo:exec-maven-plugin:1.5.0:exec
+
+
+-classpath %classpath
org.netbeans.tools.tutorials.HTMLConverter
C:\Users\avieiro\Downloads\NETBEANS
+java
+
+
+
diff --git a/tutorials-convert/pom.xml b/tutorials-convert/pom.xml
new file mode 100644
index 000..671d209
--- /dev/null
+++ b/tutorials-convert/pom.xml
@@ -0,0 +1,95 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+org.netbeans.tools
+tutorials-convert
+1.0-SNAPSHOT
+jar
+
+UTF-8
+1.8
+1.8
+
+
+
+
+org.eclipse.mylyn.docs
+org.eclipse.mylyn.wikitext
+
