This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 427251a Update JUnit to version 4.13.1 427251a is described below commit 427251ac455acec90206e4fd43bffa91661880ef Author: Hector Espert <hectorespertpa...@gmail.com> AuthorDate: Fri Oct 16 17:16:27 2020 +0200 Update JUnit to version 4.13.1 --- java/java.j2seproject/nbproject/project.properties | 2 +- java/java.project.ui/nbproject/project.properties | 2 +- .../test/qa-functional/src/projects/LibrariesTest.java | 4 ++-- java/java.project/nbproject/project.properties | 2 +- java/performance/threaddemo/build.properties | 2 +- nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 1 - nbbuild/build.properties | 2 +- nbbuild/installer/engine/nbproject/project.properties | 4 ++-- nbbuild/installer/test/nbproject/project.properties | 4 ++-- .../unit/src/org/netbeans/nbbuild/FixTestDependencies.properties | 2 +- .../src/org/netbeans/nbbuild/FixTestDependenciesPass.properties | 2 +- nbi/engine/nbproject/project.properties | 4 ++-- platform/junitlib/external/binaries-list | 4 ++-- .../external/{junit-4.12-license.txt => junit-4.13.1-license.txt} | 6 +++--- platform/junitlib/nbproject/project.properties | 8 ++++---- platform/junitlib/src/org/netbeans/modules/junitlib/junit_4.xml | 8 ++++---- platform/libs.junit4/external/binaries-list | 2 +- .../external/{junit-4.12-license.txt => junit-4.13.1-license.txt} | 4 ++-- platform/libs.junit4/nbproject/project.properties | 2 +- platform/libs.junit4/nbproject/project.xml | 4 ++-- websvccommon/websvc.saas.codegen/nbproject/project.properties | 2 +- 21 files changed, 35 insertions(+), 36 deletions(-) diff --git a/java/java.j2seproject/nbproject/project.properties b/java/java.j2seproject/nbproject/project.properties index 58fd2bb..200ab0d 100644 --- a/java/java.j2seproject/nbproject/project.properties +++ b/java/java.j2seproject/nbproject/project.properties @@ -26,7 +26,7 @@ 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}/platform/libs.junit4/external/junit-4.12.jar +test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.13.1.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 diff --git a/java/java.project.ui/nbproject/project.properties b/java/java.project.ui/nbproject/project.properties index db153cb..0752804 100644 --- a/java/java.project.ui/nbproject/project.properties +++ b/java/java.project.ui/nbproject/project.properties @@ -29,7 +29,7 @@ test.unit.run.cp.extra=${tools.jar} test-unit-sys-prop.test.bridge.jar=${o.apache.tools.ant.module.dir}/ant/nblib/bridge.jar # May be overridden to e.g. test against a different version of Ant: test-unit-sys-prop.test.ant.home=${o.apache.tools.ant.module.dir}/ant -test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.12.jar +test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.13.1.jar test.config.stableBTD.includes=**/*Test.class test.config.stableBTD.excludes=\ diff --git a/java/java.project.ui/test/qa-functional/src/projects/LibrariesTest.java b/java/java.project.ui/test/qa-functional/src/projects/LibrariesTest.java index 32c67e1..85503df 100644 --- a/java/java.project.ui/test/qa-functional/src/projects/LibrariesTest.java +++ b/java/java.project.ui/test/qa-functional/src/projects/LibrariesTest.java @@ -182,8 +182,8 @@ public class LibrariesTest extends JellyTestCase { set.add("jar:nbinst://org.netbeans.modules.web.struts/modules/ext/struts/struts.jar!/"); librariesUrls.put("struts", set); set = new TreeSet<String>(); - set.add("jar:nbinst://org.netbeans.modules.junit/docs/junit-4.12-javadoc.jar!/"); - set.add("jar:nbinst://org.netbeans.modules.junit/modules/ext/junit-4.12.jar!/"); + set.add("jar:nbinst://org.netbeans.modules.junit/docs/junit-4.13.1-javadoc.jar!/"); + set.add("jar:nbinst://org.netbeans.modules.junit/modules/ext/junit-4.13.1.jar!/"); librariesUrls.put("junit", set); set = new TreeSet<String>(); set.add("jar:nbinst://org.netbeans.modules.java.j2seproject/ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar!/"); diff --git a/java/java.project/nbproject/project.properties b/java/java.project/nbproject/project.properties index b54d297..e02e407 100644 --- a/java/java.project/nbproject/project.properties +++ b/java/java.project/nbproject/project.properties @@ -28,7 +28,7 @@ test.unit.run.cp.extra=${tools.jar} test-unit-sys-prop.test.bridge.jar=${o.apache.tools.ant.module.dir}/ant/nblib/bridge.jar # May be overridden to e.g. test against a different version of Ant: test-unit-sys-prop.test.ant.home=${o.apache.tools.ant.module.dir}/ant -test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.12.jar +test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.13.1.jar test.config.stableBTD.includes=**/*Test.class test.config.stableBTD.excludes=\ diff --git a/java/performance/threaddemo/build.properties b/java/performance/threaddemo/build.properties index e3abe9e..fee8ff0 100644 --- a/java/performance/threaddemo/build.properties +++ b/java/performance/threaddemo/build.properties @@ -43,7 +43,7 @@ registry.jar=${netbeans.dest.dir}/extra/modules/org-netbeans-modules-registry.ja #Spin.jar=???/spin-1.1/Spin.jar # XXX could also try to retrieve http://internap.dl.sourceforge.net/sourceforge/spin/spin-1.4.zip -junit.jar=${nbroot}/libs.junit4/external/junit-4.12.jar +junit.jar=${nbroot}/libs.junit4/external/junit-4.13.1.jar # Root directory of the file browsers: testdir=${java.io.tmpdir} diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 924751e..8fd9857 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -63,7 +63,6 @@ extide/gradle/external/gradle-4.10.2-bin.zip ide/o.apache.commons.lang/external/ extide/gradle/external/gradle-4.10.2-bin.zip java/maven.embedder/external/apache-maven-3.6.3-bin.zip extide/gradle/external/gradle-4.10.2-bin.zip platform/api.annotations.common/external/jsr305-3.0.2.jar extide/gradle/external/gradle-4.10.2-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar -extide/gradle/external/gradle-4.10.2-bin.zip platform/libs.junit4/external/junit-4.12.jar extide/gradle/external/gradle-4.10.2-bin.zip java/maven/external/aether-api-1.13.1.jar # These are the endorsed version of the javaee apis and create libraries, so they are better kept separate diff --git a/nbbuild/build.properties b/nbbuild/build.properties index 64e6543..17f8c10 100644 --- a/nbbuild/build.properties +++ b/nbbuild/build.properties @@ -54,7 +54,7 @@ resolve.clean.dependencies=false stop.when.clean.error=true test.unit.cp=\ - ../platform/libs.junit4/external/junit-4.12.jar:\ + ../platform/libs.junit4/external/junit-4.13.1.jar:\ netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:\ netbeans/harness/modules/org-netbeans-insane.jar:\ ${ant.home}/lib/ant-junit.jar:\ diff --git a/nbbuild/installer/engine/nbproject/project.properties b/nbbuild/installer/engine/nbproject/project.properties index d2e8199..2654f2f 100644 --- a/nbbuild/installer/engine/nbproject/project.properties +++ b/nbbuild/installer/engine/nbproject/project.properties @@ -46,7 +46,7 @@ dist.jar=${dist.dir}/nbi-engine.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.junit-4.12.jar=../../libs.junit4/external/junit-4.12.jar +file.reference.junit-4.13.1.jar=../../libs.junit4/external/junit-4.13.1.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=false @@ -65,7 +65,7 @@ javac.target=1.6 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir}:\ - ${file.reference.junit-4.12.jar} + ${file.reference.junit-4.13.1.jar} javac.test.modulepath=\ ${javac.modulepath} javadoc.additionalparam= diff --git a/nbbuild/installer/test/nbproject/project.properties b/nbbuild/installer/test/nbproject/project.properties index 0ac6d80..59ade60 100644 --- a/nbbuild/installer/test/nbproject/project.properties +++ b/nbbuild/installer/test/nbproject/project.properties @@ -40,7 +40,7 @@ excludes= file.reference.build-classes=../../jemmy/build/classes/ file.reference.build-classes-1=../../nbjunit/build/classes/ file.reference.build-classes-2=../../junit/build/classes/ -file.reference.junit-4.jar=../../libs.junit4/external/junit-4.12.jar +file.reference.junit-4.jar=../../libs.junit4/external/junit-4.13.1.jar includes=** jar.compress=false @@ -48,7 +48,7 @@ javac.classpath=\ .:\ ../../jemmy/external/jemmy-2.3.0.0.jar:\ ../../nbbuild/build/public-package-jars/org-netbeans-libs-junit4.jar:\ -../../libs.junit4/external/junit-4.12.jar +../../libs.junit4/external/junit-4.13.1.jar # Space-separated list of extra javac options javac.compilerargs= diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependencies.properties b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependencies.properties index 5769aa6..06af309 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependencies.properties +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependencies.properties @@ -44,5 +44,5 @@ test.unit.run.cp.extra=\ ${core/progress.dir}/modules/org-netbeans-api-progress.jar test-unit-sys-prop.test.bridge.jar=${cluster}/ant/nblib/bridge.jar test-unit-sys-prop.test.ant.home=${cluster}/ant -test-unit-sys-prop.test.junit.jar=${junit.dir}/modules/ext/junit-4.12.jar +test-unit-sys-prop.test.junit.jar=${junit.dir}/modules/ext/junit-4.13.1.jar extra.module.files=ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesPass.properties b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesPass.properties index 3ebce95..8451829 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesPass.properties +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesPass.properties @@ -23,5 +23,5 @@ javadoc.arch=${basedir}/arch.xml test.unit.run.cp.extra=${tools.jar} test-unit-sys-prop.test.bridge.jar=${cluster}/ant/nblib/bridge.jar test-unit-sys-prop.test.ant.home=${cluster}/ant -test-unit-sys-prop.test.junit.jar=${junit.dir}/modules/ext/junit-4.12.jar +test-unit-sys-prop.test.junit.jar=${junit.dir}/modules/ext/junit-4.13.1.jar extra.module.files=ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar diff --git a/nbi/engine/nbproject/project.properties b/nbi/engine/nbproject/project.properties index a482f25..3cb2962 100644 --- a/nbi/engine/nbproject/project.properties +++ b/nbi/engine/nbproject/project.properties @@ -46,7 +46,7 @@ endorsed.classpath= excludes= file.reference.jetty-6.0.2.jar=lib/jetty-6.0.2.jar file.reference.jetty-util-6.0.2.jar=lib/jetty-util-6.0.2.jar -file.reference.junit-4.12.jar=../../libs.junit4/external/junit-4.12.jar +file.reference.junit-4.13.1.jar=../../libs.junit4/external/junit-4.13.1.jar file.reference.servlet-api-2.5-6.0.2.jar=lib/servlet-api-2.5-6.0.2.jar includes=** jar.archive.disabled=${jnlp.enabled} @@ -66,7 +66,7 @@ javac.test.classpath=\ ${file.reference.jetty-6.0.2.jar}:\ ${file.reference.jetty-util-6.0.2.jar}:\ ${file.reference.servlet-api-2.5-6.0.2.jar}:\ - ${file.reference.junit-4.12.jar} + ${file.reference.junit-4.13.1.jar} javadoc.additionalparam=-header "NBI Engine API" javadoc.author=true javadoc.encoding= diff --git a/platform/junitlib/external/binaries-list b/platform/junitlib/external/binaries-list index 8558d11..22bdc12 100644 --- a/platform/junitlib/external/binaries-list +++ b/platform/junitlib/external/binaries-list @@ -14,8 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -A6C32B40BF3D76ECA54E3C601E5D1470C86FCDFA junit:junit:4.12:sources -941A8BE4506C65F0A9001C08812FB7DA1E505E21 junit:junit:4.12:javadoc +523BDCE923A13622132B263550D06519FC591EC4 junit:junit:4.13.1:sources +9D466B5EABB0CB144C8C9EF8B4EE6DB15D46D6E6 junit:junit:4.13.1:javadoc EECCE5DA465F85A39FDD55F39A55591290170FAE org.junit.jupiter:junit-jupiter-api:5.6.0:sources 9FF3C4B16802300C00C765F5D134D22291C98B34 org.junit.jupiter:junit-jupiter-api:5.6.0:javadoc 6F38FDB1F7E00CEB6AA6F7DB54B1EE92CB196257 org.junit.jupiter:junit-jupiter-params:5.6.0:sources diff --git a/platform/junitlib/external/junit-4.12-license.txt b/platform/junitlib/external/junit-4.13.1-license.txt similarity index 99% rename from platform/junitlib/external/junit-4.12-license.txt rename to platform/junitlib/external/junit-4.13.1-license.txt index 18fcaf7..53971f0 100644 --- a/platform/junitlib/external/junit-4.12-license.txt +++ b/platform/junitlib/external/junit-4.13.1-license.txt @@ -1,10 +1,10 @@ Name: JUnit -Version: 4.12 +Version: 4.13.1 License: EPL-v10 OSR: 19398 -Origin: http://search.maven.org/#artifactdetails|junit|junit|4.12|jar +Origin: http://search.maven.org/#artifactdetails|junit|junit|4.13.1|jar Description: JUnit is a regression testing framework -Files: junit-4.12-sources.jar junit-4.12-javadoc.jar +Files: junit-4.13.1-sources.jar junit-4.13.1-javadoc.jar Eclipse Public License - v 1.0 diff --git a/platform/junitlib/nbproject/project.properties b/platform/junitlib/nbproject/project.properties index 20edacc..6536d22 100644 --- a/platform/junitlib/nbproject/project.properties +++ b/platform/junitlib/nbproject/project.properties @@ -17,8 +17,8 @@ is.autoload=true javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial -release.external/junit-4.12-sources.jar=docs/junit-4.12-sources.jar -release.external/junit-4.12-javadoc.jar=docs/junit-4.12-javadoc.jar +release.external/junit-4.13.1-sources.jar=docs/junit-4.13.1-sources.jar +release.external/junit-4.13.1-javadoc.jar=docs/junit-4.13.1-javadoc.jar release.external/junit-jupiter-api-5.6.0-sources.jar=docs/junit-jupiter-api-5.6.0-sources.jar release.external/junit-jupiter-api-5.6.0-javadoc.jar=docs/junit-jupiter-api-5.6.0-javadoc.jar release.external/junit-jupiter-params-5.6.0-sources.jar=docs/junit-jupiter-params-5.6.0-sources.jar @@ -28,8 +28,8 @@ release.external/junit-jupiter-engine-5.6.0-javadoc.jar=docs/junit-jupiter-engin nbm.target.cluster=java nbm.is.global=false jnlp.indirect.jars=\ - docs/junit-4.12-sources.jar,\ - docs/junit-4.12-javadoc.jar,\ + docs/junit-4.13.1-sources.jar,\ + docs/junit-4.13.1-javadoc.jar,\ docs/junit-jupiter-api-5.6.0-sources.jar,\ docs/junit-jupiter-api-5.6.0-javadoc.jar,\ docs/junit-jupiter-params-5.6.0-sources.jar,\ diff --git a/platform/junitlib/src/org/netbeans/modules/junitlib/junit_4.xml b/platform/junitlib/src/org/netbeans/modules/junitlib/junit_4.xml index 662bec0..e85ee4a 100644 --- a/platform/junitlib/src/org/netbeans/modules/junitlib/junit_4.xml +++ b/platform/junitlib/src/org/netbeans/modules/junitlib/junit_4.xml @@ -25,21 +25,21 @@ <localizing-bundle>org.netbeans.modules.junitlib.Bundle</localizing-bundle> <volume> <type>classpath</type> - <resource>jar:nbinst://org.netbeans.libs.junit4/modules/ext/junit-4.12.jar!/</resource> + <resource>jar:nbinst://org.netbeans.libs.junit4/modules/ext/junit-4.13.1.jar!/</resource> </volume> <volume> <type>javadoc</type> - <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-4.12-javadoc.jar!/</resource> + <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-4.13.1-javadoc.jar!/</resource> </volume> <volume> <type>src</type> - <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-4.12-sources.jar!/</resource> + <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-4.13.1-sources.jar!/</resource> </volume> <properties> <!-- please check with mkle...@netbeans.org before/after updating this or "classpath" section --> <property> <name>maven-dependencies</name> - <value>junit:junit:4.12:jar</value> + <value>junit:junit:4.13.1:jar</value> </property> </properties> </library> diff --git a/platform/libs.junit4/external/binaries-list b/platform/libs.junit4/external/binaries-list index f6f8c09..f71231c 100644 --- a/platform/libs.junit4/external/binaries-list +++ b/platform/libs.junit4/external/binaries-list @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -2973D150C0DC1FEFE998F834810D68F278EA58EC junit:junit:4.12 +CDD00374F1FEE76B11E2A9D127405AA3F6BE5B6A junit:junit:4.13.1 42A25DC3219429F0E5D060061F71ACB49BF010A0 org.hamcrest:hamcrest-core:1.3 diff --git a/platform/libs.junit4/external/junit-4.12-license.txt b/platform/libs.junit4/external/junit-4.13.1-license.txt similarity index 99% rename from platform/libs.junit4/external/junit-4.12-license.txt rename to platform/libs.junit4/external/junit-4.13.1-license.txt index f3a7aa9..b219136 100644 --- a/platform/libs.junit4/external/junit-4.12-license.txt +++ b/platform/libs.junit4/external/junit-4.13.1-license.txt @@ -1,9 +1,9 @@ Name: JUnit -Version: 4.12 +Version: 4.13.1 License: EPL-v10 Description: JUnit harness runtime Origin: JUnit -URL: http://search.maven.org/#artifactdetails|junit|junit|4.12|jar +URL: http://search.maven.org/#artifactdetails|junit|junit|4.13.1|jar Eclipse Public License - v 1.0 diff --git a/platform/libs.junit4/nbproject/project.properties b/platform/libs.junit4/nbproject/project.properties index ee6cd2b..3e33702 100644 --- a/platform/libs.junit4/nbproject/project.properties +++ b/platform/libs.junit4/nbproject/project.properties @@ -16,7 +16,7 @@ # under the License. is.autoload=true -release.external/junit-4.12.jar=modules/ext/junit-4.12.jar +release.external/junit-4.13.1.jar=modules/ext/junit-4.13.1.jar release.external/hamcrest-core-1.3.jar=modules/ext/hamcrest-core-1.3.jar nbm.target.cluster=platform sigtest.skip.check=true diff --git a/platform/libs.junit4/nbproject/project.xml b/platform/libs.junit4/nbproject/project.xml index d9858a9..d21f24b 100644 --- a/platform/libs.junit4/nbproject/project.xml +++ b/platform/libs.junit4/nbproject/project.xml @@ -42,8 +42,8 @@ <package>org.junit.runners.model</package> </public-packages> <class-path-extension> - <runtime-relative-path>ext/junit-4.12.jar</runtime-relative-path> - <binary-origin>external/junit-4.12.jar</binary-origin> + <runtime-relative-path>ext/junit-4.13.1.jar</runtime-relative-path> + <binary-origin>external/junit-4.13.1.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/hamcrest-core-1.3.jar</runtime-relative-path> diff --git a/websvccommon/websvc.saas.codegen/nbproject/project.properties b/websvccommon/websvc.saas.codegen/nbproject/project.properties index 0c0d05d..db788df 100644 --- a/websvccommon/websvc.saas.codegen/nbproject/project.properties +++ b/websvccommon/websvc.saas.codegen/nbproject/project.properties @@ -22,4 +22,4 @@ test.unit.run.cp.extra=${tools.jar} test-unit-sys-prop.test.bridge.jar=${o.apache.tools.ant.module.dir}/ant/nblib/bridge.jar # May be overridden to e.g. test against a different version of Ant: test-unit-sys-prop.test.ant.home=${o.apache.tools.ant.module.dir}/ant -test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.12.jar \ No newline at end of file +test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.13.1.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