Update JUnit to version 4.13.1

georgemayko · Oct 21, 2020 · 427251a · 427251a
1 parent 0ec46b5
commit 427251a
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 36 deletions.
diff --git 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
@@ -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
@@ -182,8 +182,8 @@ public void init1() {
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -40,15 +40,15 @@ 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
 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
@@ -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
@@ -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
@@ -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
@@ -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/.../junitlib/external/junit-4.12-license.txt → ...unitlib/external/junit-4.13.1-license.txt b/.../junitlib/external/junit-4.12-license.txt → ...unitlib/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
@@ -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
@@ -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 [email protected] 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
@@ -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/...bs.junit4/external/junit-4.12-license.txt → ....junit4/external/junit-4.13.1-license.txt b/...bs.junit4/external/junit-4.12-license.txt → ....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
@@ -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
@@ -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
@@ -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
+test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.13.1.jar