diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2f6adcb0..181c54d2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,7 +48,7 @@ jobs: cache: maven - name: Test with Maven run: mvn test -ntp - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: surefire-report diff --git a/README.md b/README.md index 8497c7dc..51457324 100644 --- a/README.md +++ b/README.md @@ -136,12 +136,12 @@ To use Nalu add the following dependencies to your pom: com.github.nalukit nalu - 2.20.3 + 2.20.4 com.github.nalukit nalu-processor - 2.20.3 + 2.20.4 provided ``` @@ -173,7 +173,7 @@ If the project uses a widget set based on **Elemental2**, **Elemento** or **Domi com.github.nalukit nalu-plugin-elemental2 - 2.20.3 + 2.20.4 ``` @@ -202,7 +202,7 @@ For Elemento there's a dedicated plugin which supports `org.jboss.gwt.elemento.c com.github.nalukit nalu-plugin-elemento - 2.20.3 + 2.20.4 ``` @@ -222,7 +222,7 @@ For Domino-UI Version 2 there's also a dedicated plugin which supports `org.domi com.github.nalukit nalu-plugin-domino-v2 - 2.20.3 + 2.20.4 ``` @@ -265,12 +265,12 @@ If your project uses a widget set based on **GWT** 2.8.2 or newer, use the **Nal com.github.nalukit nalu-plugin-gwt - 2.20.3 + 2.20.4 com.github.nalukit nalu-plugin-gwt-processor - 2.20.3 + 2.20.4 provided ``` diff --git a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java index 8a4a773f..f9e4bcf7 100644 --- a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java +++ b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java @@ -34,7 +34,7 @@ public void logProcessorVersion() { this.eventBus.fireEvent(LogEvent.create() .sdmOnly(true) .addMessage("=================================================================================") - .addMessage("Nalu processor version >>2.20.3<< used to generate this source") + .addMessage("Nalu processor version >>2.20.4<< used to generate this source") .addMessage("=================================================================================") .addMessage("")); } diff --git a/nalu/pom.xml b/nalu/pom.xml index 7d0b8c8f..07d0121b 100644 --- a/nalu/pom.xml +++ b/nalu/pom.xml @@ -103,7 +103,7 @@ org.hamcrest - hamcrest-all + hamcrest-core ${hamcrest.version} diff --git a/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java b/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java index 66eefaf4..5ef67416 100644 --- a/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java +++ b/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java @@ -23,7 +23,7 @@ public class Nalu { public static String getVersion() { // TODO Change this for other versions - return "2.20.3"; + return "2.20.4"; } public static boolean hasHistory() { diff --git a/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java b/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java index 1d8ed871..d3e69685 100644 --- a/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java +++ b/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java @@ -14,7 +14,7 @@ public class NaluTest { void getVersion() throws IOException { // TODO Change this if you want to test against another version - Assertions.assertEquals("2.20.3", + Assertions.assertEquals("2.20.4", Nalu.getVersion()); } diff --git a/owasp/owasp-suppressions.xml b/owasp/owasp-suppressions.xml index 1be8f73e..dfbb8be9 100644 --- a/owasp/owasp-suppressions.xml +++ b/owasp/owasp-suppressions.xml @@ -10,19 +10,26 @@ - + ^pkg:maven/org\.mortbay\.jasper/apache\-jsp@.*$ + CVE-2021-29425 + CVE-2024-47554 + CVE-2022-2047 + CVE-2022-2048 CVE-2020-8022 CVE-2022-23101 CVE-2022-23181 CVE-2022-25762 + CVE-2023-26048 + CVE-2023-26049 CVE-2023-28708 CVE-2022-29885 CVE-2022-34305 CVE-2023-36478 + CVE-2023-36479 + CVE-2023-40167 CVE-2023-41080 + CVE-2023-41900 CVE-2022-42252 CVE-2021-42340 CVE-2023-42795 @@ -31,6 +38,9 @@ CVE-2023-44487 CVE-2023-45648 CVE-2023-46589 + CVE-2024-6763 + CVE-2024-8184 + CVE-2024-22201 @@ -38,44 +48,34 @@ file name: apache-jsp-9.4.44.v20210927.jar ]]> ^pkg:maven/org\.eclipse\.jetty/apache\-jsp@.*$ - CVE-2022-2047 CVE-2022-2048 - CVE-2023-26048 - CVE-2023-26049 CVE-2023-36478 - CVE-2023-36479 - CVE-2023-40167 - CVE-2023-41900 CVE-2023-44487 + CVE-2024-22201 - - ^pkg:maven/commons\-io/commons\-io@.*$ - CVE-2021-29425 - - - - + ^pkg:maven/commons\-net/commons\-net@.*$ CVE-2021-37533 - + + - + ^pkg:maven/org\.apache\.commons/commons\-text@.*$ CVE-2022-29546 CVE-2022-42889 - + ^pkg:maven/com\.google\.code\.gson/gson@.*$ CVE-2022-25647 ^pkg:maven/net\.sourceforge\.htmlunit/htmlunit\-cssparser@.*$ CVE-2023-2798 @@ -84,9 +84,10 @@ CVE-2022-28366 CVE-2022-29546 CVE-2023-49093 - + + - + ^pkg:maven/net\.sourceforge\.htmlunit/htmlunit\-core\-js@.*$ CVE-2022-29546 CVE-2023-26119 @@ -94,7 +95,7 @@ - + ^pkg:maven/net\.sourceforge\.htmlunit/htmlunit@.*$ CVE-2022-29546 CVE-2023-26119 @@ -102,15 +103,13 @@ - + ^pkg:maven/com\.ibm\.icu/icu4j@.*$ CVE-2018-18928 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-http@.*$ CVE-2022-2047 CVE-2022-2048 @@ -121,11 +120,11 @@ CVE-2023-40167 CVE-2023-41900 CVE-2023-44487 - + CVE-2024-22201 + + - + ^pkg:maven/org\.eclipse\.jetty/jetty\-io@.*$ CVE-2022-2047 CVE-2022-2048 @@ -136,23 +135,34 @@ CVE-2023-40167 CVE-2023-41900 CVE-2023-44487 + CVE-2024-6763 + CVE-2024-8184 + CVE-2024-22201 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-jndi@.*$ + CVE-2022-2047 CVE-2022-2048 + CVE-2023-26048 + CVE-2023-26049 CVE-2023-36478 + CVE-2023-36479 + CVE-2023-40167 + CVE-2023-41900 CVE-2023-44487 + CVE-2024-6763 + CVE-2024-8184 + CVE-2024-22201 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-plus@.*$ CVE-2022-2048 CVE-2023-44487 CVE-2023-36478 + CVE-2024-22201 @@ -167,40 +177,42 @@ CVE-2023-36478 CVE-2023-40167 CVE-2023-41900 + CVE-2024-6763 + CVE-2024-8184 + CVE-2024-22201 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-util@.*$ CVE-2022-2048 CVE-2023-44487 CVE-2023-36478 + CVE-2024-22201 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-continuation@.*$ CVE-2022-2048 CVE-2023-36478 CVE-2023-44487 + CVE-2024-22201 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-annotations@.*$ + CVE-2022-2047 CVE-2022-2048 CVE-2023-26048 CVE-2023-26049 CVE-2023-36478 + CVE-2023-36479 CVE-2023-40167 CVE-2023-44487 + CVE-2024-22201 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-util\-ajax@.*$ CVE-2022-2047 CVE-2022-2048 @@ -211,9 +223,10 @@ CVE-2023-40167 CVE-2023-41900 CVE-2023-44487 + CVE-2024-22201 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-xml@.*$ CVE-2022-2047 CVE-2022-2048 @@ -224,10 +237,11 @@ CVE-2023-40167 CVE-2023-41900 CVE-2023-44487 + CVE-2024-22201 - + ^pkg:maven/net\.sourceforge\.htmlunit/neko\-htmlunit@.*$ CVE-2023-2048 CVE-2023-2798 @@ -238,13 +252,13 @@ - + ^pkg:maven/xalan/serializer@.*$ CVE-2022-34169 - + ^pkg:maven/tapestry/tapestry@.*$ CVE-2014-1972 CVE-2020-17531 @@ -252,7 +266,7 @@ - + ^pkg:maven/org\.eclipse\.jetty\.websocket/websocket\-client@.*$ CVE-2022-2047 CVE-2022-2048 @@ -263,16 +277,11 @@ CVE-2023-40167 CVE-2023-41900 CVE-2023-44487 + CVE-2024-22201 - - ^pkg:maven/commons-io/commons-io@.*$ - CVE-2024-47554 - - - - + ^pkg:maven/org\.eclipse\.jetty\.websocket/websocket\-common@.*$ CVE-2022-2047 CVE-2022-2048 @@ -283,22 +292,23 @@ CVE-2023-40167 CVE-2023-41900 CVE-2023-44487 + CVE-2024-22201 - + ^pkg:maven/xalan/xalan@.*$ CVE-2022-34169 - + ^pkg:maven/xerces/xercesImpl@.*$ CVE-2017-10355 CVE-2022-23437 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-client@.*$ CVE-2022-2047 CVE-2022-2048 @@ -310,9 +320,10 @@ CVE-2023-41900 CVE-2023-44487 CVE-2023-36478 + CVE-2024-22201 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-webapp@.*$ CVE-2022-2048 CVE-2023-26048 @@ -320,10 +331,11 @@ CVE-2022-2047 CVE-2023-44487 CVE-2023-36478 + CVE-2024-22201 ^pkg:maven/org\.eclipse\.jetty/jetty\-security@.*$ CVE-2022-2047 @@ -336,11 +348,10 @@ CVE-2023-41900 CVE-2023-44467 CVE-2023-44487 + CVE-2024-22201 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-servlet@.*$ CVE-2022-2048 CVE-2023-26048 @@ -348,11 +359,10 @@ CVE-2022-2047 CVE-2023-44487 CVE-2023-36478 + CVE-2024-22201 - + ^pkg:maven/org\.eclipse\.jetty/jetty\-servlets@.*$ CVE-2022-2047 CVE-2022-2048 @@ -363,12 +373,11 @@ CVE-2023-40167 CVE-2023-41900 CVE-2023-44487 + CVE-2024-22201 - + ^pkg:maven/net\.sourceforge\.htmlunit/htmlunit\-core\-js@.*$ CVE-2023-2798 CVE-2023-36478 @@ -376,26 +385,17 @@ CVE-2023-44487 - + ^pkg:maven/net\.sourceforge\.htmlunit/htmlunit@.*$ CVE-2023-2798 ^pkg:maven/com\.google\.guava/guava@.*$ cpe:/a:google:guava CVE-2020-8908 CVE-2023-2976 - - - ^pkg:maven/org\.eclipse\.jetty/jetty-server@.*$ - CVE-2024-8184 - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2d73f92e..d5d1b0e5 100644 --- a/pom.xml +++ b/pom.xml @@ -87,19 +87,18 @@ - 2.20.3 + 2.20.4 1.2.2 1.1.1 0.21.0 - 2.10.1 - 1.2.1 - 33.2.1-jre + 1.2.3 + 2.12.1 + 33.4.0-jre 1.0.0-RC1 1.0.0-RC1 - 2.12.1 - 1.3 - 2.2 + 2.12.2 + 3.0 ${java.home}/bin/javadoc 1.13.0 5.10.3 diff --git a/wiki/14.-Controllers-&-Composites.md b/wiki/14.-Controllers-&-Composites.md index ea96d2cf..83d77ab7 100644 --- a/wiki/14.-Controllers-&-Composites.md +++ b/wiki/14.-Controllers-&-Composites.md @@ -102,7 +102,7 @@ Keep in MInd, that all routes need the same number and names for the parameters. ### Parameters In case a controller accepts parameters, you have to add the parameters to the route attribute. Parameters are defined -by using '/:parameterName'. +by using ':parameterName' or '{parameterName}'. To let Nalu inject a parameter from the route into the controller, you have to create a method, which accepts a String parameter and annotate the method using the `@AcceptParameter("parameterName")` annotation. diff --git a/wiki/Home.md b/wiki/Home.md index 88866cbb..78d2d130 100644 --- a/wiki/Home.md +++ b/wiki/Home.md @@ -4,7 +4,7 @@ Inside the wiki you will find a lot of useful information about Nalu. If you have any questions about the framework, please use the [Nalu Gitter room](https://gitter.im/NaluKit42/lobby). -The current version of Nalu works with Java 8, 11 & 17 and is tested with the latest GWT version. +The current version of Nalu works with Java 11 & 17 and is tested with the latest GWT version. [//]: # (## Nalu Project Generator)