Skip to content

Commit

Permalink
sync signaturetest pom with enterprise-beans-tck-run changes
Browse files Browse the repository at this point in the history
Signed-off-by: Scott Marlow <smarlow@redhat.com>
scottmarlow committed Jan 24, 2025

Verified

This commit was signed with the committer’s verified signature.
targos Michaël Zasso
1 parent 8fd916b commit cfe0d30
Showing 1 changed file with 107 additions and 267 deletions.
374 changes: 107 additions & 267 deletions glassfish-runner/platform/signaturetest-platform-tck/pom.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2024 Contributors to the Eclipse Foundation.
~ Copyright 2010, Red Hat, Inc., and individual contributors
Copyright (c) 2023, 2024 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
version 2 with the GNU Classpath Exception, which is available at
https://www.gnu.org/software/classpath/license.html.
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
Running all tests (except timeout)
mvn clean install
mvn spotless:apply && mvn clean install -Dglassfish.version=8.0.0-SNAPSHOT -Dmaven.build.cache.enabled=false -Pejb30,exclude-timeout,ejb30_lite_env
ejb30 assembly, misc and tx tests:
mvn spotless:apply && mvn clean install -Dglassfish.version=8.0.0-SNAPSHOT -Dmaven.build.cache.enabled=false -Pejb30,exclude-timeout,ejb30_assembly_misc_tx
etc
-->
<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/maven-v4_0_0.xsd">
@@ -24,24 +24,28 @@
<version>11.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>jakarta</groupId>
<artifactId>glassfish.signaturetest-platform-tck</artifactId>
<artifactId>signaturetest-tck-run</artifactId>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<arquillian.core.version>1.9.1.Final</arquillian.core.version>

<!-- glassfish properties -->
<exec.asadmin>${glassfish.home}/glassfish/bin/asadmin</exec.asadmin>
<glassfish.home>${project.build.directory}/glassfish8</glassfish.home>
<glassfish.lib.dir>${glassfish.home}/glassfish/lib</glassfish.lib.dir>
<glassfish.home>${glassfish.root}/glassfish${glassfish.version.main}</glassfish.home>
<glassfish.root>${project.build.directory}</glassfish.root>
<glassfish.version>8.0.0-M9</glassfish.version>
<glassfish.version.main>8</glassfish.version.main>

<junit.jupiter.version>5.10.2</junit.jupiter.version>

<junit.jupiter.version>5.9.1</junit.jupiter.version>
<rapassword1>cts1</rapassword1>
<rauser1>cts1</rauser1>
<tck.artifactId>jakarta.tck.jdbc</tck.artifactId>
<!-- Require at least Java 17 to compile -->
<maven.compiler.release>17</maven.compiler.release>
<tck.jte.path>${ts.home}/bin/ts.jte</tck.jte.path>
<tck.version>11.0.0-SNAPSHOT</tck.version>

<!-- TCK Paths -->
<ts.home>${basedir}/src/test/resources/jakartaeetck</ts.home>

