Skip to content

Commit 133aa79

Browse files
xdev-gh-botxdev-gh-bot
committed
Merge branch 'develop' into update-from-template-merged
2 parents 7ad06ee + 351641e commit 133aa79

File tree

359 files changed

+23234
-160
lines changed

Some content is hidden

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

359 files changed

+23234
-160
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ body:
1515
attributes:
1616
label: "Checklist"
1717
options:
18-
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
18+
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/spring-security-extras/releases/latest)"
1919
required: true
20-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
20+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/spring-security-extras/issues) or [closed](https://github.com/xdev-software/spring-security-extras/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
2121
required: true
2222
- label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
2323
required: true

‎.github/ISSUE_TEMPLATE/enhancement.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ body:
1313
attributes:
1414
label: "Checklist"
1515
options:
16-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
16+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/spring-security-extras/issues) or [closed](https://github.com/xdev-software/spring-security-extras/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1717
required: true
1818
- label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
1919
required: true

‎.github/ISSUE_TEMPLATE/question.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
attributes:
1313
label: "Checklist"
1414
options:
15-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
15+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/spring-security-extras/issues) or [closed](https://github.com/xdev-software/spring-security-extras/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1616
required: true
1717
- label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
1818
required: true

‎.github/workflows/check-build.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ on:
1919
- '.idea/**'
2020
- 'assets/**'
2121

22-
env:
23-
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
24-
DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
25-
2622
jobs:
2723
build:
2824
runs-on: ubuntu-latest
@@ -64,13 +60,6 @@ jobs:
6460
exit 1
6561
fi
6662
67-
- name: Upload demo files
68-
uses: actions/upload-artifact@v4
69-
with:
70-
name: demo-files-java-${{ matrix.java }}
71-
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
72-
if-no-files-found: error
73-
7463
checkstyle:
7564
runs-on: ubuntu-latest
7665
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}

‎.github/workflows/release.yml

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
push:
55
branches: [ master ]
66

7-
env:
8-
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
9-
107
permissions:
118
contents: write
129
pull-requests: write
@@ -74,10 +71,9 @@ jobs:
7471
- name: Get version
7572
id: version
7673
run: |
77-
version=$(../mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
74+
version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
7875
echo "release=$version" >> $GITHUB_OUTPUT
7976
echo "releasenumber=${version//[!0-9]/}" >> $GITHUB_OUTPUT
80-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
8177
8278
- name: Commit and Push
8379
run: |
@@ -102,12 +98,14 @@ jobs:
10298
Add the following lines to your pom:
10399
```XML
104100
<dependency>
105-
<groupId>software.xdev</groupId>
106-
<artifactId>${{ env.PRIMARY_MAVEN_MODULE }}</artifactId>
101+
<groupId>software.xdev.sse</groupId>
102+
<artifactId>corresponding_module</artifactId>
107103
<version>${{ steps.version.outputs.release }}</version>
108104
</dependency>
109105
```
110106
107+
You can also use the [BOM](https://github.com/${{ github.repository }}/tree/develop/bom) for easier dependency management.
108+
111109
publish-maven:
112110
runs-on: ubuntu-latest
113111
needs: [prepare-release]
@@ -133,12 +131,17 @@ jobs:
133131
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
134132

135133
- name: Publish to Central Portal
136-
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
134+
run: |
135+
modules=("bom")
136+
dependency_management_block=$(grep -ozP '<dependencyManagement>(\r|\n|.)*<\/dependencyManagement>' 'bom/pom.xml' | tr -d '\0')
137+
modules+=($(echo $dependency_management_block | grep -oP '(?<=<artifactId>)[^<]+'))
138+
printf -v modules_joined '%s,' "${modules[@]}"
139+
modules_arg=$(echo "${modules_joined%,}")
140+
./mvnw -B deploy -pl "$modules_arg" -am -T2C -P publish-sonatype-central-portal -DskipTests
137141
env:
138142
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
139143
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
140144
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
141-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
142145

143146
publish-pages:
144147
runs-on: ubuntu-latest
@@ -161,14 +164,22 @@ jobs:
161164
cache: 'maven'
162165

163166
- name: Build site
164-
run: ../mvnw -B compile site -DskipTests -T2C
165-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
167+
run: ./mvnw -B compile site -DskipTests -T2C
168+
169+
- name: Aggregate site
170+
run: |
171+
modules=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
172+
for m in "${modules[@]}"
173+
do
174+
echo "$m/target/site -> ./target/site/$m"
175+
cp -r $m/target/site ./target/site/$m
176+
done
166177
167178
- name: Deploy to Github pages
168179
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
169180
with:
170181
github_token: ${{ secrets.GITHUB_TOKEN }}
171-
publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site
182+
publish_dir: ./target/site
172183
force_orphan: true
173184

174185
after-release:

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
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+
cancel-in-progress: true
25+
26+
jobs:
27+
run-integration-tests:
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
java: [21]
32+
project: [webapp-rest-it, webapp-vaadin-it]
33+
parallel: [2]
34+
pre-start: [true]
35+
runs-on: ubuntu-latest
36+
if: ${{ !(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')) }}
37+
steps:
38+
- uses: actions/checkout@v4
39+
40+
- name: Set up JDK
41+
uses: actions/setup-java@v4
42+
with:
43+
distribution: temurin
44+
java-version: ${{ matrix.java }}
45+
cache: 'maven'
46+
47+
- name: Test
48+
run: |
49+
./mvnw -B test \
50+
-pl "demo/${{ matrix.project }}" -am \
51+
-P run-it \
52+
${{ matrix.pre-start && '-Dinfra-pre-start.enabled=1 ' || '' }} \
53+
${{ 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) || '' }}
54+
55+
# Replace '/' with '-'
56+
- name: Normalize project name
57+
if: failure()
58+
env:
59+
PROJECT: ${{ matrix.project }}
60+
run: echo PROJECT_NORMALIZED=${PROJECT/\//-} >> $GITHUB_ENV
61+
62+
- name: Upload videos of test failures
63+
if: failure()
64+
uses: actions/upload-artifact@v4
65+
with:
66+
name: test-fail-videos-${{ matrix.java }}-${{ env.PROJECT_NORMALIZED }}-${{ matrix.parallel }}-${{ matrix.pre-start }}
67+
path: ${{ matrix.project }}/target/records
68+
if-no-files-found: ignore

‎.github/workflows/test-deploy.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Test Deployment
33
on:
44
workflow_dispatch:
55

6-
env:
7-
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
8-
96
jobs:
107
publish-maven:
118
runs-on: ubuntu-latest
@@ -25,8 +22,13 @@ jobs:
2522
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
2623

2724
- name: Publish to Central Portal
28-
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
29-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
25+
run: |
26+
modules=("bom")
27+
dependency_management_block=$(grep -ozP '<dependencyManagement>(\r|\n|.)*<\/dependencyManagement>' 'bom/pom.xml' | tr -d '\0')
28+
modules+=($(echo $dependency_management_block | grep -oP '(?<=<artifactId>)[^<]+'))
29+
printf -v modules_joined '%s,' "${modules[@]}"
30+
modules_arg=$(echo "${modules_joined%,}")
31+
./mvnw -B deploy -pl "$modules_arg" -am -T2C -P publish-sonatype-central-portal -DskipTests
3032
env:
3133
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
3234
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}

‎.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>

0 commit comments

Comments
 (0)