sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/02: Adjust indentation and omit the properties for JUnit versions, temporarily replaced by hard-coded version numbers. The intent is to inherit those version numbers from GeoAPI since they are used for the conformance test suite. GeoAPI migration to JUnit 5 started in the "jupiter" branch.
Date Wed, 18 Dec 2019 19:07:26 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit fb1d4e2e368d5c5d17efffc20efdeb64633bba6f
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Mon Dec 16 11:19:33 2019 +0100

    Adjust indentation and omit the properties for JUnit versions, temporarily replaced by
hard-coded version numbers.
    The intent is to inherit those version numbers from GeoAPI since they are used for the
conformance test suite.
    GeoAPI migration to JUnit 5 started in the "jupiter" branch.
---
 pom.xml                      | 44 ++++++++++++++++++++++----------------------
 storage/sis-sqlstore/pom.xml |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 625559b..9355144 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,11 +433,11 @@
         <artifactId>geoapi-conformance</artifactId>
         <version>${geoapi.version}</version>
         <scope>test</scope>
-        <exclusions>
-            <exclusion>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-            </exclusion>
+        <exclusions>            <!-- TODO: remove this exclusion after migration
to JUnit 5. -->
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
 
@@ -538,22 +538,24 @@
            Dependencies to be inherited by all modules.
        =========================================================== -->
   <dependencies>
-    <!-- 
-      Unit test declaration. Embed aggregator dependency + retrocompatibility artifact ('vintage').

+    <!--
+      Unit test declaration. Embed aggregator dependency + retrocompatibility artifact ('vintage').
       The later won't be needed anymore once all JUnit tests have been upgraded to new JUnit
version.
+      TODO: remove <version>5.5.2</version> after complete migration to JUnit
5 (dependency version
+      will be inherited from GeoAPI).
     -->
     <dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<version>${junit.jupiter.version}</version>
-			<scope>test</scope>
-		</dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.5.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-			<version>${junit.jupiter.version}</version>
-			<scope>test</scope>
-		</dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>5.5.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>   <!-- To be removed after https://issues.apache.org/jira/browse/SIS-469
is done. -->
       <groupId>jakarta.xml.bind</groupId>
       <artifactId>jakarta.xml.bind-api</artifactId>
@@ -580,7 +582,6 @@
     <sis.non-free.version>1.0</sis.non-free.version>                 <!--
Used only if "non-free" profile is enabled. -->
     <geoapi.version>4.0-SNAPSHOT</geoapi.version>
     <jaxb.version>2.3.2</jaxb.version>
-		<junit.jupiter.version>5.5.2</junit.jupiter.version>
   </properties>
 
   <profiles>
@@ -688,7 +689,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.2</version>
+        <version>3.0.0-M4</version>
         <configuration>
           <includes>
             <include>**/*TestSuite.java</include>
@@ -774,11 +775,10 @@
               <goal>check</goal>
             </goals>
             <configuration>
-              <skip>${skipTests}</skip> <!-- When skipping tests, skip also
checkstyle verification. -->
+              <skip>${skipTests}</skip>                 <!-- When skipping
tests, skip also checkstyle verification.  -->
+              <excludes>**/generated/**/*</excludes>    <!-- Skip generated
source code, e.g. classes created by JMH. -->
               <encoding>${project.build.sourceEncoding}</encoding>
               <consoleOutput>true</consoleOutput>
-              <!-- This flag asks to ignore generated source packages, like JMH compilation
artifacts -->
-              <excludes>**/generated/**/*</excludes>
               <checkstyleRules>
                 <module name="Checker">
                   <!--
diff --git a/storage/sis-sqlstore/pom.xml b/storage/sis-sqlstore/pom.xml
index 5d5dd15..86d7cc4 100644
--- a/storage/sis-sqlstore/pom.xml
+++ b/storage/sis-sqlstore/pom.xml
@@ -98,7 +98,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.2</version>
+        <version>3.0.0-M4</version>
         <configuration>
           <includes>
             <include>**/*Test.java</include>


Mime
View raw message