</properties>
<dependencyManagement>
<dependencies>
@@ -124,278 +128,95 @@
<dependency>
<groupId>org.omnifaces.arquillian</groupId>
<artifactId>arquillian-glassfish-server-managed</artifactId>
<version>1.6</version>
<version>1.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<!-- Filter test resources -->
<testResources>
<testResource>
<filtering>true</filtering>
<directory>src/test/resources</directory>
<excludes>
<exclude>**/cts_cert</exclude>
</excludes>
</testResource>
</testResources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>1-unpack</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.glassfish.main.distributions</groupId>
<artifactId>${glassfish-artifact-id}</artifactId>
<version>${glassfish.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>2-copy-lib</id>
<goals>
<goal>copy</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.tck.arquillian</groupId>
<artifactId>arquillian-protocol-lib</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${glassfish.lib.dir}</outputDirectory>
<destFileName>arquillian-protocol-lib.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>jakarta.tck</groupId>
<artifactId>libutil</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${glassfish.lib.dir}</outputDirectory>
<destFileName>libutil.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>jakarta.tck.arquillian</groupId>
<artifactId>tck-porting-lib</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${glassfish.lib.dir}</outputDirectory>
<destFileName>tck-porting-lib.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>jakarta.tck</groupId>
<artifactId>runtime</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${glassfish.lib.dir}</outputDirectory>
<destFileName>runtime.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>jakarta.tck.arquillian</groupId>
<artifactId>arquillian-protocol-lib</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/protocol</outputDirectory>
<destFileName>protocol.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>1-start-database</id>
<goals>
<goal>exec</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<executable>${exec.asadmin}</executable>
<arguments>
<argument>start-database</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<id>copy-resource-one</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<outputDirectory>${glassfish.lib.dir}</outputDirectory>
<resources>
<resource>
<directory>${basedir}</directory>
<includes>
<include>*.jar</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>10-start-database</id>
<goals>
<goal>exec</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<executable>${exec.asadmin}</executable>
<arguments>
<argument>start-database</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>11-stop-domain</id>
<goals>
<goal>exec</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<executable>${exec.asadmin}</executable>
<arguments>
<argument>stop-domain</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>12-start-domain</id>
<goals>
<goal>exec</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<executable>${exec.asadmin}</executable>
<arguments>
<argument>start-domain</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>13-create-jvm-options</id>
<goals>
<goal>exec</goal>
</goals>
<phase>pre-integration-test</phase>
</execution>
<execution>
<id>33-stop-domain</id>
<goals>
<goal>exec</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<executable>${exec.asadmin}</executable>
<arguments>
<argument>stop-domain</argument>
</arguments>
</configuration>
</execution>
</executions>
<version>3.3.1</version>
<configuration>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>jks</nonFilteredFileExtension>
<nonFilteredFileExtension>p12</nonFilteredFileExtension>
<nonFilteredFileExtension>cer</nonFilteredFileExtension>
<nonFilteredFileExtension>keystore</nonFilteredFileExtension>
<nonFilteredFileExtension>cts_cert</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<version>3.7.1</version>
<executions>
<execution>
<id>unpack</id>
<id>unpack-glassfish</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>pre-integration-test</phase>
<phase>test-compile</phase>
<configuration>
<markersDirectory>${glassfish.root}/dependency-maven-plugin-markers</markersDirectory>
<artifactItems>
<artifactItem>
<groupId>org.glassfish.main.distributions</groupId>
<artifactId>${glassfish-artifact-id}</artifactId>
<artifactId>glassfish</artifactId>
<version>${glassfish.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
<overWrite>false</overWrite>
<outputDirectory>${glassfish.root}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<executions>
<execution>
<id>signature-javatest-tests</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<dependenciesToScan>jakarta.tck:signaturevalidation</dependenciesToScan>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/lib/sigtest.jar</additionalClasspathElement>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/glassfish-naming.jar</additionalClasspathElement>
</additionalClasspathElements>
<systemPropertyVariables>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<ts.home>${env.TS_HOME}</ts.home>
<project.basedir>${project.basedir}</project.basedir>
<arquillian.xml>arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<includes>
<include>**/*Servlet*.*</include>
<include>**/*JSP*.*</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<executions>
<execution>
<id>xa-appclient-tests</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<dependenciesToScan>jakarta.tck:xa</dependenciesToScan>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/sigtest.jar</additionalClasspathElement>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/glassfish-naming.jar</additionalClasspathElement>
</additionalClasspathElements>
<systemPropertyVariables>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<java.naming.factory.initial>com.sun.enterprise.naming.impl.SerialInitContextFactory</java.naming.factory.initial>
<ts.home>${env.TS_HOME}</ts.home>
<project.basedir>${project.basedir}</project.basedir>
<arquillian.xml>appclient-arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<includes>
<include>**/*EJB*.*</include>
</includes>
</configuration>
</execution>
</executions>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<includes>
<include>**/*Test.java</include>
<include>**/*TestCase.java</include>
<include>**/*TestSuite.java</include>
</includes>

<systemPropertyVariables>
<glassfish.home>${glassfish.home}</glassfish.home>
<glassfish.httpPort>8080</glassfish.httpPort>
<arquillian.xml>javatest-arquillian.xml</arquillian.xml>
<ts.home>${ts.home}</ts.home>

<glassfish.enableDerby>false</glassfish.enableDerby>

<glassfish.postBootCommands>set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true</glassfish.postBootCommands>
</systemPropertyVariables>
</configuration>
</plugin>

</plugins>
</build>
<profiles>
@@ -404,15 +225,34 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<glassfish-artifact-id>glassfish</glassfish-artifact-id>
</properties>
</profile>
<profile>
<id>web</id>
<properties>
<glassfish-artifact-id>web</glassfish-artifact-id>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>signaturetest-javatest</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
<configuration>
<dependenciesToScan>jakarta.tck:signaturevalidation</dependenciesToScan>
<groups>tck-javatest</groups>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</profile>
</profiles>
</project>

0 comments on commit cfe0d30

Please sign in to comment.