Skip to content

Commit 486d74e

Browse files
authored
1 parent 7f104f0 commit 486d74e

File tree

1,180 files changed

+7599
-11144
lines changed

Some content is hidden

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

1,180 files changed

+7599
-11144
lines changed

.github/workflows/build.yml

+5-38
Original file line numberDiff line numberDiff line change
@@ -25,60 +25,27 @@ jobs:
2525
java-version: ${{ matrix.java }}
2626
cache: 'maven'
2727
- name: Build
28-
run: mvn clean install -T1C -Pjsdoc,minify --batch-mode --show-version
29-
# - name: Sonar Cloud - simulate (without sonar:sonar)
30-
# if: matrix.java == 21
31-
# run: mvn clean install -Pintegration-tests,parallel-execution,headless,chrome,theme-saga,csp,mojarra-2.3 -pl !primefaces-integration-tests-jakarta
28+
run: mvn clean install -T1C -Pminify --batch-mode --show-version
3229
- name: Sonar Cloud
3330
if: github.repository == 'primefaces/primefaces' && github.ref == 'refs/heads/master' && matrix.java == 21
3431
run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Pquick -Dsonar.organization=primefaces -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=${{secrets.SONAR_TOKEN}} -fprimefaces/pom.xml
3532
# new approach with code-coverage does not work as of 2024/12 because
3633
# "Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar (default-cli) on project primefaces-parent: Could not find a default branch for project with key 'org.primefaces:primefaces-parent'. Make sure project exists. -> [Help 1]"
3734
# setting sonar.skip=true in the parent-pom.xml does not work either because this results in skipping the whole project, setting sonar.skip=false for modules does not compensate for this
38-
# run: mvn clean install sonar:sonar -Pintegration-tests,parallel-execution,headless,chrome,theme-saga,csp,mojarra-2.3 -pl !primefaces-integration-tests-jakarta -Dsonar.organization=primefaces -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=${{secrets.SONAR_TOKEN}}
35+
# run: mvn clean install sonar:sonar -Pintegration-tests,parallel-execution,headless,chrome,theme-saga,csp,mojarra-4.0 -Dsonar.organization=primefaces -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=${{secrets.SONAR_TOKEN}}
3936
env:
4037
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4138
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4239

4340

44-
integration-tests-23:
41+
integration-tests:
4542
runs-on: ubuntu-latest
4643
if: github.repository == 'primefaces/primefaces'
4744
name: Integration Tests (Java ${{ matrix.java }} - ${{ matrix.facesimpl }})
4845
strategy:
4946
fail-fast: false
5047
matrix:
5148
java: [11, 21, 23]
52-
facesimpl: [ 'mojarra-2.3', 'myfaces-2.3']
53-
steps:
54-
- uses: actions/checkout@v4
55-
- name: Set up JDK ${{ matrix.java }}
56-
uses: actions/setup-java@v4
57-
with:
58-
distribution: 'temurin'
59-
java-version: ${{ matrix.java }}
60-
cache: 'maven'
61-
- name: Build
62-
run: mvn clean install -pl -primefaces-integration-tests-jakarta -T1C -DskipTests -Dcheckstyle.skip -Djsdoc.skip.typedoc=true -Dmaven.javadoc.skip=true --batch-mode --show-version
63-
- name: Integration Tests
64-
run: mvn -B -V clean install -fprimefaces-integration-tests/pom.xml -Pintegration-tests,parallel-execution,headless,chrome,theme-saga,csp,${{ matrix.facesimpl }}
65-
- name: Upload failure-screenshots
66-
uses: actions/upload-artifact@v4
67-
if: always()
68-
with:
69-
name: failed_tests_screenshots_java${{ matrix.java }}_${{ matrix.facesimpl }}
70-
if-no-files-found: ignore
71-
path: /tmp/pf_it/
72-
73-
74-
integration-tests-40:
75-
runs-on: ubuntu-latest
76-
if: github.repository == 'primefaces/primefaces'
77-
name: Integration Tests (Java ${{ matrix.java }} - ${{ matrix.facesimpl }})
78-
strategy:
79-
fail-fast: false
80-
matrix:
81-
java: [11, 21]
8249
facesimpl: [ 'mojarra-4.0', 'myfaces-4.0' ]
8350
steps:
8451
- uses: actions/checkout@v4
@@ -91,11 +58,11 @@ jobs:
9158
- name: Build
9259
run: mvn clean install -T1C -DskipTests -Dcheckstyle.skip -Djsdoc.skip.typedoc=true -Dmaven.javadoc.skip=true --batch-mode --show-version
9360
- name: Integration Tests
94-
run: mvn -B -V clean install -fprimefaces-integration-tests-jakarta/pom.xml -Pintegration-tests,parallel-execution,headless,chrome,theme-saga,csp,${{ matrix.facesimpl }}
61+
run: mvn -B -V clean install -fprimefaces-integration-tests/pom.xml -Pintegration-tests,parallel-execution,headless,chrome,theme-saga,csp,${{ matrix.facesimpl }}
9562
- name: Upload failure-screenshots
9663
uses: actions/upload-artifact@v4
9764
if: always()
9865
with:
99-
name: failed_tests_screenshots_java${{ matrix.java }}_${{ matrix.facesimpl }}_jakarta
66+
name: failed_tests_screenshots_java${{ matrix.java }}_${{ matrix.facesimpl }}
10067
if-no-files-found: ignore
10168
path: /tmp/pf_it/

