Skip to content

Commit

Permalink
Changes for glassfish and dist errors
Browse files Browse the repository at this point in the history 
Fixes #1614
  • Loading branch information
@starksm64
starksm64 committed Oct 23, 2024
1 parent 87737e5 commit 65fac0d
Show file tree
Hide file tree
Showing 4 changed files with 122 additions and 51 deletions.
14 changes: 6 additions & 8 deletions cdi-ee-tck/tck-dist/artifact-install.pom
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<artifactId>cdi-tck-ee-parent</artifactId>
<version>${project.version}</version>
<packaging>pom</packaging>
<file>cdi-tck-parent-${project.version}.pom</file>
<file>cdi-tck-ee-parent-${project.version}.pom</file>
<generatePom>false</generatePom>
</configuration>
</execution>
Expand All @@ -52,11 +52,9 @@
<configuration>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-api</artifactId>
<version>${project.version}</version>
<version>${cdi.}</version>
<packaging>jar</packaging>
<file>cdi-tck-api-${project.version}.jar</file>
<javadoc>cdi-tck-api-${project.version}-javadoc.jar</javadoc>
<sources>cdi-tck-api-${project.version}-sources.jar</sources>
<file>cdi-tck-api-${cdi.core.tck.version}.jar</file>
<generatePom>true</generatePom>
</configuration>
</execution>
Expand All @@ -70,9 +68,9 @@
<configuration>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-ext-lib</artifactId>
<version>${project.version}</version>
<version>${cdi.core.tck.version}</version>
<packaging>jar</packaging>
<file>cdi-tck-ext-lib-${project.version}.jar</file>
<file>cdi-tck-ext-lib-${cdi.core.tck.version}.jar</file>
<generatePom>true</generatePom>
</configuration>
</execution>
Expand All @@ -88,7 +86,7 @@
<artifactId>cdi-tck-ee-impl</artifactId>
<version>${project.version}</version>
<packaging>jar</packaging>
<file>cdi-ee-tck-impl-${project.version}.jar</file>
<file>cdi-tck-ee-impl-${project.version}.jar</file>
<generatePom>true</generatePom>
</configuration>
</execution>
Expand Down
11 changes: 11 additions & 0 deletions cdi-ee-tck/tck-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@
</properties>

<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-api</artifactId>
<version>${cdi.core.tck.version}</version>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-ext-lib</artifactId>
<version>${cdi.core.tck.version}</version>
</dependency>

<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>cdi-tck-ee-parent</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions cdi-ee-tck/tck-dist/src/main/assembly/assembly.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
<includes>
<include>jakarta.tck:cdi-tck-ee-parent:pom</include>
<include>jakarta.tck:cdi-tck-ee-impl</include>
<include>jakarta.enterprise:cdi-tck-api</include>
<include>jakarta.enterprise:cdi-tck-ext-lib</include>
</includes>
<useTransitiveDependencies>true</useTransitiveDependencies>
<outputDirectory>artifacts</outputDirectory>
Expand Down
146 changes: 103 additions & 43 deletions glassfish-runner/cdi-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,22 @@
<description>Aggregates dependencies and runs the CDI TCK (both standalone and on GlassFish)</description>

<properties>
<cdi.ee.tck.version>11.0.0-SNAPSHOT</cdi.ee.tck.version>

<cdi.tck-4-1.version>4.1.0</cdi.tck-4-1.version>
<cdi.ee.tck.version>11.0.0-SNAPSHOT</cdi.ee.tck.version>
<glassfish.root>${project.build.directory}</glassfish.root>

<!-- Note M6 still has some failures, future M7 passes all -->
<glassfish.version>8.0.0-M6</glassfish.version>
<glassfish.version>8.0.0-M7</glassfish.version>

<!-- This matches the htmlunit version in TCK -->
<htmlunit.version>2.50.0</htmlunit.version>

<maven.build.cache.enabled>false</maven.build.cache.enabled>

<!-- set to tru to skip the core or ee TCK -->
<skip.core.cdi.tck>false</skip.core.cdi.tck>
<skip.ee.cdi.tck>false</skip.ee.cdi.tck>
<!-- Weld uses 2 versions numbers. Some artefact use one version, other the second. -->
<weld.version>5.1.2.Final</weld.version>
<weld.version2>6.0.Beta5</weld.version2>
Expand All @@ -64,7 +67,6 @@
<version>2.0.0</version>
</dependency>


</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -230,8 +232,8 @@
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-ee-impl</artifactId>
<version>${cdi.ee.tck.version}</version>
<type>xml</type>
<classifier>suite</classifier>
<type>xml</type>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -355,6 +357,16 @@
<overWrite>false</overWrite>
<destFileName>tck-core-suite.xml</destFileName>
</artifactItem>
<artifactItem>
<groupId>jakarta.tck</groupId>
<artifactId>cdi-tck-ee-impl</artifactId>
<version>${cdi.ee.tck.version}</version>
<type>xml</type>
<classifier>suite</classifier>
<overWrite>false</overWrite>
<destFileName>tck-ee-suite.xml</destFileName>
</artifactItem>

