fix test poms

treblereel · Jun 14, 2023 · 21684cc · 21684cc
1 parent fecceaa
commit 21684cc
Show file tree

Hide file tree

Showing 13 changed files with 153 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -76,8 +76,8 @@ It contains the following features:
     });
    ```
 
-* *@TranslationBundle* j2cl-maven-plugin 0.20 brings us support of Closure's `.xtb` translation bundles that are a very effective way to translate your application.
-    * Note: at the moment, `.xtb` support is only available for j2cl-maven-plugin 0.20 and above and works only in ADVANCED mode, otherwise default values will be used.
+* *@TranslationBundle* j2cl-maven-plugin 0.21-SNAPSHOT brings us support of Closure's `.xtb` translation bundles that are a very effective way to translate your application.
+    * Note: at the moment, `.xtb` support is only available for j2cl-maven-plugin 0.21-SNAPSHOT and above and works only in ADVANCED mode, otherwise default values will be used.
 
   To use `@TranslationBundle`, you need to do the following steps:
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.treblereel.j2cl.processors</groupId>
         <artifactId>parent</artifactId>
-        <version>0.5.1</version>
+        <version>0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>common</artifactId>

diff --git a/processor/src/main/java/org/treblereel/j2cl/processors/generator/TranslationGenerator.java b/processor/src/main/java/org/treblereel/j2cl/processors/generator/TranslationGenerator.java
@@ -169,7 +169,7 @@ private void writeMethod(StringBuilder sb, ExecutableElement method, String impl
     String key = getKey(method);
     JsMessage asJsMessage = toJsMessage(key, translationKey.defaultValue());
     validatePlaceHolders(method, asJsMessage);
-    String jsMethodName =  utils.createDeclarationMethodDescriptor(method).getMangledName();
+    String jsMethodName = utils.createDeclarationMethodDescriptor(method).getMangledName();
 
     sb.append(impl);
     sb.append(".prototype.");

diff --git a/tests/commons/pom.xml b/tests/commons/pom.xml
@@ -1,21 +1,140 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.treblereel.j2cl.processors</groupId>
-        <artifactId>parent</artifactId>
-        <version>0.5.1</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
 
-    <artifactId>commons</artifactId>
+    <groupId>org.treblereel.j2cl</groupId>
+    <artifactId>common-tests</artifactId>
+    <version>0.6-SNAPSHOT</version>
+
+    <name>Common test cases</name>
+    <description>Common test cases</description>
+    <url>https://github.com/treblereel/gwt3-processors</url>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.version>3.8.0</maven.compiler.version>
+        <maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>
+        <maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
+        <maven.fmt.plugin>2.9</maven.fmt.plugin>
+        <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
+        <maven.source.plugin>3.0.1</maven.source.plugin>
+        <maven.license.plugin>3.0</maven.license.plugin>
+        <maven.j2cl.plugin>0.21-SNAPSHOT</maven.j2cl.plugin>
+        <maven.j2cl.version>0.11.0-9336533b6</maven.j2cl.version>
+        <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
+
+        <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>
+        <jsinterop.base.version>1.0.0</jsinterop.base.version>
+        <elemental2.version>1.1.0</elemental2.version>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.treblereel.j2cl.processors</groupId>
+            <artifactId>annotations</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.jsinterop</groupId>
+            <artifactId>jsinterop-annotations</artifactId>
+            <version>${jsinterop.annotations.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.jsinterop</groupId>
+            <artifactId>base</artifactId>
+            <version>${jsinterop.base.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.elemental2</groupId>
+            <artifactId>elemental2-dom</artifactId>
+            <version>${elemental2.version}</version>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>com.vertispan.j2cl</groupId>
+            <artifactId>junit-annotations</artifactId>
+            <version>${maven.j2cl.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.vertispan.j2cl</groupId>
+            <artifactId>gwttestcase-emul</artifactId>
+            <version>${maven.j2cl.version}</version>
+            <classifier>sources</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.vertispan.j2cl</groupId>
+            <artifactId>junit-emul</artifactId>
+            <version>${maven.j2cl.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compiler.version}</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.treblereel.j2cl.processors</groupId>
+                            <artifactId>processors</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.vertispan.j2cl</groupId>
+                <artifactId>j2cl-maven-plugin</artifactId>
+                <version>${maven.j2cl.plugin}</version>
+                <executions>
+                    <execution>
+                        <id>j2cl-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <compilationLevel>ADVANCED</compilationLevel>
+                    <annotationProcessorMode>IGNORE_MAVEN</annotationProcessorMode>
+                    <webdriver>chrome</webdriver>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven.surefire.plugin}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>${maven.deploy.plugin.version}</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/tests/entrypoint/jstype/pom.xml b/tests/entrypoint/jstype/pom.xml
@@ -24,8 +24,8 @@
     <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
     <maven.source.plugin>3.0.1</maven.source.plugin>
     <maven.license.plugin>3.0</maven.license.plugin>
-    <maven.j2cl.plugin>0.20</maven.j2cl.plugin>
-    <maven.j2cl.version>0.10.0-3c97afeac</maven.j2cl.version>
+    <maven.j2cl.plugin>0.21-SNAPSHOT</maven.j2cl.plugin>
+    <maven.j2cl.version>0.11.0-9336533b6</maven.j2cl.version>
     <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
 
     <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>

diff --git a/tests/entrypoint/pojo/pom.xml b/tests/entrypoint/pojo/pom.xml
@@ -24,8 +24,8 @@
     <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
     <maven.source.plugin>3.0.1</maven.source.plugin>
     <maven.license.plugin>3.0</maven.license.plugin>
-    <maven.j2cl.plugin>0.20</maven.j2cl.plugin>
-    <maven.j2cl.version>0.10.0-3c97afeac</maven.j2cl.version>
+    <maven.j2cl.plugin>0.21-SNAPSHOT</maven.j2cl.plugin>
+    <maven.j2cl.version>0.11.0-9336533b6</maven.j2cl.version>
     <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
 
     <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>

diff --git a/tests/es6shim/pom.xml b/tests/es6shim/pom.xml
@@ -25,8 +25,8 @@
     <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
     <maven.source.plugin>3.0.1</maven.source.plugin>
     <maven.license.plugin>3.0</maven.license.plugin>
-    <maven.j2cl.plugin>0.20</maven.j2cl.plugin>
-    <maven.j2cl.version>0.10.0-3c97afeac</maven.j2cl.version>
+    <maven.j2cl.plugin>0.21-SNAPSHOT</maven.j2cl.plugin>
+    <maven.j2cl.version>0.11.0-9336533b6</maven.j2cl.version>
     <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
 
     <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>
@@ -101,7 +101,7 @@
       <plugin>
         <groupId>com.vertispan.j2cl</groupId>
         <artifactId>j2cl-maven-plugin</artifactId>
-        <version>0.20</version>
+        <version>0.21-SNAPSHOT</version>
         <configuration>
           <compilationLevel>ADVANCED</compilationLevel>
           <annotationProcessorMode>IGNORE_MAVEN</annotationProcessorMode>

diff --git a/tests/exports/pom.xml b/tests/exports/pom.xml
@@ -25,7 +25,7 @@
     <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
     <maven.source.plugin>3.0.1</maven.source.plugin>
     <maven.license.plugin>3.0</maven.license.plugin>
-    <maven.j2cl.plugin>0.20</maven.j2cl.plugin>
+    <maven.j2cl.plugin>0.21-SNAPSHOT</maven.j2cl.plugin>
     <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
 
     <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -19,7 +19,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
 
-    <maven.j2cl.plugin>0.20</maven.j2cl.plugin>
+    <maven.j2cl.plugin>0.21-SNAPSHOT</maven.j2cl.plugin>
     <maven.surefire.plugin.version>2.17</maven.surefire.plugin.version>
     <maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
     <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
@@ -29,7 +29,7 @@
     <jsinterop.base.version>1.0.0</jsinterop.base.version>
     <elemental2.version>1.1.0</elemental2.version>
     <!-- CI -->
-    <j2cl.version>0.10.0-3c97afeac</j2cl.version>
+    <j2cl.version>0.11.0-9336533b6</j2cl.version>
     <junit.version>4.11</junit.version>
   </properties>
 
@@ -42,6 +42,7 @@
     <module>translation/pom_fr.xml</module>
     <module>translation/pom_fr_nr.xml</module>
     <module>resources</module>
+    <module>commons</module>
   </modules>
 
   <dependencyManagement>

diff --git a/tests/translation/pom.xml b/tests/translation/pom.xml
@@ -25,8 +25,8 @@
         <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
         <maven.source.plugin>3.0.1</maven.source.plugin>
         <maven.license.plugin>3.0</maven.license.plugin>
-        <maven.j2cl.plugin>0.20</maven.j2cl.plugin>
-        <maven.j2cl.version>0.10.0-3c97afeac</maven.j2cl.version>
+        <maven.j2cl.plugin>0.21-SNAPSHOT</maven.j2cl.plugin>
+        <maven.j2cl.version>0.11.0-9336533b6</maven.j2cl.version>
         <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
 
         <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>

diff --git a/tests/translation/pom_fr.xml b/tests/translation/pom_fr.xml
@@ -25,8 +25,8 @@
         <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
         <maven.source.plugin>3.0.1</maven.source.plugin>
         <maven.license.plugin>3.0</maven.license.plugin>
-        <maven.j2cl.plugin>0.20</maven.j2cl.plugin>
-        <maven.j2cl.version>0.10.0-3c97afeac</maven.j2cl.version>
+        <maven.j2cl.plugin>0.21-SNAPSHOT</maven.j2cl.plugin>
+        <maven.j2cl.version>0.11.0-9336533b6</maven.j2cl.version>
         <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
 
         <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>

diff --git a/tests/translation/pom_fr_nr.xml b/tests/translation/pom_fr_nr.xml
@@ -25,8 +25,8 @@
         <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
         <maven.source.plugin>3.0.1</maven.source.plugin>
         <maven.license.plugin>3.0</maven.license.plugin>
-        <maven.j2cl.plugin>0.20</maven.j2cl.plugin>
-        <maven.j2cl.version>0.10.0-3c97afeac</maven.j2cl.version>
+        <maven.j2cl.plugin>0.21-SNAPSHOT</maven.j2cl.plugin>
+        <maven.j2cl.version>0.11.0-9336533b6</maven.j2cl.version>
         <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
 
         <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>

diff --git a/tests/translation/pom_no_bundle.xml b/tests/translation/pom_no_bundle.xml
@@ -29,8 +29,8 @@
         <maven.surefire.plugin>3.1.0</maven.surefire.plugin>
         <maven.source.plugin>3.0.1</maven.source.plugin>
         <maven.license.plugin>3.0</maven.license.plugin>
-        <maven.j2cl.plugin>0.20</maven.j2cl.plugin>
-        <maven.j2cl.version>0.10.0-3c97afeac</maven.j2cl.version>
+        <maven.j2cl.plugin>0.21-SNAPSHOT</maven.j2cl.plugin>
+        <maven.j2cl.version>0.11.0-9336533b6</maven.j2cl.version>
         <maven.jasmine.plugin.version>3.0-beta-02</maven.jasmine.plugin.version>
 
         <jsinterop.annotations.version>2.0.0</jsinterop.annotations.version>