You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2020/03/14 18:30:57 UTC
[netbeans] branch master updated: Update JUnit from 5.5.2 to 5.6.0
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.git
The following commit(s) were added to refs/heads/master by this push:
new 7f9fffe Update JUnit from 5.5.2 to 5.6.0
new 5a32af3 Merge pull request #1977 from pepness/junit-5.6.0
7f9fffe is described below
commit 7f9fffe2fb26c6354677d2dfaefbbfb811d149d5
Author: Jose Contreras <pe...@gmail.com>
AuthorDate: Mon Feb 24 21:29:34 2020 -0600
Update JUnit from 5.5.2 to 5.6.0
---
.../modules/maven/ActionProviderImplTest.java | 2 +-
platform/junitlib/external/binaries-list | 12 +++++------
...nse.txt => junit-jupiter-api-5.6.0-license.txt} | 4 ++--
....txt => junit-jupiter-engine-5.6.0-license.txt} | 4 ++--
....txt => junit-jupiter-params-5.6.0-license.txt} | 4 ++--
platform/junitlib/nbproject/project.properties | 24 +++++++++++-----------
.../netbeans/modules/junitlib/Bundle.properties | 2 +-
.../src/org/netbeans/modules/junitlib/junit_5.xml | 24 +++++++++++-----------
platform/libs.junit5/external/binaries-list | 6 +++---
...license.txt => junit-jupiter-5.6.0-license.txt} | 6 +++---
platform/libs.junit5/nbproject/project.properties | 6 +++---
platform/libs.junit5/nbproject/project.xml | 12 +++++------
12 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/java/maven/test/unit/src/org/netbeans/modules/maven/ActionProviderImplTest.java b/java/maven/test/unit/src/org/netbeans/modules/maven/ActionProviderImplTest.java
index 3aa76c0..278a866 100644
--- a/java/maven/test/unit/src/org/netbeans/modules/maven/ActionProviderImplTest.java
+++ b/java/maven/test/unit/src/org/netbeans/modules/maven/ActionProviderImplTest.java
@@ -107,7 +107,7 @@ public class ActionProviderImplTest extends NbTestCase {
+ "<groupId>test</groupId><artifactId>prj</artifactId>"
+ "<version>1.0</version>"
+ "<build><plugins><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-surefire-plugin</artifactId><version>2.22.2</version></plugin></plugins></build>"
- + "<dependencies><dependency><groupId>org.junit.jupiter</groupId><artifactId>junit-jupiter-api</artifactId><version>5.5.2</version><scope>test</scope></dependency><dependency><groupId>org.junit.jupiter</groupId><artifactId>junit-jupiter-params</artifactId><version>5.5.2</version><scope>test</scope></dependency><dependency><groupId>org.junit.jupiter</groupId><artifactId>junit-jupiter-engine</artifactId><version>5.5.2</version><scope>test</scope></dependency></dependencies>"
+ + "<dependencies><dependency><groupId>org.junit.jupiter</groupId><artifactId>junit-jupiter-api</artifactId><version>5.6.0</version><scope>test</scope></dependency><dependency><groupId>org.junit.jupiter</groupId><artifactId>junit-jupiter-params</artifactId><version>5.6.0</version><scope>test</scope></dependency><dependency><groupId>org.junit.jupiter</groupId><artifactId>junit-jupiter-engine</artifactId><version>5.6.0</version><scope>test</scope></dependency></dependencies>"
+ "<properties><netbeans.compile.on.save>none</netbeans.compile.on.save></properties>"
+ "</project>");
assertSupportsRunSingleMethod(ProjectManager.getDefault().findProject(FileUtil.toFileObject(getWorkDir())), true);
diff --git a/platform/junitlib/external/binaries-list b/platform/junitlib/external/binaries-list
index c5eda0a..8558d11 100644
--- a/platform/junitlib/external/binaries-list
+++ b/platform/junitlib/external/binaries-list
@@ -16,9 +16,9 @@
# under the License.
A6C32B40BF3D76ECA54E3C601E5D1470C86FCDFA junit:junit:4.12:sources
941A8BE4506C65F0A9001C08812FB7DA1E505E21 junit:junit:4.12:javadoc
-22B57242E953BF2DE96FD5A122BD697F18B2FCD2 org.junit.jupiter:junit-jupiter-api:5.5.2:sources
-D24A5A6853030EBB11DACE58BD5FA49F0BCE4D58 org.junit.jupiter:junit-jupiter-api:5.5.2:javadoc
-F68669855D3DCFD6F6087FAF53A5A503DEF5D09B org.junit.jupiter:junit-jupiter-params:5.5.2:sources
-E94D6EA9D7460B9460114A009857D5588F8DC1BA org.junit.jupiter:junit-jupiter-params:5.5.2:javadoc
-44D1543A802A072D87CC146D9D96223D61683617 org.junit.jupiter:junit-jupiter-engine:5.5.2:sources
-EEAA786F518DDE7B0298A08426A349B55728D7D9 org.junit.jupiter:junit-jupiter-engine:5.5.2:javadoc
\ No newline at end of file
+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
+82B86EA526559DD1C1E2D7BD748CEA63AA7D067D org.junit.jupiter:junit-jupiter-params:5.6.0:javadoc
+9001C3C1E19E10FD2D0CF3C0E9CD9EAE96A6666E org.junit.jupiter:junit-jupiter-engine:5.6.0:sources
+2960C0C3D45F9F0078E75549C2FB479A73AF8BE4 org.junit.jupiter:junit-jupiter-engine:5.6.0:javadoc
\ No newline at end of file
diff --git a/platform/junitlib/external/junit-jupiter-api-5.5.2-license.txt b/platform/junitlib/external/junit-jupiter-api-5.6.0-license.txt
similarity index 99%
rename from platform/junitlib/external/junit-jupiter-api-5.5.2-license.txt
rename to platform/junitlib/external/junit-jupiter-api-5.6.0-license.txt
index 28177f3..6589771 100644
--- a/platform/junitlib/external/junit-jupiter-api-5.5.2-license.txt
+++ b/platform/junitlib/external/junit-jupiter-api-5.6.0-license.txt
@@ -1,9 +1,9 @@
Name: JUnit Jupiter API
-Version: 5.5.2
+Version: 5.6.0
License: EPL-v20
Description: JUnit Jupiter API
Origin: JUnit
-Files: junit-jupiter-api-5.5.2-sources.jar junit-jupiter-api-5.5.2-javadoc.jar
+Files: junit-jupiter-api-5.6.0-sources.jar junit-jupiter-api-5.6.0-javadoc.jar
Eclipse Public License - v 2.0
diff --git a/platform/junitlib/external/junit-jupiter-engine-5.5.2-license.txt b/platform/junitlib/external/junit-jupiter-engine-5.6.0-license.txt
similarity index 99%
rename from platform/junitlib/external/junit-jupiter-engine-5.5.2-license.txt
rename to platform/junitlib/external/junit-jupiter-engine-5.6.0-license.txt
index 1b8872c..97ab488 100644
--- a/platform/junitlib/external/junit-jupiter-engine-5.5.2-license.txt
+++ b/platform/junitlib/external/junit-jupiter-engine-5.6.0-license.txt
@@ -1,9 +1,9 @@
Name: JUnit Jupiter Engine
-Version: 5.5.2
+Version: 5.6.0
License: EPL-v20
Description: JUnit Jupiter Engine
Origin: JUnit
-Files: junit-jupiter-engine-5.5.2-sources.jar junit-jupiter-engine-5.5.2-javadoc.jar
+Files: junit-jupiter-engine-5.6.0-sources.jar junit-jupiter-engine-5.6.0-javadoc.jar
Eclipse Public License - v 2.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/platform/junitlib/external/junit-jupiter-params-5.5.2-license.txt b/platform/junitlib/external/junit-jupiter-params-5.6.0-license.txt
similarity index 99%
rename from platform/junitlib/external/junit-jupiter-params-5.5.2-license.txt
rename to platform/junitlib/external/junit-jupiter-params-5.6.0-license.txt
index ad39a63..4b415cb 100644
--- a/platform/junitlib/external/junit-jupiter-params-5.5.2-license.txt
+++ b/platform/junitlib/external/junit-jupiter-params-5.6.0-license.txt
@@ -1,9 +1,9 @@
Name: JUnit Jupiter Params
-Version: 5.5.2
+Version: 5.6.0
License: EPL-v20
Description: JUnit Jupiter Params
Origin: JUnit
-Files: junit-jupiter-params-5.5.2-sources.jar junit-jupiter-params-5.5.2-javadoc.jar
+Files: junit-jupiter-params-5.6.0-sources.jar junit-jupiter-params-5.6.0-javadoc.jar
Eclipse Public License - v 2.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/platform/junitlib/nbproject/project.properties b/platform/junitlib/nbproject/project.properties
index e4bcd25..20edacc 100644
--- a/platform/junitlib/nbproject/project.properties
+++ b/platform/junitlib/nbproject/project.properties
@@ -19,20 +19,20 @@ 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-jupiter-api-5.5.2-sources.jar=docs/junit-jupiter-api-5.5.2-sources.jar
-release.external/junit-jupiter-api-5.5.2-javadoc.jar=docs/junit-jupiter-api-5.5.2-javadoc.jar
-release.external/junit-jupiter-params-5.5.2-sources.jar=docs/junit-jupiter-params-5.5.2-sources.jar
-release.external/junit-jupiter-params-5.5.2-javadoc.jar=docs/junit-jupiter-params-5.5.2-javadoc.jar
-release.external/junit-jupiter-engine-5.5.2-sources.jar=docs/junit-jupiter-engine-5.5.2-sources.jar
-release.external/junit-jupiter-engine-5.5.2-javadoc.jar=docs/junit-jupiter-engine-5.5.2-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
+release.external/junit-jupiter-params-5.6.0-javadoc.jar=docs/junit-jupiter-params-5.6.0-javadoc.jar
+release.external/junit-jupiter-engine-5.6.0-sources.jar=docs/junit-jupiter-engine-5.6.0-sources.jar
+release.external/junit-jupiter-engine-5.6.0-javadoc.jar=docs/junit-jupiter-engine-5.6.0-javadoc.jar
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-jupiter-api-5.5.2-sources.jar,\
- docs/junit-jupiter-api-5.5.2-javadoc.jar,\
- docs/junit-jupiter-params-5.5.2-sources.jar,\
- docs/junit-jupiter-params-5.5.2-javadoc.jar,\
- docs/junit-jupiter-engine-5.5.2-sources.jar,\
- docs/junit-jupiter-engine-5.5.2-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,\
+ docs/junit-jupiter-params-5.6.0-javadoc.jar,\
+ docs/junit-jupiter-engine-5.6.0-sources.jar,\
+ docs/junit-jupiter-engine-5.6.0-javadoc.jar
diff --git a/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties b/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
index fb0789e..f6256e7 100644
--- a/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
+++ b/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
@@ -20,5 +20,5 @@ OpenIDE-Module-Short-Description=Bundles the JUnit testing library.
OpenIDE-Module-Long-Description=\
Includes the JUnit unit testing library and corresponding library definition. Versions 4.x/5.x are included.
junit_4=JUnit 4.12
-junit_5=JUnit 5.5.2
+junit_5=JUnit 5.6.0
hamcrest=Hamcrest 1.3
diff --git a/platform/junitlib/src/org/netbeans/modules/junitlib/junit_5.xml b/platform/junitlib/src/org/netbeans/modules/junitlib/junit_5.xml
index 9427681..9a2724d 100644
--- a/platform/junitlib/src/org/netbeans/modules/junitlib/junit_5.xml
+++ b/platform/junitlib/src/org/netbeans/modules/junitlib/junit_5.xml
@@ -25,29 +25,29 @@
<localizing-bundle>org.netbeans.modules.junitlib.Bundle</localizing-bundle>
<volume>
<type>classpath</type>
- <resource>jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-api-5.5.2.jar!/</resource>
- <resource>jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-params-5.5.2.jar!/</resource>
- <resource>jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-engine-5.5.2.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-api-5.6.0.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-params-5.6.0.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-engine-5.6.0.jar!/</resource>
</volume>
<volume>
<type>javadoc</type>
- <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-api-5.5.2-javadoc.jar!/</resource>
- <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-params-5.5.2-javadoc.jar!/</resource>
- <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-engine-5.5.2-javadoc.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-api-5.6.0-javadoc.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-params-5.6.0-javadoc.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-engine-5.6.0-javadoc.jar!/</resource>
</volume>
<volume>
<type>src</type>
- <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-api-5.5.2-sources.jar!/</resource>
- <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-params-5.5.2-sources.jar!/</resource>
- <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-engine-5.5.2-sources.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-api-5.6.0-sources.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-params-5.6.0-sources.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-engine-5.6.0-sources.jar!/</resource>
</volume>
<properties>
<property>
<name>maven-dependencies</name>
<value>
- org.junit.jupiter:junit-jupiter-api:5.5.2:jar
- org.junit.jupiter:junit-jupiter-params:5.5.2:jar
- org.junit.jupiter:junit-jupiter-engine:5.5.2:jar
+ org.junit.jupiter:junit-jupiter-api:5.6.0:jar
+ org.junit.jupiter:junit-jupiter-params:5.6.0:jar
+ org.junit.jupiter:junit-jupiter-engine:5.6.0:jar
</value>
</property>
</properties>
diff --git a/platform/libs.junit5/external/binaries-list b/platform/libs.junit5/external/binaries-list
index 1044d5b..2153491 100644
--- a/platform/libs.junit5/external/binaries-list
+++ b/platform/libs.junit5/external/binaries-list
@@ -14,6 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-6393DB7E4C0265152D8FC4FF146633D1A7D36C47 org.junit.jupiter:junit-jupiter-api:5.5.2
-E0659722923BD9FDFA08602E2DA22BD5A9D354E8 org.junit.jupiter:junit-jupiter-params:5.5.2
-F597408BDE45371548F9E9791DA7981A1134328D org.junit.jupiter:junit-jupiter-engine:5.5.2
+F29E6318333D2303CE4965C9819CFAD08DE7D1E5 org.junit.jupiter:junit-jupiter-api:5.6.0
+B28E078D4E8424DE01DF02EC92410D225E5D6444 org.junit.jupiter:junit-jupiter-params:5.6.0
+83C9E737F6015D9E00029B9B1D51E952A884B8F9 org.junit.jupiter:junit-jupiter-engine:5.6.0
diff --git a/platform/libs.junit5/external/junit-jupiter-5.5.2-license.txt b/platform/libs.junit5/external/junit-jupiter-5.6.0-license.txt
similarity index 99%
rename from platform/libs.junit5/external/junit-jupiter-5.5.2-license.txt
rename to platform/libs.junit5/external/junit-jupiter-5.6.0-license.txt
index 9a41657..c79aa4c 100644
--- a/platform/libs.junit5/external/junit-jupiter-5.5.2-license.txt
+++ b/platform/libs.junit5/external/junit-jupiter-5.6.0-license.txt
@@ -1,10 +1,10 @@
Name: JUnit Jupiter
-Version: 5.5.2
-Files: junit-jupiter-api-5.5.2.jar junit-jupiter-params-5.5.2.jar junit-jupiter-engine-5.5.2.jar
+Version: 5.6.0
+Files: junit-jupiter-api-5.6.0.jar junit-jupiter-params-5.6.0.jar junit-jupiter-engine-5.6.0.jar
License: EPL-v20
Description: JUnit Jupiter
Origin: JUnit
-URL: https://search.maven.org/search?q=g:org.junit.jupiter%20AND%20v:5.5.2
+URL: https://search.maven.org/search?q=g:org.junit.jupiter%20AND%20v:5.6.0
Eclipse Public License - v 2.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/platform/libs.junit5/nbproject/project.properties b/platform/libs.junit5/nbproject/project.properties
index 42acf2e..4a04140 100644
--- a/platform/libs.junit5/nbproject/project.properties
+++ b/platform/libs.junit5/nbproject/project.properties
@@ -16,9 +16,9 @@
# under the License.
is.autoload=true
-release.external/junit-jupiter-api-5.5.2.jar=modules/ext/junit-jupiter-api-5.5.2.jar
-release.external/junit-jupiter-params-5.5.2.jar=modules/ext/junit-jupiter-params-5.5.2.jar
-release.external/junit-jupiter-engine-5.5.2.jar=modules/ext/junit-jupiter-engine-5.5.2.jar
+release.external/junit-jupiter-api-5.6.0.jar=modules/ext/junit-jupiter-api-5.6.0.jar
+release.external/junit-jupiter-params-5.6.0.jar=modules/ext/junit-jupiter-params-5.6.0.jar
+release.external/junit-jupiter-engine-5.6.0.jar=modules/ext/junit-jupiter-engine-5.6.0.jar
nbm.target.cluster=platform
sigtest.skip.check=true
sigtest.fail.on.error=false
diff --git a/platform/libs.junit5/nbproject/project.xml b/platform/libs.junit5/nbproject/project.xml
index 7fb5620..ebd9731 100644
--- a/platform/libs.junit5/nbproject/project.xml
+++ b/platform/libs.junit5/nbproject/project.xml
@@ -43,16 +43,16 @@
<package>org.junit.jupiter.engine.script</package>
</public-packages>
<class-path-extension>
- <runtime-relative-path>ext/junit-jupiter-api-5.5.2.jar</runtime-relative-path>
- <binary-origin>external/junit-jupiter-api-5.5.2.jar</binary-origin>
+ <runtime-relative-path>ext/junit-jupiter-api-5.6.0.jar</runtime-relative-path>
+ <binary-origin>external/junit-jupiter-api-5.6.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/junit-jupiter-params-5.5.2.jar</runtime-relative-path>
- <binary-origin>external/junit-jupiter-params-5.5.2.jar</binary-origin>
+ <runtime-relative-path>ext/junit-jupiter-params-5.6.0.jar</runtime-relative-path>
+ <binary-origin>external/junit-jupiter-params-5.6.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/junit-jupiter-engine-5.5.2.jar</runtime-relative-path>
- <binary-origin>external/junit-jupiter-engine-5.5.2.jar</binary-origin>
+ <runtime-relative-path>ext/junit-jupiter-engine-5.6.0.jar</runtime-relative-path>
+ <binary-origin>external/junit-jupiter-engine-5.6.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists