Merge pull request #353 from NaluKit/release/2.20.0

Release/2.20.0
NaluKit · Feb 4, 2024 · e7ed1f0 · e7ed1f0
2 parents ef6b791 + 6b45e16
commit e7ed1f0
Show file tree

Hide file tree

Showing 23 changed files with 215 additions and 222 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -21,16 +21,14 @@ on:
     branches:
       - dev
       - main
-    pull_request:
-      branches:
-        - dev
-        - main
+    paths-ignore:
+    - "README.md"
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: '11'
@@ -42,8 +40,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: '11'
@@ -65,11 +63,11 @@ jobs:
     needs: test
     services:
       owasp-db:
-        image: philkohl/owasp-maven-action:latest
+        image: nalusolutionsgmbh/owasp-maven-action:latest
         options: --entrypoint /bin/sh --name owasp-db --hostname owasp-db
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: '11'
@@ -99,8 +97,8 @@ jobs:
     needs: build-and-owasp
     if: github.ref == 'refs/heads/dev'
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: '11'
@@ -137,8 +135,8 @@ jobs:
     needs: build-and-owasp
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: '11'

diff --git a/...b/workflows/delete-old-workflow-runs.yaml → .github/workflows/delete-workflow-runs.yaml b/...b/workflows/delete-old-workflow-runs.yaml → .github/workflows/delete-workflow-runs.yaml
diff --git a/.github/workflows/wiki-pages.yaml b/.github/workflows/wiki-pages.yaml
@@ -1,6 +1,9 @@
 name: WikiPages
 
-on: [push]
+on:
+  push:
+    branches:
+      - main
 
 jobs:
   build:

diff --git a/.gitignore b/.gitignore
@@ -2,22 +2,9 @@
 ### GWT template
 *.class
 
-# gwt caches and compiled units #
-gwt-unitCache/
-
-# boilerplate generated classes #
-.apt_generated/
-
-# more caches and things from deploy #
-war/WEB-INF/deploy/
-war/WEB-INF/classes/
-
 #compilation logs
 .gwt/
 
-#gwt junit compilation files
-www-test/
-
 #old GWT (1.5) created this dir
 .gwt-tmp/
 ### Java template
@@ -26,12 +13,6 @@ www-test/
 # Log file
 *.log
 
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
 # Package Files #
 *.jar
 *.war

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may
-be reported by contacting the project team at info@hossfeld-solutions.de. All complaints will
+be reported by contacting the project team at code-of-conduct@nalu-solutions.de. All complaints will
 be reviewed and investigated and will result in a response that is
 deemed necessary and appropriate to the circumstances. The project team
 is obligated to maintain confidentiality with regard to the reporter of

diff --git a/README.md b/README.md
@@ -136,12 +136,12 @@ To use Nalu add the following dependencies to your pom:
 <dependency>
     <groupId>com.github.nalukit</groupId>
     <artifactId>nalu</artifactId>
-    <version>2.12.7</version>
+    <version>2.20.0</version>
 </dependency>
 <dependency>
     <groupId>com.github.nalukit</groupId>
     <artifactId>nalu-processor</artifactId>
-    <version>2.12.7</version>
+    <version>2.20.0</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -171,7 +171,7 @@ If the project uses a widget set based on **Elemental2**, **Elemento** or **Domi
 <dependency>
     <groupId>com.github.nalukit</groupId>
     <artifactId>nalu-plugin-elemental2</artifactId>
-    <version>2.12.7</version>
+    <version>2.20.0</version>
 </dependency>
 ```
 
@@ -200,7 +200,7 @@ For Elemento there's a dedicated plugin which supports `org.jboss.gwt.elemento.c
 <dependency>
     <groupId>com.github.nalukit</groupId>
     <artifactId>nalu-plugin-elemento</artifactId>
-    <version>2.12.7</version>
+    <version>2.20.0</version>
 </dependency>
 ```
 
@@ -245,12 +245,12 @@ If your project uses a widget set based on **GWT** 2.8.2 or newer, use the **Nal
    <dependency>
       <groupId>com.github.nalukit</groupId>
       <artifactId>nalu-plugin-gwt</artifactId>
-      <version>2.12.7</version>
+      <version>2.20.0</version>
    </dependency>
    <dependency>
       <groupId>com.github.nalukit</groupId>
       <artifactId>nalu-plugin-gwt-processor</artifactId>
-      <version>2.12.7</version>
+      <version>2.20.0</version>
       <scope>provided</scope>
    </dependency>
 ```

diff --git a/nalu-plugin-core-web/pom.xml b/nalu-plugin-core-web/pom.xml
@@ -79,6 +79,12 @@
       <groupId>com.github.nalukit</groupId>
       <artifactId>nalu</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>elemental2-core</artifactId>
+          <groupId>com.google.elemental2</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.elemental2</groupId>

diff --git a/nalu-plugin-domino-v2/pom.xml b/nalu-plugin-domino-v2/pom.xml
@@ -83,6 +83,12 @@
       <groupId>com.github.nalukit</groupId>
       <artifactId>nalu</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>elemental2-core</artifactId>
+          <groupId>com.google.elemental2</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.github.nalukit</groupId>
@@ -116,6 +122,16 @@
       <groupId>org.dominokit</groupId>
       <artifactId>domino-ui</artifactId>
       <version>${domino.ui.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>elemental2-dom</artifactId>
+          <groupId>com.google.elemental2</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>elemental2-core</artifactId>
+          <groupId>com.google.elemental2</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.dominokit</groupId>

diff --git a/nalu-plugin-elemental2/pom.xml b/nalu-plugin-elemental2/pom.xml
@@ -79,6 +79,12 @@
       <groupId>com.github.nalukit</groupId>
       <artifactId>nalu</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>elemental2-core</artifactId>
+          <groupId>com.google.elemental2</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.github.nalukit</groupId>

diff --git a/nalu-plugin-elemento/pom.xml b/nalu-plugin-elemento/pom.xml
@@ -83,6 +83,12 @@
       <groupId>com.github.nalukit</groupId>
       <artifactId>nalu</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>elemental2-core</artifactId>
+          <groupId>com.google.elemental2</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.github.nalukit</groupId>
@@ -118,6 +124,14 @@
           <artifactId>elemental2-dom</artifactId>
           <groupId>com.google.elemental2</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>base</artifactId>
+          <groupId>com.google.jsinterop</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jsinterop-annotations</artifactId>
+          <groupId>com.google.jsinterop</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <!-- gwt-events: once it is on maven central, use it!

diff --git a/nalu-plugin-gwt-processor/pom.xml b/nalu-plugin-gwt-processor/pom.xml
@@ -108,11 +108,31 @@
       <groupId>com.github.nalukit</groupId>
       <artifactId>nalu</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>base</artifactId>
+          <groupId>com.google.jsinterop</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>elemental2-promise</artifactId>
+          <groupId>com.google.elemental2</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.github.nalukit</groupId>
       <artifactId>nalu-plugin-gwt</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>base</artifactId>
+          <groupId>com.google.jsinterop</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>elemental2-core</artifactId>
+          <groupId>com.google.elemental2</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -124,6 +144,10 @@
           <artifactId>checker-qual</artifactId>
           <groupId>org.checkerframework</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>guava</artifactId>
+          <groupId>com.google.guava</groupId>
+        </exclusion>
       </exclusions>
       <optional>true</optional>
     </dependency>
@@ -138,8 +162,11 @@
       <version>${javapoet.version}</version>
     </dependency>
 
-
-    <!-- only for testing -->
+    <dependency>
+      <artifactId>guava</artifactId>
+      <groupId>com.google.guava</groupId>
+      <version>${guava.version}</version>
+    </dependency>
 
     <!-- only for testing -->
     <dependency>
@@ -163,6 +190,10 @@
           <artifactId>truth</artifactId>
           <groupId>com.google.truth</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>checker-qual</artifactId>
+          <groupId>org.checkerframework</groupId>
+        </exclusion>
       </exclusions>
       <scope>test</scope>
     </dependency>

diff --git a/nalu-plugin-gwt/pom.xml b/nalu-plugin-gwt/pom.xml
@@ -112,6 +112,12 @@
       <groupId>com.github.nalukit</groupId>
       <artifactId>nalu</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>elemental2-core</artifactId>
+          <groupId>com.google.elemental2</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.github.nalukit</groupId>

diff --git a/nalu-processor/pom.xml b/nalu-processor/pom.xml
@@ -79,6 +79,12 @@
       <groupId>com.github.nalukit</groupId>
       <artifactId>nalu</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>elemental2-core</artifactId>
+          <groupId>com.google.elemental2</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -132,6 +138,10 @@
           <artifactId>truth</artifactId>
           <groupId>com.google.truth</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>checker-qual</artifactId>
+          <groupId>org.checkerframework</groupId>
+        </exclusion>
       </exclusions>
       <scope>test</scope>
     </dependency>

diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/NaluProcessor.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/NaluProcessor.java
@@ -481,7 +481,7 @@ private void handleErrorPopUpControllerAnnotation(RoundEnvironment roundEnv)
       errorPopUpControllerModels.add(errorPopUpControllerModel);
     }
     // save data in metaModel
-    if (errorPopUpControllerModels.size() > 0) {
+    if (!errorPopUpControllerModels.isEmpty()) {
       this.metaModel.setErrorPopUpController(errorPopUpControllerModels.get(0));
     }
   }
@@ -845,9 +845,12 @@ private MetaModel restore() {
                                          .getResource(StandardLocation.CLASS_OUTPUT,
                                                       "",
                                                       this.createRelativeFileName());
-      return gson.fromJson(resource.getCharContent(true)
-                                   .toString(),
-                           MetaModel.class);
+      MetaModel model = gson.fromJson(resource.getCharContent(true)
+                                                   .toString(),
+                                           MetaModel.class);
+      // clear working lists
+      model.clearGeneratedConditionList();
+      return model;
     } catch (IOException e) {
       // every thing is ok -> no operation
       return null;