Skip to content

Commit 55b7809

Browse files
AB-xdevAB-xdev
authored
Merge pull request #24 from xdev-software/develop
Release
2 parents 25db80e + 34dbe4a commit 55b7809

File tree

190 files changed

+8880
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+8880
-198
lines changed

‎.github/workflows/run-integration-tests.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Run integration tests
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches: [ develop ]
7+
paths-ignore:
8+
- '**.md'
9+
- '.config/**'
10+
- '.github/**'
11+
- '.idea/**'
12+
- 'assets/**'
13+
pull_request:
14+
branches: [ develop ]
15+
paths-ignore:
16+
- '**.md'
17+
- '.config/**'
18+
- '.github/**'
19+
- '.idea/**'
20+
- 'assets/**'
21+
22+
concurrency:
23+
group: ${{ github.workflow }}-${{ github.ref }}
24+
25+
jobs:
26+
run-integration-tests:
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
java: [21]
31+
project: [webapp-rest-it, webapp-vaadin-it]
32+
parallel: [2]
33+
pre-start: [true]
34+
runs-on: ubuntu-latest
35+
if: ${{ !(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')) }}
36+
steps:
37+
- uses: actions/checkout@v4
38+
39+
- name: Set up JDK
40+
uses: actions/setup-java@v4
41+
with:
42+
distribution: temurin
43+
java-version: ${{ matrix.java }}
44+
cache: 'maven'
45+
46+
- name: Test
47+
run: |
48+
./mvnw -B test \
49+
-pl "demo/${{ matrix.project }}" -am \
50+
-P run-it \
51+
${{ matrix.pre-start && '-Dinfra-pre-start.enabled=1 ' || '' }} \
52+
${{ matrix.parallel > 0 && format('-Djunit.jupiter.execution.parallel.enabled=true -Djunit.jupiter.execution.parallel.mode.default=concurrent -Djunit.jupiter.execution.parallel.mode.classes.default=concurrent -Djunit.jupiter.execution.parallel.config.strategy=fixed -Djunit.jupiter.execution.parallel.config.fixed.parallelism=2 -Djunit.jupiter.execution.parallel.config.fixed.max-pool-size={0} ', matrix.parallel) || '' }}
53+
54+
# Replace '/' with '-'
55+
- name: Normalize project name
56+
if: failure()
57+
env:
58+
PROJECT: ${{ matrix.project }}
59+
run: echo PROJECT_NORMALIZED=${PROJECT/\//-} >> $GITHUB_ENV
60+
61+
- name: Upload videos of test failures
62+
if: failure()
63+
uses: actions/upload-artifact@v4
64+
with:
65+
name: test-fail-videos-${{ matrix.java }}-${{ env.PROJECT_NORMALIZED }}-${{ matrix.parallel }}-${{ matrix.pre-start }}
66+
path: ${{ matrix.project }}/target/records
67+
if-no-files-found: ignore

‎.github/workflows/update-from-template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ jobs:
202202
GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }}
203203
run: |
204204
not_failed_conclusion="skipped|neutral|success"
205-
not_relevant_app_slug="dependabot|github-pages|sonarcloud"
205+
not_relevant_app_slug="dependabot|github-pages|sonarqubecloud"
206206
207207
echo "Waiting for checks to start..."
208208
sleep 40s
@@ -212,7 +212,7 @@ jobs:
212212
213213
echo "Checking if update-branch-merged exists"
214214
git fetch
215-
if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
215+
if [[ $(git ls-remote --heads origin refs/heads/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
216216
echo "Branch still exists; Continuing..."
217217
else
218218
echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"

‎.gitignore

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,28 @@ hs_err_pid*
5757
/*/.project
5858
/*/RemoteSystemsTempFiles/
5959

60+
#vaadin/node webpack/frontend stuff
61+
# Ignore Node
62+
node/
63+
64+
# The following files are generated/updated by vaadin-maven-plugin
65+
node_modules/
66+
67+
# Vaadin
68+
package.json
69+
package-lock.json
70+
webpack.generated.js
71+
webpack.config.js
72+
tsconfig.json
73+
types.d.ts
74+
vite.config.ts
75+
vite.generated.ts
76+
/**/src/main/frontend/generated/
77+
/**/src/main/frontend/index.html
78+
/**/src/main/dev-bundle/
79+
/**/src/main/bundles/
80+
*.lock
81+
6082
#custom
6183
.flattened-pom.xml
6284
.tern-project

‎.run/REST - All tests (p=2 + PreStart).run.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="REST - All tests (p=2 + PreStart)" type="JUnit" factoryName="JUnit">
3+
<module name="webapp-rest-it" />
4+
<option name="PACKAGE_NAME" value="" />
5+
<option name="MAIN_CLASS_NAME" value="" />
6+
<option name="METHOD_NAME" value="" />
7+
<option name="TEST_OBJECT" value="package" />
8+
<option name="VM_PARAMETERS" value="-ea -Dinfra-pre-start.enabled=1 -Djunit.jupiter.execution.parallel.enabled=true -Djunit.jupiter.execution.parallel.mode.default=concurrent -Djunit.jupiter.execution.parallel.mode.classes.default=concurrent -Djunit.jupiter.execution.parallel.config.strategy=fixed -Djunit.jupiter.execution.parallel.config.fixed.parallelism=2 -Djunit.jupiter.execution.parallel.config.fixed.max-pool-size=2" />
9+
<method v="2">
10+
<option name="Make" enabled="true" />
11+
</method>
12+
</configuration>
13+
</component>

‎.run/REST - Application.run.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="REST - Application" type="Application" factoryName="Application">
3+
<option name="MAIN_CLASS_NAME" value="software.xdev.sse.demo.Application" />
4+
<module name="webapp-rest" />
5+
<extension name="coverage">
6+
<pattern>
7+
<option name="PATTERN" value="software.xdev.sse.demo.*" />
8+
<option name="ENABLED" value="true" />
9+
</pattern>
10+
</extension>
11+
<method v="2">
12+
<option name="Make" enabled="true" />
13+
</method>
14+
</configuration>
15+
</component>

‎.run/Run Demo.run.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.run/VAADIN - All tests (p=2 + PreStart).run.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="VAADIN - All tests (p=2 + PreStart)" type="JUnit" factoryName="JUnit">
3+
<module name="webapp-vaadin-it" />
4+
<option name="PACKAGE_NAME" value="" />
5+
<option name="MAIN_CLASS_NAME" value="" />
6+
<option name="METHOD_NAME" value="" />
7+
<option name="TEST_OBJECT" value="package" />
8+
<option name="VM_PARAMETERS" value="-ea -Dinfra-pre-start.enabled=1 -Djunit.jupiter.execution.parallel.enabled=true -Djunit.jupiter.execution.parallel.mode.default=concurrent -Djunit.jupiter.execution.parallel.mode.classes.default=concurrent -Djunit.jupiter.execution.parallel.config.strategy=fixed -Djunit.jupiter.execution.parallel.config.fixed.parallelism=2 -Djunit.jupiter.execution.parallel.config.fixed.max-pool-size=2" />
9+
<method v="2">
10+
<option name="Make" enabled="true" />
11+
</method>
12+
</configuration>
13+
</component>

‎.run/VAADIN - Application.run.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="VAADIN - Application" type="Application" factoryName="Application">
3+
<option name="MAIN_CLASS_NAME" value="software.xdev.sse.demo.Application" />
4+
<module name="webapp-vaadin" />
5+
<extension name="coverage">
6+
<pattern>
7+
<option name="PATTERN" value="software.xdev.sse.demo.*" />
8+
<option name="ENABLED" value="true" />
9+
</pattern>
10+
</extension>
11+
<method v="2">
12+
<option name="Make" enabled="true" />
13+
</method>
14+
</configuration>
15+
</component>

‎CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
# 0.0.6
1+
# 1.0.0
2+
_Initial production ready release_
3+
4+
* Added demo + integration tests
25

6+
# 0.0.7
7+
* Vaadin
8+
* Fix XHR Reload not working (header missing) due to incorrect auto-configuration order
9+
10+
# 0.0.6
311
* Vaadin
412
* Add Vaadin XHR Reload subsystem
513
* Fixes Vaadin being stuck in loops with POST or similar requests when authentification expires

‎README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ However the most relevant modules are likely:
1717
* [web-sidecar-actuator](./web-sidecar-actuator/)
1818
* [web-sidecar-common](./web-sidecar-common/)
1919

20+
## Usage
21+
Some example use-cases (with integration tests) are available in the [demo](./demo).
22+
23+
Otherwise please have a look at the corresponding modules and their (Java) docs.
24+
2025
## Installation
2126
[Installation guide for the latest release](https://github.com/xdev-software/spring-security-extras/releases/latest#Installation)
2227

0 commit comments

Comments
 (0)