Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #4027 - Add JSONP TCK for Piranha Web Profile #4028

Merged
merged 2 commits into from
Sep 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions .github/workflows/tck-webprofile.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
name: tck-webprofile
on:
push:
paths:
- 'external/webprofile-tck/**'
branches:
- '*'
tags-ignore:
- 'v*'
pull_request:
paths:
- 'external/webprofile-tck/**'
branches:
- '*'
schedule:
- cron: "0 0 * * *"
workflow_dispatch:
Expand All @@ -13,7 +25,7 @@ jobs:
steps:
- name: Checkout Sources
uses: actions/checkout@v4
- name: Setup Java
- name: Set up Java ${{ matrix.java }}
uses: actions/setup-java@v4
with:
distribution: 'temurin'
Expand All @@ -22,12 +34,12 @@ jobs:
run: mvn -B -DskipTests=true -ntp install
- name: Run TCK
run: |
cd external/tck/webprofile/jsonb
cd external/webprofile-tck/jsonb
mvn -B -ntp verify
- name: Test Summary
uses: test-summary/action@v2
with:
paths: "external/tck/webprofile/jsonb/target/tck/bin/target/surefire-reports/TEST-*.xml"
paths: "external/webprofile-tck/jsonb/target/tck/bin/target/surefire-reports/TEST-*.xml"
if: always()
jsonp:
runs-on: ${{ matrix.os }}
Expand All @@ -38,7 +50,7 @@ jobs:
steps:
- name: Checkout Sources
uses: actions/checkout@v4
- name: Setup Java
- name: Set up Java ${{ matrix.java }}
uses: actions/setup-java@v4
with:
distribution: 'temurin'
Expand All @@ -47,12 +59,12 @@ jobs:
run: mvn -B -DskipTests=true -ntp install
- name: Run TCK
run: |
cd external/tck/coreprofile/jsonp
cd external/webprofile-tck/jsonp
mvn -B -ntp verify
- name: Test Summary
uses: test-summary/action@v2
with:
paths: |
external/tck/coreprofile/jsonp/target/tck/bin/tck-tests/target/surefire-reports/TEST-*.xml
external/tck/coreprofile/jsonp/target/tck/bin/tck-tests-pluggability/target/surefire-reports/TEST-*.xml
external/webprofile-tck/jsonp/target/tck/bin/tck-tests/target/surefire-reports/TEST-*.xml
external/webprofile-tck/jsonp/target/tck/bin/tck-tests-pluggability/target/surefire-reports/TEST-*.xml
if: always()
1 change: 1 addition & 0 deletions external/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@
<module>kickoff</module>
<module>quicklook</module>
<module>tck</module>
<module>webprofile-tck</module>
</modules>
</project>
2 changes: 1 addition & 1 deletion external/tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<modules>
<module>el</module>
<module>servlet</module>
<module>jwt</module>
<module>server</module>
<module>wasp</module>
</modules>
</project>
2 changes: 1 addition & 1 deletion external/tck/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>cloud.piranha.external.tck</groupId>
<artifactId>project</artifactId>
<version>24.9.0-SNAPSHOT</version>
<version>24.10.0-SNAPSHOT</version>
</parent>
<groupId>cloud.piranha.external.tck.server</groupId>
<artifactId>project</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion external/tck/server/servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>cloud.piranha.external.tck.server</groupId>
<artifactId>project</artifactId>
<version>24.9.0-SNAPSHOT</version>
<version>24.10.0-SNAPSHOT</version>
</parent>

<artifactId>servlet-tck</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cloud.piranha.external.tck.webprofile</groupId>
<groupId>cloud.piranha.external.webprofiletck</groupId>
<artifactId>project</artifactId>
<version>24.10.0-SNAPSHOT</version>
</parent>
<artifactId>jsonb-tck</artifactId>
<packaging>pom</packaging>
<name>Piranha Web Profile - Jakarta JSON Binding TCK</name>
<name>Piranha Web Profile - JSON Binding TCK</name>
<properties>
<jsonb.tck.version>3.0.0</jsonb.tck.version>
<tck.home>${project.build.directory}/tck</tck.home>
<yasson.version>3.0.4</yasson.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cloud.piranha.external.tck.webprofile</groupId>
<groupId>cloud.piranha.external.webprofiletck</groupId>
<artifactId>project</artifactId>
<version>24.10.0-SNAPSHOT</version>
</parent>
<artifactId>jsonp-tck</artifactId>
<packaging>pom</packaging>
<name>Piranha Web Profile - Jakarta JSON Processing TCK</name>
<name>Piranha Web Profile - JSON Processing TCK</name>
<properties>
<jsonp.tck.version>2.1.1</jsonp.tck.version>
<parsson.version>1.1.7</parsson.version>
<tck.home>${project.build.directory}/tck</tck.home>
</properties>
<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
xmlns:if="ant:if">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cloud.piranha.external.tck</groupId>
<groupId>cloud.piranha.external</groupId>
<artifactId>project</artifactId>
<version>24.10.0-SNAPSHOT</version>
</parent>
<groupId>cloud.piranha.external.tck.webprofile</groupId>
<groupId>cloud.piranha.external.webprofiletck</groupId>
<artifactId>project</artifactId>
<packaging>pom</packaging>
<name>Piranha - External - TCK - Web Profile - Project</name>
<name>Piranha - External - Web Profile TCK - Project</name>
<modules>
<module>jsonb</module>
<module>jsonp</module>
Expand Down
Loading