sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 05/05: Upgrade JUnit dependency and replace JUnit 4 dependency by JUnit 5 in NetBeans project configuration.
Date Mon, 16 Dec 2019 09:49:46 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch SIS-457
in repository https://gitbox.apache.org/repos/asf/sis.git

commit e807c0525753b3f6cba725cfd39db86ea3aeb567
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Sun Dec 15 22:06:19 2019 +0100

    Upgrade JUnit dependency and replace JUnit 4 dependency by JUnit 5 in NetBeans project
configuration.
---
 ide-project/NetBeans/nbproject/project.properties | 13 ++++++++++---
 pom.xml                                           | 17 +++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ide-project/NetBeans/nbproject/project.properties b/ide-project/NetBeans/nbproject/project.properties
index 12b6aee..168b00d 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -124,6 +124,10 @@ derby.version        = 10.14.2.0
 hsqldb.version       = 2.5.0
 postgresql.version   = 42.2.8
 icons.version        = 3.0.1
+junit.version          = 5.5.2
+junit.platform.version = 1.5.2
+opentest.version       = 1.2.0
+apiguardian.version    = 1.1.0
 
 #
 # Classpaths for compilation, execution and tests.
@@ -153,8 +157,9 @@ javac.test.classpath=\
     ${maven.repository}/org/hsqldb/hsqldb/${hsqldb.version}/hsqldb-${hsqldb.version}.jar:\
     ${maven.repository}/gov/nist/math/jama/${jama.version}/jama-${jama.version}.jar:\
     ${maven.repository}/net/sf/geographiclib/GeographicLib-Java/${geographlib.version}/GeographicLib-Java-${geographlib.version}.jar:\
-    ${maven.repository}/junit/junit/${junit.version}/junit-${junit.version}.jar:\
-    ${maven.repository}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar:\
+    ${maven.repository}/org/junit/jupiter/junit-jupiter-api/${junit.version}/junit-jupiter-api-${junit.version}.jar:\
+    ${maven.repository}/org/apiguardian/apiguardian-api/${apiguardian.version}/apiguardian-api-${apiguardian.version}.jar:\
+    ${maven.repository}/org/opentest4j/opentest4j/${opentest.version}/opentest4j-${opentest.version}.jar:\
     ${build.classes.dir}
 javac.test.processorpath=\
     ${javac.test.classpath}
@@ -184,7 +189,9 @@ run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}:\
     ${run.jaxb.classpath}:\
-    ${run.netcdf.classpath}
+    ${run.netcdf.classpath}:\
+    ${maven.repository}/org/junit/platform/junit-platform-commons/${junit.platform.version}/junit-platform-commons-${junit.platform.version}.jar:\
+    ${maven.repository}/org/junit/platform/junit-platform-engine/${junit.platform.version}/junit-platform-engine-${junit.platform.version}.jar
 debug.classpath=\
     ${run.classpath}
 debug.test.classpath=\
diff --git a/pom.xml b/pom.xml
index 52c14d6..69a5bce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -533,13 +533,13 @@
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-api</artifactId>
-        <version>${junit-jupiter-api.version}</version>
+        <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>
-        <version>${junit-jupiter-engine.version}</version>
+        <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -551,14 +551,9 @@
       <dependency>
         <groupId>org.junit.vintage</groupId>
         <artifactId>junit-vintage-engine</artifactId>
-        <version>${junit.vintage.version}</version>
+        <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
-        <dependency>
-          <groupId>org.junit.platform</groupId>
-          <artifactId>junit-platform-surefire-provider</artifactId>
-          <version>${junit.platform.version}</version>
-        </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -603,6 +598,8 @@
        =================================================================== -->
   <properties>
     <netcdf.version>4.6.14</netcdf.version>
+    <junit.version>5.5.2</junit.version>
+    <junit.platform.version>1.5.2</junit.platform.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <website.encoding>UTF-8</website.encoding>
     <website.locale>en</website.locale>
@@ -614,10 +611,6 @@
     <sis.non-free.version>1.0</sis.non-free.version>                 <!--
Used only if "non-free" profile is enabled. -->
     <geoapi.version>3.0.1</geoapi.version>
     <jaxb.version>2.3.2</jaxb.version>
-    <junit-jupiter-api.version>${junit-jupiter-engine.version}</junit-jupiter-api.version>
-    <junit-jupiter-engine.version>5.4.2</junit-jupiter-engine.version>
-    <junit.vintage.version>5.4.2</junit.vintage.version>
-    <junit.platform.version>1.1.1</junit.platform.version>
   </properties>
 
   <profiles>


Mime
View raw message