Skip to content

Commit

Permalink
Merge pull request #357 from NaluKit/release/2.20.1
Browse files Browse the repository at this point in the history
Release/2.20.1
  • Loading branch information
FrankHossfeld authored Oct 13, 2024
2 parents e7ed1f0 + 2d7efbf commit 08794e8
Show file tree
Hide file tree
Showing 69 changed files with 525 additions and 617 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,14 @@ jobs:
name: surefire-report
path: target/surefire-reports/

build-and-owasp:
owasp:
runs-on: ubuntu-latest
timeout-minutes: 8
permissions:
actions: read
contents: read
security-events: write
needs: test
needs: build
services:
owasp-db:
image: nalusolutionsgmbh/owasp-maven-action:latest
Expand All @@ -72,8 +73,6 @@ jobs:
distribution: temurin
java-version: '11'
cache: maven
- name: Build with Maven
run: mvn install -ntp
- name: Copy owasp database from container to runner
run: docker cp $(docker ps -aqf "name=owasp-db"):/dependency-check/data ./dependency-checker-db/
- name: OWASP Check
Expand All @@ -94,7 +93,7 @@ jobs:

maven-deploy-dev:
runs-on: ubuntu-latest
needs: build-and-owasp
needs: [ test, owasp ]
if: github.ref == 'refs/heads/dev'
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -132,7 +131,7 @@ jobs:

maven-deploy-main:
runs-on: ubuntu-latest
needs: build-and-owasp
needs: [ test, owasp ]
if: github.ref == 'refs/heads/main'
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delete-workflow-runs.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Delete old workflow runs
name: Delete workflow runs
on:
workflow_dispatch:
inputs:
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/deploy-wiki.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: deploy-wiki
on:
push:
branches:
- main
- dev
paths:
- wiki/**
jobs:
deploy-wiki:
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions4gh/deploy-wiki@v1
env:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
19 changes: 0 additions & 19 deletions .github/workflows/wiki-pages.yaml

This file was deleted.

38 changes: 29 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
![GWT3/J2CL compatible](https://img.shields.io/badge/GWT3/J2CL-compatible-brightgreen.svg)
[![Join the chat at https://gitter.im/Nalukit42/Lobby](https://badges.gitter.im/Nalukit42/Lobby.svg)](https://gitter.im/Nalukit42/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Maven Central](https://img.shields.io/maven-central/v/com.github.nalukit/nalu.svg?colorB=44cc11)](https://central.sonatype.com/artifact/com.github.nalukit/nalu)
[![Build & Deploy](https://github.com/NaluKit/nalu/actions/workflows/build.yaml/badge.svg?branch=dev)](https://github.com/NaluKit/nalu/actions/workflows/build.yaml)
[![Build & Deploy](https://github.com/NaluKit/nalu/actions/workflows/build.yaml/badge.svg?branch=main)](https://github.com/NaluKit/nalu/actions/workflows/build.yaml)


Nalu is a tiny framework that helps you to create GWT based applications quite easily. Using the HTML 5 history for routing and navigation, Nalu supports the browser's back-, forward-, and reload-button by default and without any need to implement anything.
Expand Down Expand Up @@ -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.20.0</version>
<version>2.20.1</version>
</dependency>
<dependency>
<groupId>com.github.nalukit</groupId>
<artifactId>nalu-processor</artifactId>
<version>2.20.0</version>
<version>2.20.1</version>
<scope>provided</scope>
</dependency>
```
Expand All @@ -156,6 +156,7 @@ If the project uses a widget set based on **Elemental2**, **Elemento** or **Domi
<groupId>com.github.nalukit</groupId>
<artifactId>nalu-plugin-elemental2</artifactId>
<version>2.10.1-gwt-2.8.2</version>
</dependency>
```

* **GWT 2.9.0 (and newer) - SNAPSHOT**
Expand All @@ -164,14 +165,15 @@ If the project uses a widget set based on **Elemental2**, **Elemento** or **Domi
<groupId>com.github.nalukit</groupId>
<artifactId>nalu-plugin-elemental2</artifactId>
<version>HEAD-SNAPSHOT</version>
</dependency>
```

* **GWT 2.9.0 (and newer) - Release**
```XML
<dependency>
<groupId>com.github.nalukit</groupId>
<artifactId>nalu-plugin-elemental2</artifactId>
<version>2.20.0</version>
<version>2.20.1</version>
</dependency>
```

Expand Down Expand Up @@ -200,11 +202,29 @@ 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.20.0</version>
<version>2.20.1</version>
</dependency>
```

The **nalu-plugin-elemento** can also be used with Domino-ui.
For Domino-UI Version 2 there's also a dedicated plugin which supports `org.dominokit.domino.ui.IsElement` as widget type:

* **GWT 2.9.0 (and newer) - SNAPSHOT**
```XML
<dependency>
<groupId>com.github.nalukit</groupId>
<artifactId>nalu-plugin-domino-v2</artifactId>
<version>HEAD-SNAPSHOT</version>
</dependency>
```

* **GWT 2.9.0 (and newer) - Release**
```XML
<dependency>
<groupId>com.github.nalukit</groupId>
<artifactId>nalu-plugin-domino-v2</artifactId>
<version>2.20.1</version>
</dependency>
```

**(These plugins are ready to use with J2CL / GWT 3)**

Expand Down Expand Up @@ -245,12 +265,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.20.0</version>
<version>2.20.1</version>
</dependency>
<dependency>
<groupId>com.github.nalukit</groupId>
<artifactId>nalu-plugin-gwt-processor</artifactId>
<version>2.20.0</version>
<version>2.20.1</version>
<scope>provided</scope>
</dependency>
```
Expand All @@ -277,7 +297,7 @@ Nalu has **no** dependency to gwt-user nor Nalu's dependencies! Nalu does not us
Nalu is ready to use with J2CL / GWT 3 as long as you do not use the nalu-plugin-gwt!

## To get in touch with the developer
Please use the [Nalu Gitter room](https://gitter.im/Nalukit42/Lobby).
Please visit use us at [Nalu Gitter room](https://gitter.im/Nalukit42/Lobby).

## Examples
Here you will find many examples that show Nalu in action: [https://github.com/nalukit/nalu-examples](https://github.com/nalukit/nalu-examples).
Expand Down
32 changes: 4 additions & 28 deletions nalu-plugin-core-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,44 +98,20 @@
</exclusions>
</dependency>

<!-- only for testing -->
<!-- test resources -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.junit.platform/junit-platform-runner -->
<!-- https://mvnrepository.com/artifact/org.junit.platform/junit-platform-suite-api -->
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
<artifactId>junit-platform-suite-api</artifactId>
<version>${junit-jupiter-platform.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@
package com.github.nalukit.nalu.plugin.core.web;

import com.github.nalukit.nalu.plugin.core.web.client.NaluPluginCoreWebTest;
import org.junit.platform.runner.JUnitPlatform;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.runner.RunWith;

@RunWith(JUnitPlatform.class)
@SelectClasses({ NaluPluginCoreWebTest.class })
public class AllTests {

Expand Down
2 changes: 1 addition & 1 deletion nalu-plugin-domino-v2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</issueManagement>

<properties>
<domino.ui.version>2.0.0-RC5</domino.ui.version>
<domino.ui.version>2.0.2</domino.ui.version>
</properties>

<dependencies>
Expand Down
7 changes: 0 additions & 7 deletions nalu-plugin-elemental2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,6 @@
</exclusion>
</exclusions>
</dependency>
<!-- gwt-events: once it is on maven central, use it!
<dependency>
<groupId>org.gwtproject.event</groupId>
<artifactId>gwt-event</artifactId>
<version>${gwt-events.version}</version>
</dependency>
-->
</dependencies>


Expand Down
25 changes: 17 additions & 8 deletions nalu-plugin-elemento/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</issueManagement>

<properties>
<elemento.version>1.0.3</elemento.version>
<elemento.version>1.6.5</elemento.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -132,15 +132,24 @@
<artifactId>jsinterop-annotations</artifactId>
<groupId>com.google.jsinterop</groupId>
</exclusion>
<exclusion>
<artifactId>junit-jupiter</artifactId>
<groupId>org.junit.jupiter</groupId>
</exclusion>
<exclusion>
<artifactId>junit-jupiter-api</artifactId>
<groupId>org.junit.jupiter</groupId>
</exclusion>
<exclusion>
<artifactId>junit-jupiter-engine</artifactId>
<groupId>org.junit.jupiter</groupId>
</exclusion>
<exclusion>
<artifactId>junit-jupiter-params</artifactId>
<groupId>org.junit.jupiter</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- gwt-events: once it is on maven central, use it!
<dependency>
<groupId>org.gwtproject.event</groupId>
<artifactId>gwt-event</artifactId>
<version>${gwt-events.version}</version>
</dependency>
-->
</dependencies>


Expand Down
32 changes: 4 additions & 28 deletions nalu-plugin-gwt-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -222,46 +222,22 @@
<scope>test</scope>
</dependency>

<!-- test resources -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.junit.platform/junit-platform-runner -->
<!-- https://mvnrepository.com/artifact/org.junit.platform/junit-platform-suite-api -->
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
<artifactId>junit-platform-suite-api</artifactId>
<version>${junit-jupiter-platform.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>


<build>
<plugins>
<plugin>
Expand Down
Loading

0 comments on commit 08794e8

Please sign in to comment.