.github/workflows/nightly-file.upload.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
matrix:
1818
java: [11, 17]
1919
profile: [
20-
'headless,firefox,myfaces-2.3,uploader-native', 'headless,firefox,mojarra-2.3,uploader-native',
21-
'headless,firefox,myfaces-2.3,uploader-commons', 'headless,firefox,mojarra-2.3,uploader-commons',
22-
'headless,chrome,myfaces-2.3,uploader-native', 'headless,chrome,mojarra-2.3,uploader-native',
23-
'headless,chrome,myfaces-2.3,uploader-commons', 'headless,chrome,mojarra-2.3,uploader-commons'
20+
'headless,firefox,myfaces-4.0,uploader-native', 'headless,firefox,mojarra-4.0,uploader-native',
21+
'headless,firefox,myfaces-4.0,uploader-commons', 'headless,firefox,mojarra-4.0,uploader-commons',
22+
'headless,chrome,myfaces-4.0,uploader-native', 'headless,chrome,mojarra-4.0,uploader-native',
23+
'headless,chrome,myfaces-4.0,uploader-commons', 'headless,chrome,mojarra-4.0,uploader-commons'
2424
]
2525

2626
steps:

.github/workflows/nightly-safari.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
java: [11]
18-
profile: [ 'headless,safari,csp,theme-nova,mojarra-2.3' ]
18+
profile: [ 'headless,safari,csp,theme-nova,mojarra-4.0' ]
1919

2020
steps:
2121
- uses: actions/checkout@v4

.github/workflows/nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
java: [11, 17, 21]
23-
profile: [ 'firefox,theme-saga,myfaces-2.3', 'firefox,csp,theme-saga,myfaces-2.3', 'chrome,theme-saga,myfaces-2.3', 'chrome,theme-saga,myfaces-next-2.3','chrome,csp,theme-nova,myfaces-2.3', 'chrome,csp,theme-nova,mojarra-2.3', 'chrome,client-state-saving,theme-nova,mojarra-2.3' ]
23+
profile: [ 'firefox,theme-saga,myfaces-4.0', 'firefox,csp,theme-saga,myfaces-4.0', 'chrome,theme-saga,myfaces-4.0', 'chrome,theme-saga,myfaces-next-2.3','chrome,csp,theme-nova,myfaces-4.0', 'chrome,csp,theme-nova,mojarra-4.0', 'chrome,client-state-saving,theme-nova,mojarra-4.0' ]
2424

