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.

Sign up for GitHub

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

Use Server Dependencies and Add jakarta.json-tck-tests-pluggability Test Runner #125

Merged
merged 2 commits into from
Nov 9, 2023
Merged

Use Server Dependencies and Add jakarta.json-tck-tests-pluggability Test Runner #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
153341a
[123] Use WildFly dependencies on the client side where possible.
jamezp Nov 7, 2023
ce745ae
[124] Add jakarta.json-tck-tests-pluggability test runner.
jamezp Nov 9, 2023
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
106 changes: 91 additions & 15 deletions core-profile/cdi-langmodel-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,42 @@

<properties>
<testng.version>7.4.0</testng.version>
<!-- WildFly is not required here -->
<galleon.skip>true</galleon.skip>
</properties>

<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-lang-model</artifactId>
<version>${cdi.tck.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-lite-extension-translator</artifactId>
<version>${weld.version}</version>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.lang-model</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-impl</artifactId>
<version>${weld.version}</version>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-lang-model</artifactId>
<version>${cdi.tck.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
Expand All @@ -62,6 +71,16 @@
<artifactId>arquillian-weld-embedded</artifactId>
<version>3.0.2.Final</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>jakarta.enterprise</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.weld</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -80,10 +99,41 @@

<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>process-test-classes</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<!-- Export the properties defined below so they can be used for the signature tests -->
<exportAntProperties>true</exportAntProperties>
<target>
<fileset id="jakarta-api-jars"
dir="${jboss.home}${file.separator}modules/system/layers/base/jakarta/">
<include name="**/annotation/api/main/*.jar"/>
<include name="**/enterprise/api/main/*.jar"/>
<include name="**/inject/api/main/*.jar"/>
<include name="**/interceptor/api/main/*.jar"/>
</fileset>
<pathconvert pathsep="," property="jakarta.api.jars" refid="jakarta-api-jars"/>
<fileset id="weld-jars"
dir="${jboss.home}${file.separator}modules/system/layers/base/org/jboss/">
<include name="**/classfilewriter/main/*.jar"/>
<include name="**/logging/main/*.jar"/>
<include name="**/weld/**/weld*.jar"/>
</fileset>
<pathconvert pathsep="," property="weld.jars" refid="weld-jars"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M6</version>
<configuration>
<argLine>
${addjdkexports}
Expand All @@ -92,6 +142,32 @@
<enableAssertions>true</enableAssertions>
<forkCount>1</forkCount>
</configuration>
<executions>
<execution>
<id>default-test</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>cdi-langmodel-tck</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<skip>false</skip>
<additionalClasspathElements>
<additionalClasspathElement>${weld.jars}</additionalClasspathElement>
<additionalClasspathElement>${jakarta.api.jars}</additionalClasspathElement>
</additionalClasspathElements>
<classpathDependencyExcludes>
<exclude>jakarta.enterprise:jakarta.enterprise.cdi-api</exclude>
<exclude>jakarta.enterprise:jakarta.enterprise.lang-model</exclude>
</classpathDependencyExcludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
112 changes: 99 additions & 13 deletions core-profile/cdi-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,19 @@
</properties>

<dependencies>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.wildfly.arquillian</groupId>
Expand All @@ -39,16 +49,34 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-core-impl</artifactId>
<version>${cdi.tck.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.lang-model</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.test-audit</groupId>
<artifactId>jboss-test-audit-api</artifactId>
Expand Down Expand Up @@ -82,6 +110,20 @@
<artifactId>weld-porting-package-tck</artifactId>
<version>${weld.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.weld.module</groupId>
<artifactId>weld-jsf</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.weld.module</groupId>
<artifactId>weld-web</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.ee.tck.coreprofile</groupId>
Expand All @@ -105,12 +147,6 @@
<classifier>sigtest-jdk11</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>${glassfish.jakarta.el.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.testng</groupId>
Expand Down Expand Up @@ -225,13 +261,33 @@
<unzip dest="${project.build.directory}/sig-classes/">
<fileset dir="${jboss.home}/modules/system/layers/base/jakarta/">
<include name="**/jakarta.annotation-api*.jar"/>
<include name="**/jakarta.el-api*.jar"/>
<include name="**/jakarta.interceptor-api*.jar"/>
<include name="**/jakarta.inject-api*.jar"/>
<include name="**/jakarta.enterprise.lang-model*.jar"/>
<include name="**/jakarta.enterprise.cdi-api*.jar"/>
</fileset>
</unzip>
<fileset id="jakarta-api-jars"
dir="${jboss.home}${file.separator}modules/system/layers/base/jakarta/">
<include name="**/annotation/api/main/*.jar"/>
<include name="**/el/main/*.jar"/>
<include name="**/enterprise/api/main/*.jar"/>
<include name="**/inject/api/main/*.jar"/>
<include name="**/interceptor/api/main/*.jar"/>
</fileset>
<pathconvert pathsep=","
property="jakarta.api.jars" refid="jakarta-api-jars"/>
<fileset id="weld-jars"
dir="${jboss.home}${file.separator}modules/system/layers/base/org//">
<include name="**/jboss/weld/**/weld*.jar"/>
<!-- Required by Weld -->
<include name="**/jboss/classfilewriter/main/*.jar"/>
<include name="**/jboss/logging/main/*.jar"/>
<!-- The EL implementation -->
<include name="**/glassfish/expressly/main/*.jar"/>
</fileset>
<pathconvert pathsep=","
property="weld.jars" refid="weld-jars"/>
</target>
</configuration>
</execution>
Expand All @@ -241,7 +297,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M6</version>
<configuration>
<argLine>
${addjdkexports}
Expand Down Expand Up @@ -283,12 +338,43 @@
<suiteXmlFile>target/suites/cdi-lite-tck-suite.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
<executions>
<execution>
<id>default-test</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>cdi-tck</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>${weld.jars}</additionalClasspathElement>
<additionalClasspathElement>${jakarta.api.jars}</additionalClasspathElement>
</additionalClasspathElements>
<classpathDependencyExcludes>
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
<exclude>jakarta.enterprise:jakarta.enterprise.cdi-api</exclude>
<exclude>jakarta.inject:jakarta.inject-api</exclude>
<exclude>jakarta.interceptor:jakarta.interceptor-api</exclude>
</classpathDependencyExcludes>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>1.5</version>
<version>1.7</version>
<configuration>
<!-- Avoids an NPE fixed upstream -->
<ignoreJDKClasses/>
</configuration>
<executions>
<execution>
<id>sigtest</id>
Expand Down
2 changes: 1 addition & 1 deletion core-profile/cdi-tck/src/main/java/org/jboss/wildfly/tck/cdi/WildFlyExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void register(ExtensionBuilder builder) {
// Override the default NOOP exception transformer
builder.override(DeploymentExceptionTransformer.class, ExceptionTransformer.class,
WildFlyExceptionTransformer.class);
System.out.printf("Installed WildFlyExceptionTransformer\n");
System.out.printf("Installed WildFlyExceptionTransformer%n");

}
}
Expand Down
Loading