Skip to content

Commit 3643862

Browse files
Merge pull request #371 from NaluKit/release/2.20.5
Release/2.20.5
2 parents a103e48 + 6f1a1c4 commit 3643862

File tree

16 files changed

+171
-54
lines changed

16 files changed

+171
-54
lines changed

.github/workflows/build.yaml

Lines changed: 82 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
1716
name: Build & Deploy
1817

1918
on:
@@ -22,9 +21,9 @@ on:
2221
- dev
2322
- main
2423
paths-ignore:
25-
- "README.md"
24+
- "README.md"
2625
jobs:
27-
build:
26+
build-jdk11:
2827
runs-on: ubuntu-latest
2928
steps:
3029
- uses: actions/checkout@v4
@@ -35,17 +34,92 @@ jobs:
3534
cache: maven
3635
- name: Compile with Maven
3736
run: mvn compile -ntp
37+
build-jdk17:
38+
runs-on: ubuntu-latest
39+
steps:
40+
- uses: actions/checkout@v4
41+
- uses: actions/setup-java@v4
42+
with:
43+
distribution: temurin
44+
java-version: '17'
45+
cache: maven
46+
- name: Compile with Maven
47+
run: mvn compile -ntp
48+
build-jdk21:
49+
runs-on: ubuntu-latest
50+
steps:
51+
- uses: actions/checkout@v4
52+
- uses: actions/setup-java@v4
53+
with:
54+
distribution: temurin
55+
java-version: '21'
56+
cache: maven
57+
- name: Compile with Maven
58+
run: mvn compile -ntp
3859

39-
test:
60+
check-versions:
4061
runs-on: ubuntu-latest
41-
needs: build
62+
needs: [ build-jdk11, build-jdk17, build-jdk21 ]
63+
timeout-minutes: 8
4264
steps:
4365
- uses: actions/checkout@v4
4466
- uses: actions/setup-java@v4
4567
with:
4668
distribution: temurin
4769
java-version: '11'
4870
cache: maven
71+
- uses: actions/setup-java@v4
72+
with:
73+
distribution: temurin
74+
java-version: '17'
75+
cache: maven
76+
- name: Check versions with Maven
77+
run: mvn versions:display-dependency-updates -ntp
78+
79+
test-jdk11:
80+
runs-on: ubuntu-latest
81+
needs: [ build-jdk11 ]
82+
steps:
83+
- uses: actions/checkout@v4
84+
- uses: actions/setup-java@v4
85+
with:
86+
distribution: temurin
87+
java-version: '11'
88+
cache: maven
89+
- name: Test with Maven
90+
run: mvn test -ntp
91+
- uses: actions/upload-artifact@v4
92+
if: failure()
93+
with:
94+
name: surefire-report
95+
path: target/surefire-reports/
96+
test-jdk17:
97+
runs-on: ubuntu-latest
98+
needs: [ build-jdk17 ]
99+
steps:
100+
- uses: actions/checkout@v4
101+
- uses: actions/setup-java@v4
102+
with:
103+
distribution: temurin
104+
java-version: '17'
105+
cache: maven
106+
- name: Test with Maven
107+
run: mvn test -ntp
108+
- uses: actions/upload-artifact@v4
109+
if: failure()
110+
with:
111+
name: surefire-report
112+
path: target/surefire-reports/
113+
test-jdk21:
114+
runs-on: ubuntu-latest
115+
needs: [ build-jdk21 ]
116+
steps:
117+
- uses: actions/checkout@v4
118+
- uses: actions/setup-java@v4
119+
with:
120+
distribution: temurin
121+
java-version: '21'
122+
cache: maven
49123
- name: Test with Maven
50124
run: mvn test -ntp
51125
- uses: actions/upload-artifact@v4
@@ -61,7 +135,7 @@ jobs:
61135
actions: read
62136
contents: read
63137
security-events: write
64-
needs: build
138+
needs: [ build-jdk11, build-jdk17, build-jdk21 ]
65139
services:
66140
owasp-db:
67141
image: nalusolutionsgmbh/owasp-maven-action:latest
@@ -93,7 +167,7 @@ jobs:
93167

94168
maven-deploy-dev:
95169
runs-on: ubuntu-latest
96-
needs: [ test, owasp ]
170+
needs: [ check-versions, test-jdk11, test-jdk17, test-jdk21, owasp ]
97171
if: github.ref == 'refs/heads/dev'
98172
steps:
99173
- uses: actions/checkout@v4
@@ -131,7 +205,7 @@ jobs:
131205

132206
maven-deploy-main:
133207
runs-on: ubuntu-latest
134-
needs: [ test, owasp ]
208+
needs: [ check-versions, test-jdk11, test-jdk17, test-jdk21, owasp ]
135209
if: github.ref == 'refs/heads/main'
136210
steps:
137211
- uses: actions/checkout@v4

