Merge pull request #103 from treblereel/development

Development
crysknife-io · Jul 8, 2024 · e5aead0 · e5aead0
2 parents f1be407 + 20d13fc
commit e5aead0
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -69,6 +69,7 @@ Crysknife requires the following software in order to run:
 * Java 11 or later
 * Maven 3.6.3 or later
 * Basic knowledge of J2Cl and Maven
+* j2cl-maven-plugin 0.22 or later
 
 
 ## 1.3. Getting Started with Crysknife
@@ -104,7 +105,7 @@ To read more about Jakarta CDI, please visit official documentation (https://jak
 
 * pre-requisites: working maven j2cl application. If you don't have one, please follow the instructions in the J2CL Maven Plugin documentation (https://github.com/Vertispan/j2clmavenplugin). 
 
-tip : clone application from https://github.com/treblereel/j2cl-tests or genetare it from j2cl-maven-plugin archetype.
+tip : clone application from https://github.com/treblereel/j2cl-tests, use demo or generate it from j2cl-maven-plugin archetype.
 
 * add crysknife  dependencies to your pom.xml
 

diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.crysknife</groupId>
         <artifactId>crysknife-parent</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
+        <version>0.7</version>
     </parent>
 
     <artifactId>crysknife-annotations</artifactId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.crysknife</groupId>
     <artifactId>bom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
     <packaging>pom</packaging>
 
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.crysknife</groupId>
     <artifactId>crysknife-parent</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
   </parent>
 
   <artifactId>crysknife-core</artifactId>

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>io.crysknife.demo</groupId>
   <artifactId>demo</artifactId>
-  <version>0.5.2-SNAPSHOT</version>
+  <version>0.7</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -14,15 +14,10 @@
 
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <maven.jetty.plugin.version>9.4.31.v20200723</maven.jetty.plugin.version>
-    <maven.tomcat.plugin.version>2.2</maven.tomcat.plugin.version>
-    <maven.properties.plugin>1.0.0</maven.properties.plugin>
 
-    <webappdir>${project.build.directory}/webapp</webappdir>
-    <webapp.libdir>${webappdir}/WEB-INF/lib</webapp.libdir>
-    <elemental2.version>1.1.0</elemental2.version>
-    <j2cl.maven.plugin.version>0.21-SNAPSHOT</j2cl.maven.plugin.version>
-    <org.treblereel.j2cl.processors.version>0.6.1</org.treblereel.j2cl.processors.version>
+    <elemental2.version>1.2.1</elemental2.version>
+    <j2cl.maven.plugin.version>0.23.1</j2cl.maven.plugin.version>
+    <org.treblereel.j2cl.processors.version>0.7</org.treblereel.j2cl.processors.version>
   </properties>
 
   <dependencyManagement>
@@ -88,7 +83,7 @@
     </resources>
     <plugins>
       <plugin>
-        <groupId>com.vertispan.j2cl</groupId>
+        <groupId>org.kie.j2cl.tools</groupId>
         <artifactId>j2cl-maven-plugin</artifactId>
         <version>${j2cl.maven.plugin.version}</version>
         <executions>

diff --git a/internal-bom/pom.xml b/internal-bom/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.crysknife</groupId>
     <artifactId>internal-bom</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
     <packaging>pom</packaging>
 
 
@@ -46,8 +46,8 @@
         <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.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
         <maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
         <maven.source.plugin.version>3.0.1</maven.source.plugin.version>
@@ -74,11 +74,11 @@
         <google.jsinterop.annotations.version>2.0.0</google.jsinterop.annotations.version>
         <google.guava.version>28.1-jre</google.guava.version>
         <classgraph.classgraph.version>4.8.156</classgraph.classgraph.version>
-        <org.treblereel.j2cl.processors.version>0.6.1</org.treblereel.j2cl.processors.version>
-        <gwt.jakarta.version>0.2</gwt.jakarta.version>
+        <org.treblereel.j2cl.processors.version>0.7</org.treblereel.j2cl.processors.version>
+        <gwt.jakarta.version>0.4</gwt.jakarta.version>
 
         <javaparser.core.version>3.25.5</javaparser.core.version>
-        <elemental2.version>1.1.0</elemental2.version>
+        <elemental2.version>1.2.1</elemental2.version>
         <auto.common.version>1.2.1</auto.common.version>
         <auto.service.version>1.0-rc7</auto.service.version>
         <mockito.core.version>4.6.1</mockito.core.version>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>io.crysknife</groupId>
     <artifactId>crysknife-parent</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
     <packaging>pom</packaging>
 
     <name>crysknife parent</name>
@@ -285,7 +285,7 @@
                             <version>3.0</version>
                         </requireMavenVersion>
                         <requireJavaVersion>
-                            <version>(1.8.0,)</version>
+                            <version>(11.0,)</version>
                         </requireJavaVersion>
                     </rules>
                 </configuration>

diff --git a/processor/pom.xml b/processor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.crysknife</groupId>
     <artifactId>crysknife-parent</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
   </parent>
 
   <artifactId>crysknife-processor</artifactId>

diff --git a/processor/src/main/java/io/crysknife/AfterBurnFactoryProcessor.java b/processor/src/main/java/io/crysknife/AfterBurnFactoryProcessor.java
@@ -44,7 +44,7 @@
 import io.crysknife.task.TaskGroup;
 
 @AutoService(Processor.class)
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_11)
 public class AfterBurnFactoryProcessor extends AbstractProcessor {
 
   private static final TreeLogger logger = new PrintWriterTreeLogger();

diff --git a/processor/src/main/java/io/crysknife/ApplicationProcessor.java b/processor/src/main/java/io/crysknife/ApplicationProcessor.java
@@ -59,7 +59,7 @@
 
 
 @AutoService(Processor.class)
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_11)
 public class ApplicationProcessor extends AbstractProcessor {
 
     @Override

diff --git a/processor/src/main/java/io/crysknife/BeanManagerGeneratorProcessor.java b/processor/src/main/java/io/crysknife/BeanManagerGeneratorProcessor.java
@@ -36,7 +36,7 @@
 
 
 @AutoService(Processor.class)
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_11)
 public class BeanManagerGeneratorProcessor extends AbstractProcessor {
 
   private IOCContext iocContext;

diff --git a/tests/j2cl-tests/pom.xml b/tests/j2cl-tests/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.crysknife.tests</groupId>
     <artifactId>j2cl-tests</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
     <description>J2CL tests</description>
 
     <properties>

diff --git a/tests/jre-tests/cdi/pom.xml b/tests/jre-tests/cdi/pom.xml
@@ -4,14 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.crysknife.tests</groupId>
     <artifactId>jre-cdi-tests</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
         <aspectj.version>1.9.19</aspectj.version>
         <aspectj.maven.plugin.version>1.14.0</aspectj.maven.plugin.version>

diff --git a/tests/jre-tests/pom.xml b/tests/jre-tests/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jre-parent</artifactId>
     <groupId>io.crysknife.tests</groupId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
     <packaging>pom</packaging>
     <name>Crysknife :: Tests :: JRE</name>
 

diff --git a/tests/jre-tests/reduces-classpath/app/pom.xml b/tests/jre-tests/reduces-classpath/app/pom.xml
@@ -4,14 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.crysknife.tests</groupId>
     <artifactId>reduces-classpath-app</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
         <aspectj.version>1.9.19</aspectj.version>
         <aspectj.maven.plugin.version>1.14.0</aspectj.maven.plugin.version>

diff --git a/tests/jre-tests/reduces-classpath/dep/pom.xml b/tests/jre-tests/reduces-classpath/dep/pom.xml
@@ -5,13 +5,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.crysknife.tests</groupId>
     <artifactId>reduces-classpath-dep</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
     <packaging>jar</packaging>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
     <dependencies>
         <dependency>
@@ -21,4 +22,16 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/tests/jre-tests/reduces-classpath/pom.xml b/tests/jre-tests/reduces-classpath/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.crysknife</groupId>
     <artifactId>reduces-classpath-parent</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/tests/jre-tests/simple/pom.xml b/tests/jre-tests/simple/pom.xml
@@ -4,14 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.crysknife.tests</groupId>
     <artifactId>jre-simple-tests</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
         <aspectj.version>1.9.19</aspectj.version>
         <aspectj.maven.plugin.version>1.14.0</aspectj.maven.plugin.version>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>io.crysknife</groupId>
     <artifactId>crysknife-parent</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
   </parent>
 
   <artifactId>tests-parent</artifactId>
   <groupId>io.crysknife.tests</groupId>
-  <version>0.5.2-SNAPSHOT</version>
+  <version>0.7</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/ui/core/pom.xml b/ui/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.crysknife.ui</groupId>
     <artifactId>parent</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
   </parent>
 
   <artifactId>crysknife-ui-core</artifactId>

diff --git a/ui/core/src/main/java/io/crysknife/ui/navigation/client/DefaultContentDelegation.java b/ui/core/src/main/java/io/crysknife/ui/navigation/client/DefaultContentDelegation.java
@@ -29,8 +29,7 @@ public class DefaultContentDelegation implements ContentDelegation {
   public void showContent(Object page, HTMLElement container, JsArray<HTMLElement> elements,
       Object previousPage, DelegationControl control) {
     if (container != null && elements != null) {
-
-      elements.forEach((node, p1, p2) -> {
+      elements.forEach((node, index) -> {
         container.append(node);
         return null;
       });

diff --git a/ui/generator/pom.xml b/ui/generator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.crysknife.ui</groupId>
     <artifactId>parent</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
   </parent>
 
   <artifactId>crysknife-ui-generator</artifactId>

diff --git a/ui/pom.xml b/ui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.crysknife</groupId>
     <artifactId>crysknife-parent</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.7</version>
   </parent>
 
   <groupId>io.crysknife.ui</groupId>