2525
steps:
2626
- uses: actions/checkout@v4

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ node_modules/
6060
/primefaces-selenium/primefaces-selenium-core/target/
6161
/primefaces-selenium/primefaces-selenium-components/target/
6262
/primefaces-integration-tests/target/
63-
/primefaces-integration-tests-jakarta/target/
6463
/primefaces-theme/*.css
6564
/primefaces-theme/target/
6665
/primefaces-coverage/target/

README.md

-8
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,11 @@ Version | JSF version | Java version | Binary | Source | Docs
8888
##### SNAPSHOT
8989

9090
```xml
91-
<!-- Java EE / javax.* / JSF 2.3 -->
92-
<dependency>
93-
<groupId>org.primefaces</groupId>
94-
<artifactId>primefaces</artifactId>
95-
<version>16.0.0-SNAPSHOT</version>
96-
</dependency>
97-
9891
<!-- Jakarta EE / jakarta.* / Faces 4.0+ -->
9992
<dependency>
10093
<groupId>org.primefaces</groupId>
10194
<artifactId>primefaces</artifactId>
10295
<version>16.0.0-SNAPSHOT</version>
103-
<classifier>jakarta</classifier>
10496
</dependency>
10597

10698
<repositories>

docs/16_0_0/gettingstarted/download.md

+3-13
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,16 @@ it as a dependency.
77
## Download with Maven
88
Group id is _org.primefaces_ and artifact id is _primefaces._
99

10-
### JSF / Java Server Faces (2.3, javax namespace)
10+
### Jakarta Faces (4.0 - 5.0, jakarta namespace)
1111

1212
```xml
1313
<dependency>
1414
<groupId>org.primefaces</groupId>
1515
<artifactId>primefaces</artifactId>
16-
<version>15.0.0</version>
16+
<version>16.0.0</version>
1717
</dependency>
1818
```
1919

20-
### Jakarta Faces (3.0 - 4.X, jakarta namespace)
21-
22-
```xml
23-
<dependency>
24-
<groupId>org.primefaces</groupId>
25-
<artifactId>primefaces</artifactId>
26-
<version>15.0.0</version>
27-
<classifier>jakarta</classifier>
28-
</dependency>
29-
```
3020

3121

3222
### Additional themes
@@ -35,6 +25,6 @@ Group id is _org.primefaces_ and artifact id is _primefaces._
3525
<dependency>
3626
<groupId>org.primefaces</groupId>
3727
<artifactId>primefaces-themes</artifactId>
38-
<version>15.0.0</version>
28+
<version>16.0.0</version>
3929
</dependency>
4030
```

pom.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
<module>primefaces-showcase</module>
102102
<module>primefaces-selenium</module>
103103
<module>primefaces-integration-tests</module>
104-
<module>primefaces-integration-tests-jakarta</module>
105104
<module>primefaces-cli</module>
106105
<module>primefaces-coverage</module>
107106
</modules>
@@ -379,13 +378,13 @@
379378
<dependencies>
380379
<dependency>
381380
<groupId>org.apache.tomee</groupId>
382-
<artifactId>javaee-api</artifactId>
383-
<version>8.0-6</version>
381+
<artifactId>jakartaee-api</artifactId>
382+
<version>10.0</version>
384383
</dependency>
385384
<dependency>
386385
<groupId>org.glassfish</groupId>
387386
<artifactId>jakarta.faces</artifactId>
388-
<version>2.3.21</version>
387+
<version>4.0.9</version>
389388
</dependency>
390389

391390
<dependency>

primefaces-coverage/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This module only comes for internal use within PrimeFaces team. It is used to ge
66

77
Run the following command to generate code coverage reports for PrimeFaces:
88
```
9-
mvn verify -Pintegration-tests,parallel-execution,headless,chrome,theme-saga,csp,mojarra-2.3 -pl !primefaces-integration-tests-jakarta -f ../pom.xml
9+
mvn verify -Pintegration-tests,parallel-execution,headless,chrome,theme-saga,csp,mojarra-4.0 -f ../pom.xml
1010
```
1111

1212
The generated report will be available at `primefaces-coverage/target/site/jacoco-aggregate/index.html`.

primefaces-integration-tests-jakarta/README.md

-47
This file was deleted.

0 commit comments

Comments
 (0)