.github/workflows/delete-workflow-runs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ jobs:
5252
with:
5353
token: ${{ github.token }}
5454
repository: ${{ github.repository }}
55-
retain_days: ${{ github.event.inputs.days }}
56-
keep_minimum_runs: ${{ github.event.inputs.minimum_runs }}
55+
retain_days: ${{ github.event.inputs.days || 30 }}
56+
keep_minimum_runs: ${{ github.event.inputs.minimum_runs || 6 }}
5757
delete_workflow_pattern: ${{ github.event.inputs.delete_workflow_pattern }}
5858
delete_workflow_by_state_pattern: ${{ github.event.inputs.delete_workflow_by_state_pattern }}
5959
delete_run_by_conclusion_pattern: >-

README.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ To use Nalu add the following dependencies to your pom:
136136
<dependency>
137137
<groupId>com.github.nalukit</groupId>
138138
<artifactId>nalu</artifactId>
139-
<version>2.20.4</version>
139+
<version>2.20.5</version>
140140
</dependency>
141141
<dependency>
142142
<groupId>com.github.nalukit</groupId>
143143
<artifactId>nalu-processor</artifactId>
144-
<version>2.20.4</version>
144+
<version>2.20.5</version>
145145
<scope>provided</scope>
146146
</dependency>
147147
```
@@ -173,7 +173,7 @@ If the project uses a widget set based on **Elemental2**, **Elemento** or **Domi
173173
<dependency>
174174
<groupId>com.github.nalukit</groupId>
175175
<artifactId>nalu-plugin-elemental2</artifactId>
176-
<version>2.20.4</version>
176+
<version>2.20.5</version>
177177
</dependency>
178178
```
179179

@@ -202,7 +202,7 @@ For Elemento there's a dedicated plugin which supports `org.jboss.gwt.elemento.c
202202
<dependency>
203203
<groupId>com.github.nalukit</groupId>
204204
<artifactId>nalu-plugin-elemento</artifactId>
205-
<version>2.20.4</version>
205+
<version>2.20.5</version>
206206
</dependency>
207207
```
208208

@@ -222,7 +222,7 @@ For Domino-UI Version 2 there's also a dedicated plugin which supports `org.domi
222222
<dependency>
223223
<groupId>com.github.nalukit</groupId>
224224
<artifactId>nalu-plugin-domino-v2</artifactId>
225-
<version>2.20.4</version>
225+
<version>2.20.5</version>
226226
</dependency>
227227
```
228228

@@ -265,12 +265,12 @@ If your project uses a widget set based on **GWT** 2.8.2 or newer, use the **Nal
265265
<dependency>
266266
<groupId>com.github.nalukit</groupId>
267267
<artifactId>nalu-plugin-gwt</artifactId>
268-
<version>2.20.4</version>
268+
<version>2.20.5</version>
269269
</dependency>
270270
<dependency>
271271
<groupId>com.github.nalukit</groupId>
272272
<artifactId>nalu-plugin-gwt-processor</artifactId>
273-
<version>2.20.4</version>
273+
<version>2.20.5</version>
274274
<scope>provided</scope>
275275
</dependency>
276276
```
@@ -284,6 +284,10 @@ See the wiki for more information about Nalu and how to use it.
284284
Due to a bug in older version of the maven-compiler-plugin, the output of a annotation processor - during a Maven build - will not be logged.
285285
To ensure, that the processor output is logged, use the latest maven-compiler-plugin.
286286

