ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sergeychugu...@apache.org
Subject [ignite-3] branch main updated: IGNITE-13940 Fixed java versions in pom.xml, fixed tests on Windows platforms (#22)
Date Thu, 31 Dec 2020 10:58:48 GMT
This is an automated email from the ASF dual-hosted git repository.

sergeychugunov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new d60f077  IGNITE-13940 Fixed java versions in pom.xml, fixed tests on Windows platforms
(#22)
d60f077 is described below

commit d60f07738e1c0c0f9445d3658787b2e2d9f0a91e
Author: Semyon Danilov <samvimes@yandex.ru>
AuthorDate: Thu Dec 31 13:58:24 2020 +0300

    IGNITE-13940 Fixed java versions in pom.xml, fixed tests on Windows platforms (#22)
    
    Signed-off-by: Sergey Chugunov <sergey.chugunov@gmail.com>
---
 modules/configuration-annotation-processor/pom.xml             |  8 +-------
 .../processor/internal/AbstractProcessorTest.java              | 10 +++++-----
 pom.xml                                                        |  2 ++
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/configuration-annotation-processor/pom.xml b/modules/configuration-annotation-processor/pom.xml
index 2c92003..e01264e 100644
--- a/modules/configuration-annotation-processor/pom.xml
+++ b/modules/configuration-annotation-processor/pom.xml
@@ -68,16 +68,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.6.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>fr.inria.gforge.spoon</groupId>
             <artifactId>spoon-core</artifactId>
             <version>8.3.0</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/AbstractProcessorTest.java
b/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/AbstractProcessorTest.java
index a089a50..0c316ed 100644
--- a/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/AbstractProcessorTest.java
+++ b/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/AbstractProcessorTest.java
@@ -20,7 +20,6 @@ import com.google.common.base.Functions;
 import com.google.testing.compile.Compilation;
 import com.google.testing.compile.JavaFileObjects;
 import com.squareup.javapoet.ClassName;
-import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -42,8 +41,8 @@ public class AbstractProcessorTest {
     protected static BatchCompilation batchCompile(ClassName... schemaClasses) {
         List<String> fileNames = Arrays.stream(schemaClasses)
             .map(name -> {
-                final String folderName = name.packageName().replaceAll("\\.", File.separator);
-                return String.format("%s%c%s.java", folderName, File.separatorChar, name.simpleName());
+                final String folderName = name.packageName().replace(".", "/");
+                return String.format("%s/%s.java", folderName, name.simpleName());
             })
             .collect(Collectors.toList());
 
@@ -82,7 +81,8 @@ public class AbstractProcessorTest {
      * @return ClassName.
      */
     protected static ClassName fromGeneratedFilePath(String fileName) {
-        return fromFilePath(fileName.replace("/SOURCE_OUTPUT/", ""));
+        final String filePath = fileName.replace("/SOURCE_OUTPUT/", "");
+        return fromFilePath(filePath);
     }
 
     /**
@@ -94,7 +94,7 @@ public class AbstractProcessorTest {
         int slashIdx = fileName.lastIndexOf("/");
         int dotJavaIdx = fileName.lastIndexOf(".java");
 
-        String packageName = fileName.substring(0, slashIdx).replaceAll("/", ".");
+        String packageName = fileName.substring(0, slashIdx).replace("/", ".");
 
         final String className = fileName.substring(slashIdx + 1, dotJavaIdx);
 
diff --git a/pom.xml b/pom.xml
index b82a541..61b5716 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,8 @@
     </licenses>
 
     <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.release>11</maven.compiler.release>
     </properties>
 


Mime
View raw message