Skip to content

Commit c46a73d

Browse files
AB-xdevAB-xdev
authored
Merge pull request #574 from xdev-software/develop
Release
2 parents 343dd8c + 02f4ace commit c46a73d

30 files changed

Lines changed: 225 additions & 183 deletions

File tree

‎.github/workflows/broken-links.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: Link Checker
2121
id: lychee
22-
uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2
22+
uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2
2323
with:
2424
fail: false # Don't fail on broken links, create an issue instead
2525

‎.github/workflows/check-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145

146146
- name: Upload report
147147
if: always()
148-
uses: actions/upload-artifact@v6
148+
uses: actions/upload-artifact@v7
149149
with:
150150
name: pmd-report
151151
if-no-files-found: ignore

‎.github/workflows/report-gha-workflow-security-problems.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Report workflow security problems
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches: [ develop ]
7+
paths:
8+
- '.github/workflows/**'
9+
10+
permissions:
11+
issues: write
12+
13+
jobs:
14+
prt:
15+
runs-on: ubuntu-latest
16+
timeout-minutes: 15
17+
# Only run this in our repos (Prevent notification spam by forks)
18+
if: ${{ github.repository_owner == 'xdev-software' }}
19+
steps:
20+
- uses: actions/checkout@v6
21+
22+
- name: Check
23+
id: check
24+
run: |
25+
grep -l 'pull_request_target:' --exclude report-gha-workflow-security-problems.yml *.yml > reported.txt && exit 1 || exit 0
26+
working-directory: .github/workflows
27+
28+
- name: Find already existing issue
29+
id: find-issue
30+
if: ${{ !cancelled() }}
31+
run: |
32+
echo "number=$(gh issue list -l 'bug' -l 'automated' -L 1 -S 'in:title "Incorrectly configure GHA workflow (prt)"' -s 'open' --json 'number' --jq '.[].number')" >> $GITHUB_OUTPUT
33+
env:
34+
GH_TOKEN: ${{ github.token }}
35+
36+
- name: Close issue if everything is fine
37+
if: ${{ success() && steps.find-issue.outputs.number != '' }}
38+
run: gh issue close -r 'not planned' ${{ steps.find-issue.outputs.number }}
39+
env:
40+
GH_TOKEN: ${{ github.token }}
41+
42+
- name: Create report
43+
if: ${{ failure() && steps.check.conclusion == 'failure' }}
44+
run: |
45+
echo 'Detected usage of `pull_request_target`. This event is dangerous and MUST NOT BE USED AT ALL COST!' > reported.md
46+
echo '' >> reported.md
47+
echo '/cc @xdev-software/gha-workflow-security' >> reported.md
48+
echo '' >> reported.md
49+
echo '```' >> reported.md
50+
cat .github/workflows/reported.txt >> reported.md
51+
echo '```' >> reported.md
52+
cat reported.md
53+
54+
- name: Create Issue From File
55+
if: ${{ failure() && steps.check.conclusion == 'failure' }}
56+
uses: peter-evans/create-issue-from-file@fca9117c27cdc29c6c4db3b86c48e4115a786710 # v6
57+
with:
58+
issue-number: ${{ steps.find-issue.outputs.number }}
59+
title: 'Incorrectly configure GHA workflow (prt)'
60+
content-filepath: ./reported.md
61+
labels: bug, automated

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,34 +69,35 @@ jobs:
6969
7070
# Replace '/' with '-'
7171
- name: Normalize project name
72+
if: ${{ !cancelled() }}
7273
env:
7374
PROJECT: ${{ matrix.project }}
7475
run: echo PROJECT_NORMALIZED=${PROJECT/\//-} >> $GITHUB_ENV
7576

7677
- name: Upload videos of test failures
7778
if: ${{ matrix.video && failure() }}
78-
uses: actions/upload-artifact@v6
79+
uses: actions/upload-artifact@v7
7980
with:
8081
name: test-fail-videos-${{ matrix.java }}-${{ env.PROJECT_NORMALIZED }}-${{ matrix.parallel }}-${{ matrix.pre-start }}
8182
path: advanced-demo/integration-tests/${{ matrix.project }}/target/records
8283
if-no-files-found: ignore
8384

8485
- name: Aggregate WebApp JaCoCo report
85-
if: ${{ matrix.jacoco && !cancelled() }}
86+
if: ${{ matrix.jacoco && success() }}
8687
# Important: Also run compile (if not already done) so that we have all class files - otherwise the report will be incomplete
8788
run: |
8889
./mvnw -B compile jacoco-aggregator:report-aggregate-all -pl "advanced-demo/webapp" -am -T2C
8990
9091
- name: Upload WebApp JaCoCo report
91-
if: ${{ matrix.jacoco && !cancelled() }}
92-
uses: actions/upload-artifact@v6
92+
if: ${{ matrix.jacoco && success() }}
93+
uses: actions/upload-artifact@v7
9394
with:
9495
name: webapp-jacoco-report-${{ matrix.java }}-${{ env.PROJECT_NORMALIZED }}-${{ matrix.parallel }}-${{ matrix.pre-start }}
9596
path: advanced-demo/target/site/jacoco-aggregate
9697
if-no-files-found: ignore
9798

9899
- name: WebApp JaCoCo Code Coverage Report
99-
if: ${{ matrix.jacoco && !cancelled() }}
100+
if: ${{ matrix.jacoco && success() }}
100101
id: jacoco_reporter
101102
uses: PavanMudigonda/jacoco-reporter@4fc6bf270fe893e8dda5467e432253a6961345b8 # v5.0
102103
with:
@@ -106,7 +107,7 @@ jobs:
106107
github_token: ${{ secrets.GITHUB_TOKEN }}
107108

108109
- name: Add WebApp JaCoCo report to workflow run summary
109-
if: ${{ matrix.jacoco && !cancelled() }}
110+
if: ${{ matrix.jacoco && success() }}
110111
run: |
111112
echo "| Outcome | Value |" >> $GITHUB_STEP_SUMMARY
112113
echo "| --- | --- |" >> $GITHUB_STEP_SUMMARY

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 3.3.0
2+
* Updated [`testcontainers-selenium`](https://github.com/xdev-software/testcontainers-selenium) to v2
3+
* Files are now recorded BY DEFAULT as `.mkv` (was `.mp4`)
4+
* Improve customizability of `BrowserTCIFactory` by introducing `createDefaultRecordingContainer`
5+
* Updated dependencies
6+
17
# 3.2.3
28
* `jacoco`
39
* Improved logging and error handling

‎advanced-demo/entities-metamodel/pom.xml‎

Lines changed: 2 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
<parent>
88
<groupId>software.xdev.tci.demo</groupId>
99
<artifactId>advanced-demo</artifactId>
10-
<version>3.2.4-SNAPSHOT</version>
10+
<version>3.3.0-SNAPSHOT</version>
1111
</parent>
1212
<artifactId>entities-metamodel</artifactId>
1313

1414
<properties>
15-
<metamodel.sourceDir>${project.basedir}/../entities/src/main/java</metamodel.sourceDir>
16-
<project.generated.sources>${project.basedir}/src/gen/java/</project.generated.sources>
1715
<!-- Ignore auto generated code -->
1816
<sonar.exclusions>
1917
src/gen/java/**
@@ -25,64 +23,9 @@
2523
<groupId>software.xdev.tci.demo</groupId>
2624
<artifactId>entities</artifactId>
2725
</dependency>
28-
29-
<dependency>
30-
<groupId>org.hibernate.orm</groupId>
31-
<artifactId>hibernate-processor</artifactId>
32-
<optional>true</optional>
33-
</dependency>
3426
</dependencies>
3527

3628
<build>
37-
<plugins>
38-
<plugin>
39-
<groupId>org.codehaus.mojo</groupId>
40-
<artifactId>build-helper-maven-plugin</artifactId>
41-
<executions>
42-
<execution>
43-
<id>add-source-metamodel</id>
44-
<phase>generate-sources</phase>
45-
<goals>
46-
<goal>add-source</goal>
47-
</goals>
48-
<configuration>
49-
<sources>
50-
<source>${project.generated.sources}</source>
51-
</sources>
52-
</configuration>
53-
</execution>
54-
</executions>
55-
</plugin>
56-
57-
<plugin>
58-
<groupId>org.bsc.maven</groupId>
59-
<artifactId>maven-processor-plugin</artifactId>
60-
<executions>
61-
<execution>
62-
<id>process</id>
63-
<goals>
64-
<goal>process</goal>
65-
</goals>
66-
<phase>generate-sources</phase>
67-
<configuration>
68-
<sourceDirectory>${metamodel.sourceDir}</sourceDirectory>
69-
<outputDirectory>${project.generated.sources}</outputDirectory>
70-
<!-- Fix javac implicit warning by setting default value -->
71-
<!-- https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javac.html#BHCJJJAJ -->
72-
<!-- Disable @Generated otherwise it tries to use javax because some plugins contain javax.annotation.Generated -->
73-
<!-- https://hibernate.atlassian.net/browse/HHH-15877 -->
74-
<!-- @formatter:off DO NOT INTRODUCE LINE BREAK -->
75-
<compilerArguments>
76-
-implicit:class -AfullyAnnotationConfigured=true -AaddGeneratedAnnotation=false -Aindex=false
77-
</compilerArguments>
78-
<!-- @formatter:on -->
79-
<processors>
80-
<processor>org.hibernate.processor.HibernateProcessor</processor>
81-
</processors>
82-
</configuration>
83-
</execution>
84-
</executions>
85-
</plugin>
86-
</plugins>
29+
<sourceDirectory>${project.basedir}/src/gen/java/</sourceDirectory>
8730
</build>
8831
</project>

‎advanced-demo/entities/pom.xml‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.xdev.tci.demo</groupId>
99
<artifactId>advanced-demo</artifactId>
10-
<version>3.2.4-SNAPSHOT</version>
10+
<version>3.3.0-SNAPSHOT</version>
1111
</parent>
1212
<artifactId>entities</artifactId>
1313

@@ -26,4 +26,41 @@
2626
<artifactId>jakarta.validation-api</artifactId>
2727
</dependency>
2828
</dependencies>
29+
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.apache.maven.plugins</groupId>
34+
<artifactId>maven-compiler-plugin</artifactId>
35+
<executions>
36+
<execution>
37+
<id>generate-meta-model</id>
38+
<goals>
39+
<goal>compile</goal>
40+
</goals>
41+
<phase>compile</phase>
42+
<configuration>
43+
<annotationProcessorPaths>
44+
<path>
45+
<groupId>org.hibernate.orm</groupId>
46+
<artifactId>hibernate-processor</artifactId>
47+
</path>
48+
</annotationProcessorPaths>
49+
<annotationProcessors>
50+
<annotationProcessor>org.hibernate.processor.HibernateProcessor</annotationProcessor>
51+
</annotationProcessors>
52+
<compilerArgs>
53+
<arg>-proc:only</arg>
54+
<arg>-AfullyAnnotationConfigured=true</arg>
55+
<arg>-AaddGeneratedAnnotation=false</arg>
56+
<arg>-Aindex=false</arg>
57+
</compilerArgs>
58+
<generatedSourcesDirectory>${project.basedir}/../entities-metamodel/src/gen/java/
59+
</generatedSourcesDirectory>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
</plugins>
65+
</build>
2966
</project>

‎advanced-demo/integration-tests/persistence-it/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.xdev.tci.demo.it</groupId>
99
<artifactId>integration-tests</artifactId>
10-
<version>3.2.4-SNAPSHOT</version>
10+
<version>3.3.0-SNAPSHOT</version>
1111
</parent>
1212
<artifactId>persistence-it</artifactId>
1313

‎advanced-demo/integration-tests/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>software.xdev.tci.demo</groupId>
99
<artifactId>advanced-demo</artifactId>
10-
<version>3.2.4-SNAPSHOT</version>
10+
<version>3.3.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<groupId>software.xdev.tci.demo.it</groupId>
1414
<artifactId>integration-tests</artifactId>
15-
<version>3.2.4-SNAPSHOT</version>
15+
<version>3.3.0-SNAPSHOT</version>
1616
<packaging>pom</packaging>
1717

1818
<modules>
@@ -28,13 +28,13 @@
2828
<dependency>
2929
<groupId>software.xdev.tci.demo.it</groupId>
3030
<artifactId>tci-db</artifactId>
31-
<version>3.2.4-SNAPSHOT</version>
31+
<version>3.3.0-SNAPSHOT</version>
3232
</dependency>
3333

3434
<dependency>
3535
<groupId>software.xdev.tci.demo.it</groupId>
3636
<artifactId>tci-webapp</artifactId>
37-
<version>3.2.4-SNAPSHOT</version>
37+
<version>3.3.0-SNAPSHOT</version>
3838
</dependency>
3939

4040
<dependency>

‎advanced-demo/integration-tests/tci-db/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.xdev.tci.demo.it</groupId>
99
<artifactId>integration-tests</artifactId>
10-
<version>3.2.4-SNAPSHOT</version>
10+
<version>3.3.0-SNAPSHOT</version>
1111
</parent>
1212
<artifactId>tci-db</artifactId>
1313

0 commit comments

Comments
 (0)