287+
### System Requirements
288+
289+
Nalu supports the latest version of GWT and requires at least Java 11. During a build, Nalu is tested against Java 11, 17 and 21.
290+
287291
## Wiki
288292
More useful information about Nalu and how to use it, can be found inside the [Wiki](https://github.com/nalukit/nalu/wiki).
289293

nalu-plugin-core-web/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<plugin>
139139
<groupId>org.apache.maven.plugins</groupId>
140140
<artifactId>maven-compiler-plugin</artifactId>
141-
<version>3.11.0</version>
141+
<version>${plugin.version.compiler}</version>
142142
<configuration>
143143
<source>${maven.compiler.source}</source>
144144
<target>${maven.compiler.target}</target>

nalu-plugin-domino-v2/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</issueManagement>
7676

7777
<properties>
78-
<domino.ui.version>2.0.2</domino.ui.version>
78+
<domino.ui.version>2.0.4</domino.ui.version>
7979
</properties>
8080

8181
<dependencies>
@@ -166,7 +166,7 @@
166166
<plugin>
167167
<groupId>org.apache.maven.plugins</groupId>
168168
<artifactId>maven-compiler-plugin</artifactId>
169-
<version>3.11.0</version>
169+
<version>${plugin.version.compiler}</version>
170170
<configuration>
171171
<source>${maven.compiler.source}</source>
172172
<target>${maven.compiler.target}</target>

nalu-plugin-elemental2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<plugin>
141141
<groupId>org.apache.maven.plugins</groupId>
142142
<artifactId>maven-compiler-plugin</artifactId>
143-
<version>3.11.0</version>
143+
<version>${plugin.version.compiler}</version>
144144
<configuration>
145145
<source>${maven.compiler.source}</source>
146146
<target>${maven.compiler.target}</target>

nalu-plugin-elemento/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</issueManagement>
7676

7777
<properties>
78-
<elemento.version>1.6.5</elemento.version>
78+
<elemento.version>1.7.0</elemento.version>
7979
</properties>
8080

8181
<dependencies>
@@ -177,7 +177,7 @@
177177
<plugin>
178178
<groupId>org.apache.maven.plugins</groupId>
179179
<artifactId>maven-compiler-plugin</artifactId>
180-
<version>3.11.0</version>
180+
<version>${plugin.version.compiler}</version>
181181
<configuration>
182182
<source>${maven.compiler.source}</source>
183183
<target>${maven.compiler.target}</target>

nalu-plugin-gwt-processor/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
<plugin>
244244
<groupId>org.apache.maven.plugins</groupId>
245245
<artifactId>maven-compiler-plugin</artifactId>
246-
<version>3.11.0</version>
246+
<version>${plugin.version.compiler}</version>
247247
<configuration>
248248
<source>${maven.compiler.source}</source>
249249
<target>${maven.compiler.target}</target>

nalu-plugin-gwt/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
<plugin>
157157
<groupId>org.apache.maven.plugins</groupId>
158158
<artifactId>maven-compiler-plugin</artifactId>
159-
<version>3.11.0</version>
159+
<version>${plugin.version.compiler}</version>
160160
<configuration>
161161
<source>${maven.compiler.source}</source>
162162
<target>${maven.compiler.target}</target>

nalu-processor/pom.xml

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
<plugin>
213213
<groupId>org.apache.maven.plugins</groupId>
214214
<artifactId>maven-compiler-plugin</artifactId>
215-
<version>3.11.0</version>
215+
<version>${plugin.version.compiler}</version>
216216
<configuration>
217217
<source>${maven.compiler.source}</source>
218218
<target>${maven.compiler.target}</target>
@@ -253,25 +253,6 @@
253253
</execution>
254254
</executions>
255255
</plugin>
256-
<plugin>
257-
<groupId>org.apache.maven.plugins</groupId>
258-
<artifactId>maven-surefire-plugin</artifactId>
259-
<version>${plugin.version.surfire}</version>
260-
<!-- <executions>-->
261-
<!-- <execution>-->
262-
<!-- <id>unit-tests</id>-->
263-
<!-- <goals>-->
264-
<!-- <goal>test</goal>-->
265-
<!-- </goals>-->
266-
<!-- <phase>test</phase>-->
267-
<!-- </execution>-->
268-
<!-- </executions>-->
269-
<!-- <configuration>-->
270-
<!-- <includes>-->
271-
<!-- <include>**/AllTests.java</include>-->
272-
<!-- </includes>-->
273-
<!-- </configuration>-->
274-
</plugin>
275256
<plugin>
276257
<groupId>org.apache.maven.plugins</groupId>
277258
<artifactId>maven-shade-plugin</artifactId>
@@ -355,6 +336,30 @@
355336
</filesets>
356337
</configuration>
357338
</plugin>
339+
<plugin>
340+
<groupId>org.apache.maven.plugins</groupId>
341+
<artifactId>maven-surefire-plugin</artifactId>
342+
<version>${plugin.version.surfire}</version>
343+
<configuration>
344+
<argLine>${test.jvm.flags}</argLine>
345+
</configuration>
346+
</plugin>
358347
</plugins>
359348
</build>
349+
350+
<profiles>
351+
<profile>
352+
<id>add-exports</id>
353+
<activation>
354+
<jdk>[9,)</jdk>
355+
</activation>
356+
<properties>
357+
<test.jvm.flags>
358+
--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
359+
--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
360+
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
361+
</test.jvm.flags>
362+
</properties>
363+
</profile>
364+
</profiles>
360365
</project>

nalu-processor/src/test/java/com/github/nalukit/nalu/processor/test/ControllerCreatorTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import static com.google.testing.compile.Compiler.javac;
2828

29-
@SuppressWarnings("serial")
3029
public class ControllerCreatorTest {
3130

3231
@Test

nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void logProcessorVersion() {
3434
this.eventBus.fireEvent(LogEvent.create()
3535
.sdmOnly(true)
3636
.addMessage("=================================================================================")
37-
.addMessage("Nalu processor version >>2.20.4<< used to generate this source")
37+
.addMessage("Nalu processor version >>2.20.5<< used to generate this source")
3838
.addMessage("=================================================================================")
3939
.addMessage(""));
4040
}

nalu/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<plugin>
140140
<groupId>org.apache.maven.plugins</groupId>
141141
<artifactId>maven-compiler-plugin</artifactId>
142-
<version>3.11.0</version>
142+
<version>${plugin.version.compiler}</version>
143143
<configuration>
144144
<source>${maven.compiler.source}</source>
145145
<target>${maven.compiler.target}</target>

nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class Nalu {
2323

2424
public static String getVersion() {
2525
// TODO Change this for other versions
26-
return "2.20.4";
26+
return "2.20.5";
2727
}
2828

2929
public static boolean hasHistory() {

0 commit comments

Comments
 (0)