Skip to content

Commit

Permalink
Fixes #4105 - Update JSON Binding TCK (#4108)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mnriem
mnriem authored Oct 23, 2024
1 parent 210f29e commit 09b0aa6
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tck-coreprofile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ jobs:
run: mvn -B -DskipTests=true -ntp install
- name: Run TCK
run: |
cd external/coreprofile-tck/jsonb
cd external/tck/jsonb
mvn -B -ntp verify
- name: Test Summary
uses: test-summary/action@v2
with:
paths: "external/coreprofile-tck/jsonb/target/tck/bin/target/surefire-reports/TEST-*.xml"
paths: "external/tck/jsonb/installer/target/tck/bin/target/surefire-reports/TEST-*.xml"
if: always()
jsonp:
if: github.repository == 'piranhacloud/piranha'
Expand Down
2 changes: 0 additions & 2 deletions external/coreprofile-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<modules>
<module>cdi</module>
<module>coreprofile</module>
<module>jsonb</module>
<module>jsonp</module>
<module>rest</module>
</modules>
Expand All @@ -27,7 +26,6 @@
<!-- TCK versions -->
<cdi.tck.version>4.0.13</cdi.tck.version>
<coreprofile.tck.version>10.0.3</coreprofile.tck.version>
<jsonb.tck.version>3.0.0</jsonb.tck.version>
<jsonp.tck.version>2.1.1</jsonp.tck.version>
<rest.tck.version>3.1.5</rest.tck.version>
<!-- Implementation versions -->
Expand Down
37 changes: 4 additions & 33 deletions external/coreprofile-tck/jsonb/pom.xml → external/tck/jsonb/installer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,20 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>cloud.piranha.external.coreprofiletck</groupId>
<groupId>cloud.piranha.external.tck.jsonb</groupId>
<artifactId>project</artifactId>
<version>24.11.0-SNAPSHOT</version>
</parent>

<artifactId>jsonb-tck</artifactId>
<artifactId>piranha-external-tck-jsonb-installer</artifactId>
<packaging>pom</packaging>

<name>Piranha Core Profile - JSON Binding TCK</name>
<name>Piranha - External - TCK - JSON Binding - Installer</name>

<properties>
<tck.home>${project.build.directory}/tck</tck.home>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>cloud.piranha</groupId>
<artifactId>bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -61,30 +49,13 @@
executable="./artifact-install.sh"/>

<!-- Setup bin/pom.xml for correct Yasson version -->
<replaceregexp file="${tck.home}/example/pom.xml"
<replaceregexp file="${tck.home}/bin/pom.xml"
match="&lt;jsonb-impl.version>(.*)&lt;/jsonb-impl.version>"
replace="&lt;jsonb-impl.version>${yasson.version}&lt;/jsonb-impl.version>"
byline="true"/>
</target>
</configuration>
</execution>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Run the tests -->
<exec dir="${tck.home}/bin"
executable="mvn">
<arg value="-Djava.locale.providers=COMPAT"/>
<arg value="verify"/>
</exec>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
38 changes: 38 additions & 0 deletions external/tck/jsonb/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>

<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>cloud.piranha.external.tck</groupId>
<artifactId>project</artifactId>
<version>24.11.0-SNAPSHOT</version>
</parent>

<groupId>cloud.piranha.external.tck.jsonb</groupId>
<artifactId>project</artifactId>
<packaging>pom</packaging>

<name>Piranha - External - TCK - JSON Binding - Project</name>

<properties>
<jsonb.tck.version>3.0.0</jsonb.tck.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>cloud.piranha</groupId>
<artifactId>bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<modules>
<module>installer</module>
<module>runner</module>
</modules>
</project>
66 changes: 66 additions & 0 deletions external/tck/jsonb/runner/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>

<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>cloud.piranha.external.tck.jsonb</groupId>
<artifactId>project</artifactId>
<version>24.11.0-SNAPSHOT</version>
</parent>

<artifactId>piranha-external-tck-jsonb-runner</artifactId>
<packaging>pom</packaging>

<name>Piranha - External - TCK - JSON Binding - Runner</name>

<properties>
<tck.home>${project.build.directory}/../../installer/target/tck</tck.home>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>cloud.piranha</groupId>
<artifactId>bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Run the tests -->
<echo>----------------------------------------------------------</echo>
<echo>Running JSON Binding TCK ${jsonb.tck.version} against Yasson ${yasson.version}</echo>
<echo>----------------------------------------------------------</echo>
<exec dir="${tck.home}/bin"
executable="mvn">
<arg value="-Djava.locale.providers=COMPAT"/>
<arg value="verify"/>
</exec>
<echo>----------------------------------------------------------</echo>
<echo>Ran JSON Binding TCK ${jsonb.tck.version} against Yasson ${yasson.version}</echo>
<echo>----------------------------------------------------------</echo>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
1 change: 1 addition & 0 deletions external/tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<module>annotations</module>
<module>el</module>
<module>inject</module>
<module>jsonb</module>
<module>jwt</module>
<module>server</module>
<module>wasp</module>
Expand Down

0 comments on commit 09b0aa6

Please sign in to comment.