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

JSONB tck re-enabled #538

Merged
merged 4 commits into from
Feb 16, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ jobs:
distribution: 'adopt'
java-version: ${{ matrix.java_version }}
- name: Yasson tests
run: mvn -U -C -Dmaven.javadoc.skip=true -Pstaging verify
# TMP removal
# - name: JSONB-API TCK
# run: cd yasson-tck && mvn -U -B test
run: mvn -U -B -C -Dmaven.javadoc.skip=true -Pstaging verify
- name: JSONB-API TCK
run: cd yasson-tck && mvn -U -B test -DargLine="-Djava.locale.providers=COMPAT"
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jakarta.json.version>2.0.1</jakarta.json.version>
<jakarta.json.version>2.1.0</jakarta.json.version>
<parson.version>2.1.0</parson.version>
<jakarta.json.bind.version>3.0.0-RC1</jakarta.json.bind.version>
<jakarta.enterprise.cdi-api.version>4.0.0-RC2</jakarta.enterprise.cdi-api.version>
<netbeans.hint.jdkPlatform>JDK_9</netbeans.hint.jdkPlatform>
Expand All @@ -53,10 +54,9 @@
<version>${jakarta.json.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
<version>${jakarta.json.version}</version>
<classifier>module</classifier>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson</artifactId>
<version>1.1.0</version>
</dependency>
<!-- Test/Provided dependencies -->
<dependency>
Expand Down
5 changes: 4 additions & 1 deletion src/test/resources/test.policy
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
grant {
//needed to be able to read all files including META-INF entries
permission "java.io.FilePermission" "<<ALL FILES>>", "read";

permission java.io.FilePermission "${build.directory}/-", "read";
permission "java.lang.reflect.ReflectPermission" "suppressAccessChecks";
permission "java.lang.RuntimePermission" "accessDeclaredMembers";

permission "java.lang.RuntimePermission" "createSecurityManager";
permission java.lang.RuntimePermission "setSecurityManager";
permission "java.lang.RuntimePermission" "getProtectionDomain";
permission "java.lang.RuntimePermission" "getClassLoader";
permission "java.util.PropertyPermission" "*", "write";

permission "java.util.PropertyPermission" "jsonb.creator-parameters-required", "read";
permission "java.util.PropertyPermission" "jakarta.json.provider", "read";
};
20 changes: 7 additions & 13 deletions yasson-tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,13 @@
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-tck</artifactId>
<version>${jsonb.tck.version}</version>
<!-- Limitation to the test scope has been temporarily removed due to NumberFormatCustomizationTest, once it is removed,
test scope will be enabled again-->
<!-- <scope>test</scope>-->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>yasson</artifactId>
<version>${yasson.version}</version>
<!-- Limitation to the test scope has been temporarily removed due to NumberFormatCustomizationTest, once it is removed,
test scope will be enabled again-->
<!-- <scope>test</scope>-->
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-weld-embedded</artifactId>
<version>3.0.0.Alpha1</version>
<scope>test</scope>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
Expand All @@ -60,11 +50,15 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0-M5</version>
<configuration>
<dependenciesToScan>
<dependency>jakarta.json.bind:jakarta.json.bind-tck</dependency>
</dependenciesToScan>
<!-- Temporal removal until it is properly set-->
<excludes>
<exclude>**/*JSONBSigTest.*</exclude>
</excludes>
<trimStackTrace>false</trimStackTrace>
<failIfNoTests>true</failIfNoTests>
</configuration>
Expand Down

This file was deleted.