</artifactItems>
<outputDirectory>target/suites</outputDirectory>
<overWriteReleases>false</overWriteReleases>
Expand Down Expand Up @@ -410,44 +422,6 @@
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<argLine>-Xmx768m</argLine>
<!-- Surefire / TestNG Properties -->
<!-- The suite, the exclude and the test dependencies together determine which tests are being run -->
<suiteXmlFiles>
<suiteXmlFile>target/suites/tck-core-suite.xml</suiteXmlFile>
</suiteXmlFiles>
<excludedGroups>${excluded.groups}</excludedGroups>
<dependenciesToScan>
<dependency>jakarta.enterprise:cdi-tck-core-impl</dependency>
</dependenciesToScan>
<properties>
<property>
<name>surefire.testng.verbose</name>
<value>1</value>
</property>
</properties>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<!-- System Properties -->
<systemPropertyVariables>
<glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
<glassfish.enableDerby>true</glassfish.enableDerby>
<glassfish.maxHeapSize>2048m</glassfish.maxHeapSize>
<glassfish.enableAssertions>:org.jboss.cdi.tck...</glassfish.enableAssertions>
<glassfish.systemProperties>cdiTckExcludeDummy=true
glassfish.servlet.loadAllOnStartup=true</glassfish.systemProperties>
<glassfish.postBootCommands>create-jms-resource --restype jakarta.jms.Queue --property Name=queue_test queue_test
create-jms-resource --restype jakarta.jms.Topic --property Name=topic_test topic_test
set configs.config.server-config.cdi-service.enable-implicit-cdi=true
create-file-user --groups student --passwordfile ${project.build.directory}/test-classes/password.txt student
create-file-user --groups printer --passwordfile ${project.build.directory}/test-classes/password.txt printer
create-file-user --groups student:alarm --passwordfile ${project.build.directory}/test-classes/password.txt alarm</glassfish.postBootCommands>
<libPath>${project.build.outputDirectory}</libPath>
<org.jboss.cdi.tck.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
<debugMode>true</debugMode>
</systemPropertyVariables>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
Expand All @@ -457,11 +431,97 @@
</dependencies>
<executions>
<execution>
<id>run tck</id>
<id>run core tck</id>
<goals>
<goal>integration-test</goal>
</goals>
<phase>integration-test</phase>
<configuration>
<skipITs>${skip.core.cdi.tck}</skipITs>
<argLine>-Xmx768m</argLine>
<!-- Surefire / TestNG Properties -->
<!-- The suite, the exclude and the test dependencies together determine which tests are being run -->
<suiteXmlFiles>
<suiteXmlFile>target/suites/tck-core-suite.xml</suiteXmlFile>
</suiteXmlFiles>
<excludedGroups>${excluded.groups}</excludedGroups>
<dependenciesToScan>
<dependency>jakarta.enterprise:cdi-tck-core-impl</dependency>
</dependenciesToScan>
<properties>
<property>
<name>surefire.testng.verbose</name>
<value>1</value>
</property>
</properties>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<!-- System Properties -->
<systemPropertyVariables>
<glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
<glassfish.enableDerby>true</glassfish.enableDerby>
<glassfish.maxHeapSize>2048m</glassfish.maxHeapSize>
<glassfish.enableAssertions>:org.jboss.cdi.tck...</glassfish.enableAssertions>
<glassfish.systemProperties>cdiTckExcludeDummy=true
glassfish.servlet.loadAllOnStartup=true</glassfish.systemProperties>
<glassfish.postBootCommands>create-jms-resource --restype jakarta.jms.Queue --property Name=queue_test queue_test
create-jms-resource --restype jakarta.jms.Topic --property Name=topic_test topic_test
set configs.config.server-config.cdi-service.enable-implicit-cdi=true
create-file-user --groups student --passwordfile ${project.build.directory}/test-classes/password.txt student
create-file-user --groups printer --passwordfile ${project.build.directory}/test-classes/password.txt printer
create-file-user --groups student:alarm --passwordfile ${project.build.directory}/test-classes/password.txt alarm</glassfish.postBootCommands>
<libPath>${project.build.outputDirectory}</libPath>
<org.jboss.cdi.tck.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
<debugMode>true</debugMode>
</systemPropertyVariables>
</configuration>
</execution>

<execution>
<id>run ee tck</id>
<goals>
<goal>integration-test</goal>
</goals>
<phase>integration-test</phase>
<configuration>
<skipITs>${skip.ee.cdi.tck}</skipITs>
<argLine>-Xmx768m</argLine>
<!-- Surefire / TestNG Properties -->
<!-- The suite, the exclude and the test dependencies together determine which tests are being run -->
<suiteXmlFiles>
<suiteXmlFile>target/suites/tck-ee-suite.xml</suiteXmlFile>
</suiteXmlFiles>
<excludedGroups>${excluded.groups}</excludedGroups>
<dependenciesToScan>
<dependency>jakarta.tck:cdi-tck-ee-impl</dependency>
</dependenciesToScan>
<properties>
<property>
<name>surefire.testng.verbose</name>
<value>1</value>
</property>
</properties>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<!-- System Properties -->
<systemPropertyVariables>
<glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
<glassfish.enableDerby>true</glassfish.enableDerby>
<glassfish.maxHeapSize>2048m</glassfish.maxHeapSize>
<glassfish.enableAssertions>:org.jboss.cdi.tck...</glassfish.enableAssertions>
<glassfish.systemProperties>cdiTckExcludeDummy=true
glassfish.servlet.loadAllOnStartup=true</glassfish.systemProperties>
<glassfish.postBootCommands>create-jms-resource --restype jakarta.jms.Queue --property Name=queue_test queue_test
create-jms-resource --restype jakarta.jms.Topic --property Name=topic_test topic_test
set configs.config.server-config.cdi-service.enable-implicit-cdi=true
create-file-user --groups student --passwordfile ${project.build.directory}/test-classes/password.txt student
create-file-user --groups printer --passwordfile ${project.build.directory}/test-classes/password.txt printer
create-file-user --groups student:alarm --passwordfile ${project.build.directory}/test-classes/password.txt alarm</glassfish.postBootCommands>
<libPath>${project.build.outputDirectory}</libPath>
<org.jboss.cdi.tck.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
<debugMode>true</debugMode>
</systemPropertyVariables>
</configuration>
</execution>
</executions>
</plugin>
Expand Down

0 comments on commit 65fac0d

Please sign in to comment.