This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 c80c33b -'Mavenize' TestNG and upgrade from 6.8.1 to 6.14.3 -Add
jcommander dependency and use a working javadoc version -Fix Unit tests. By
@matthiasblaesing
new 05684bb Merge pull request #2350 from pepness/testng-6.14.3
c80c33b is described below
commit c80c33bcf5fd6afa3f5a6cda28793f356d2fcea7
Author: Jose Contreras <[email protected]>
AuthorDate: Sun Aug 30 17:26:57 2020 -0500
-'Mavenize' TestNG and upgrade from 6.8.1 to 6.14.3
-Add jcommander dependency and use a working javadoc version
-Fix Unit tests. By @matthiasblaesing
---
java/java.j2seproject/nbproject/project.properties | 5 +-
.../modules/java/j2seproject/BuildImplTest.java | 7 ++-
java/testng.ant/nbproject/project.properties | 2 +-
java/testng.maven/nbproject/project.properties | 1 +
java/testng.ui/nbproject/project.properties | 2 +-
.../modules/testng/ui/wizards/Bundle.properties | 2 +-
java/testng/nbproject/project.properties | 1 +
.../org/netbeans/modules/testng/Bundle.properties | 2 +-
.../netbeans/modules/testng/resources/testng.xml | 7 +--
platform/libs.testng/external/binaries-list | 5 +-
...ist-license.txt => jcommander-1.78-license.txt} | 53 ++++------------------
...-dist-license.txt => testng-6.14.3-license.txt} | 4 +-
....1-dist-notice.txt => testng-6.14.3-notice.txt} | 0
platform/libs.testng/manifest.mf | 2 +-
platform/libs.testng/nbproject/project.properties | 11 +++--
platform/libs.testng/nbproject/project.xml | 8 +++-
16 files changed, 47 insertions(+), 65 deletions(-)
diff --git a/java/java.j2seproject/nbproject/project.properties
b/java/java.j2seproject/nbproject/project.properties
index 8761d2c..ed98910 100644
--- a/java/java.j2seproject/nbproject/project.properties
+++ b/java/java.j2seproject/nbproject/project.properties
@@ -26,8 +26,9 @@ javadoc.apichanges=${basedir}/apichanges.xml
test.unit.run.cp.extra=${tools.jar}
test-unit-sys-prop.test.bridge.jar=${netbeans.dest.dir}/${nb.cluster.extide.dir}/ant/nblib/bridge.jar
test-unit-sys-prop.test.ant.home=${netbeans.dest.dir}/${nb.cluster.extide.dir}/ant
-test-unit-sys-prop.test.junit.jar=${nb_all}/libs.junit4/external/junit-4.12.jar
-test-unit-sys-prop.test.testng.jar=${nb_all}/libs.testng/external/testng-6.8.1-dist.jar
+test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.12.jar
+test-unit-sys-prop.test.testng.jar=${nb_all}/platform/libs.testng/external/testng-6.14.3.jar
+test-unit-sys-prop.test.jcommander.jar=${nb_all}/platform/libs.testng/external/jcommander-1.78.jar
extra.module.files=ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
jnlp.indirect.jars=ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
diff --git
a/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
b/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
index 7ceee3e..e0e79aa 100644
---
a/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
+++
b/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
@@ -67,6 +67,7 @@ public final class BuildImplTest extends NbTestCase {
private File junitJar;
private File testNGJar;
+ private File jcommanderJar;
@Override protected Level logLevel() {
return Level.FINE;
@@ -91,6 +92,10 @@ public final class BuildImplTest extends NbTestCase {
assertNotNull("must set test.testng.jar", tngJarProp);
testNGJar = new File(tngJarProp);
assertTrue("file " + testNGJar + " exists", testNGJar.isFile());
+ String jcommanderJarProp = System.getProperty("test.jcommander.jar");
+ assertNotNull("must set test.jcommander.jar", jcommanderJarProp);
+ jcommanderJar = new File(jcommanderJarProp);
+ assertTrue("file " + jcommanderJar + " exists",
jcommanderJar.isFile());
MockLookup.setLayersAndInstances(new IOP(), new IFL());
}
@@ -142,7 +147,7 @@ public final class BuildImplTest extends NbTestCase {
private Properties getProperties() {
Properties p = new Properties();
- p.setProperty("libs.junit.classpath", testNGJar.getAbsolutePath() +
":" + junitJar.getAbsolutePath());
+ p.setProperty("libs.junit.classpath", testNGJar.getAbsolutePath() +
":" + junitJar.getAbsolutePath()+ ":" + jcommanderJar.getAbsolutePath());
return p;
}
diff --git a/java/testng.ant/nbproject/project.properties
b/java/testng.ant/nbproject/project.properties
index 8aeb9dd..8ea5f62 100644
--- a/java/testng.ant/nbproject/project.properties
+++ b/java/testng.ant/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 -Xlint:-serial
nbm.homepage=http://wiki.netbeans.org/TestNG
nbm.module.author=Lukas Jungmann
diff --git a/java/testng.maven/nbproject/project.properties
b/java/testng.maven/nbproject/project.properties
index 12e6e4a..8ea5f62 100644
--- a/java/testng.maven/nbproject/project.properties
+++ b/java/testng.maven/nbproject/project.properties
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
nbm.homepage=http://wiki.netbeans.org/TestNG
nbm.module.author=Lukas Jungmann
diff --git a/java/testng.ui/nbproject/project.properties
b/java/testng.ui/nbproject/project.properties
index 375b088..26aa41b 100644
--- a/java/testng.ui/nbproject/project.properties
+++ b/java/testng.ui/nbproject/project.properties
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
requires.nb.javac=true
diff --git
a/java/testng.ui/src/org/netbeans/modules/testng/ui/wizards/Bundle.properties
b/java/testng.ui/src/org/netbeans/modules/testng/ui/wizards/Bundle.properties
index ee21b2f..c1da75a 100644
---
a/java/testng.ui/src/org/netbeans/modules/testng/ui/wizards/Bundle.properties
+++
b/java/testng.ui/src/org/netbeans/modules/testng/ui/wizards/Bundle.properties
@@ -28,4 +28,4 @@ LBL_GoToDeclaration=Go to Declaration
goto_source_source_not_found=Source file for {0} not found.
# library name
-testng=TestNG 6.8.1
+testng=TestNG 6.14.3
diff --git a/java/testng/nbproject/project.properties
b/java/testng/nbproject/project.properties
index 62ae424..362ab1a 100644
--- a/java/testng/nbproject/project.properties
+++ b/java/testng/nbproject/project.properties
@@ -16,6 +16,7 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
nbm.homepage=http://wiki.netbeans.org/TestNG
nbm.module.author=Lukas Jungmann
requires.nb.javac=true
diff --git a/java/testng/src/org/netbeans/modules/testng/Bundle.properties
b/java/testng/src/org/netbeans/modules/testng/Bundle.properties
index 15ec771..c5fc098 100644
--- a/java/testng/src/org/netbeans/modules/testng/Bundle.properties
+++ b/java/testng/src/org/netbeans/modules/testng/Bundle.properties
@@ -28,5 +28,5 @@ LBL_GoToDeclaration=Go to Declaration
goto_source_source_not_found=Source file for {0} not found.
# library name
-testng=TestNG 6.8.1
+testng=TestNG 6.14.3
diff --git a/java/testng/src/org/netbeans/modules/testng/resources/testng.xml
b/java/testng/src/org/netbeans/modules/testng/resources/testng.xml
index 615e0c8..f0eea77 100644
--- a/java/testng/src/org/netbeans/modules/testng/resources/testng.xml
+++ b/java/testng/src/org/netbeans/modules/testng/resources/testng.xml
@@ -26,17 +26,18 @@
<localizing-bundle>org.netbeans.modules.testng.Bundle</localizing-bundle>
<volume>
<type>classpath</type>
-
<resource>jar:nbinst://org.netbeans.libs.testng/modules/ext/testng-6.8.1-dist.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.testng/modules/ext/testng-6.14.3.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.testng/modules/ext/jcommander-1.78.jar!/</resource>
</volume>
<volume>
<type>javadoc</type>
-
<resource>jar:nbinst://org.netbeans.libs.testng/docs/testng-6.8.1-javadoc.zip!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.testng/docs/testng-6.13.1-javadoc.jar!/</resource>
</volume>
<properties>
<!-- please check with [email protected] before/after updating this
or "classpath" section -->
<property>
<name>maven-dependencies</name>
- <value>org.testng:testng:6.8.1:jar</value>
+ <value>org.testng:testng:6.14.3:jar</value>
</property>
</properties>
</library>
diff --git a/platform/libs.testng/external/binaries-list
b/platform/libs.testng/external/binaries-list
index 109cd3a..6f81672 100644
--- a/platform/libs.testng/external/binaries-list
+++ b/platform/libs.testng/external/binaries-list
@@ -14,5 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-AC97B566699146713B3CF0ABC226B5C08EF7CF33 testng-6.8.1-dist.jar
-AF022CBCACD8CBFCF946816441D1E7568D817745 testng-6.8.1-javadoc.zip
+D24515DC253E77E54B73DF97E1FB2EB7FAF34FDD org.testng:testng:6.14.3
+A3927DE9BD6F351429BCF763712C9890629D8F51 com.beust:jcommander:1.78
+650BE4AF41D397EB818393068E03C595576CF1B9 org.testng:testng:6.13.1:javadoc
diff --git a/platform/libs.testng/external/testng-6.8.1-dist-license.txt
b/platform/libs.testng/external/jcommander-1.78-license.txt
similarity index 87%
copy from platform/libs.testng/external/testng-6.8.1-dist-license.txt
copy to platform/libs.testng/external/jcommander-1.78-license.txt
index b9cb045..0d7cadb 100644
--- a/platform/libs.testng/external/testng-6.8.1-dist-license.txt
+++ b/platform/libs.testng/external/jcommander-1.78-license.txt
@@ -1,45 +1,12 @@
-Name: TestNG
-Version: 6.8.1
-Description: Java testing framework.
-License: Apache-2.0+MIT+testng
-Origin: TestNG
-URL: http://testng.org/doc/download.html
-Files: testng-6.8.1-dist.jar, testng-6.8.1-javadoc.zip
-
-Parts of this work are licensed:
-
-The MIT License (MIT)
-
-Copyright 2011, John Resig
-Dual licensed under the MIT or GPL Version 2 licenses.
-http://jquery.org/license
-
-Includes Sizzle.js
-http://sizzlejs.com/
-Copyright 2011, The Dojo Foundation
-Released under the MIT, BSD, and GPL Licenses.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Parts of this work are licensed:
-
- Apache License
+Name: JCommander
+Version: 1.78
+Description: Parse command line parameters
+License: Apache-2.0
+Origin: Cédric Beust
+URL: https://jcommander.org
+Files: jcommander-1.78.jar
+
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -240,5 +207,3 @@ Parts of this work are licensed:
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.
-
-
diff --git a/platform/libs.testng/external/testng-6.8.1-dist-license.txt
b/platform/libs.testng/external/testng-6.14.3-license.txt
similarity index 99%
rename from platform/libs.testng/external/testng-6.8.1-dist-license.txt
rename to platform/libs.testng/external/testng-6.14.3-license.txt
index b9cb045..46e8863 100644
--- a/platform/libs.testng/external/testng-6.8.1-dist-license.txt
+++ b/platform/libs.testng/external/testng-6.14.3-license.txt
@@ -1,10 +1,10 @@
Name: TestNG
-Version: 6.8.1
+Version: 6.14.3
Description: Java testing framework.
License: Apache-2.0+MIT+testng
Origin: TestNG
URL: http://testng.org/doc/download.html
-Files: testng-6.8.1-dist.jar, testng-6.8.1-javadoc.zip
+Files: testng-6.14.3.jar, testng-6.13.1-javadoc.jar
Parts of this work are licensed:
diff --git a/platform/libs.testng/external/testng-6.8.1-dist-notice.txt
b/platform/libs.testng/external/testng-6.14.3-notice.txt
similarity index 100%
rename from platform/libs.testng/external/testng-6.8.1-dist-notice.txt
rename to platform/libs.testng/external/testng-6.14.3-notice.txt
diff --git a/platform/libs.testng/manifest.mf b/platform/libs.testng/manifest.mf
index f223db8..2f503f8 100644
--- a/platform/libs.testng/manifest.mf
+++ b/platform/libs.testng/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.libs.testng/1
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/testng/Bundle.properties
diff --git a/platform/libs.testng/nbproject/project.properties
b/platform/libs.testng/nbproject/project.properties
index 4664aa4..acf60e8 100644
--- a/platform/libs.testng/nbproject/project.properties
+++ b/platform/libs.testng/nbproject/project.properties
@@ -15,11 +15,14 @@
# specific language governing permissions and limitations
# under the License.
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
is.autoload=true
-release.external/testng-6.8.1-dist.jar=modules/ext/testng-6.8.1-dist.jar
-release.external/testng-6.8.1-javadoc.zip=docs/testng-6.8.1-javadoc.zip
+release.external/testng-6.14.3.jar=modules/ext/testng-6.14.3.jar
+release.external/jcommander-1.78.jar=modules/ext/jcommander-1.78.jar
+release.external/testng-6.13.1-javadoc.jar=docs/testng-6.13.1-javadoc.jar
sigtest.skip.check=true
sigtest.fail.on.error=false
jnlp.indirect.jars=\
- docs/testng-6.8.1-javadoc.zip,\
- modules/ext/testng-6.8.1-dist.jar
+ docs/testng-6.13.1-javadoc.jar,\
+ modules/ext/testng-6.14.3.jar
diff --git a/platform/libs.testng/nbproject/project.xml
b/platform/libs.testng/nbproject/project.xml
index 337718c..56922cd 100644
--- a/platform/libs.testng/nbproject/project.xml
+++ b/platform/libs.testng/nbproject/project.xml
@@ -37,8 +37,12 @@
<package>org.testng.xml</package>
</public-packages>
<class-path-extension>
-
<runtime-relative-path>ext/testng-6.8.1-dist.jar</runtime-relative-path>
- <binary-origin>external/testng-6.8.1-dist.jar</binary-origin>
+
<runtime-relative-path>ext/testng-6.14.3.jar</runtime-relative-path>
+ <binary-origin>external/testng-6.14.3.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+
<runtime-relative-path>ext/jcommander-1.78.jar</runtime-relative-path>
+ <binary-origin>external/jcommander-1.78.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
