Skip to content

Commit

Permalink
fix failures for jaxrs and jsonp runner. (jakartaee#1009)
Browse files Browse the repository at this point in the history 
Signed-off-by: gurunrao <gurunandan.rao@oracle.com>
  • Loading branch information
@gurunrao
gurunrao committed May 24, 2022
1 parent 4c23459 commit 09b415c
Show file tree
Hide file tree
Showing 9 changed files with 391 additions and 222 deletions.
15 changes: 15 additions & 0 deletions glassfish-runner/batch-tck/sigtests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,21 @@
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
<jakarta.batch.version>2.1.0</jakarta.batch.version>
</properties>

<repositories>
<repository>
<id>jakarta-snapshots</id>
<url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
</repository>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2</url>
</repository>
<repository>
<id>jboss</id>
<url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
</repository>
</repositories>

<profiles>
<profile>
Expand Down
105 changes: 53 additions & 52 deletions glassfish-runner/concurrency-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,50 @@
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-glassfish-managed-6</artifactId>
<version>1.0.0.Alpha1</version>
<exclusions>
<exclusion>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-locator</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>3.1.0-M6</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>3.1.0-M6</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>3.1.0-M6</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>3.1.0-M6</version>
</dependency>

</dependencies>
<!-- end::testClientDep[] -->
Expand Down Expand Up @@ -163,11 +200,6 @@
<artifactId>testng</artifactId>
<version>${testng.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
</artifactItem>
<dependency>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
Expand All @@ -184,7 +216,7 @@
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
<id>StopDomain1</id>
<id>stop-domain1</id>
<phase>generate-test-resources</phase>
<goals>
<goal>exec</goal>
Expand All @@ -197,7 +229,7 @@
</configuration>
</execution>
<execution>
<id>StartDomain1</id>
<id>start-domain1</id>
<phase>generate-test-resources</phase>
<goals>
<goal>exec</goal>
Expand All @@ -210,7 +242,7 @@
</configuration>
</execution>
<execution>
<id>Enable Trace requests</id>
<id>enable-trace-requests</id>
<phase>generate-test-resources</phase>
<goals>
<goal>exec</goal>
Expand All @@ -224,7 +256,7 @@
</configuration>
</execution>
<execution>
<id>Delete User j2ee</id>
<id>delete-user-j2ee</id>
<phase>generate-test-resources</phase>
<goals>
<goal>exec</goal>
Expand All @@ -237,14 +269,14 @@
<argument>delete-file-user</argument>
<argument>j2ee</argument>
</arguments>
<successCodes>
<successCodes>
<successCode>0</successCode>
<successCode>1</successCode>
</successCodes>
</configuration>
</execution>
<execution>
<id>Add User j2ee</id>
<id>add-user-j2ee</id>
<phase>generate-test-resources</phase>
<goals>
<goal>exec</goal>
Expand All @@ -262,7 +294,7 @@
</configuration>
</execution>
<execution>
<id>Delete User javajoe</id>
<id>delete-user-javajoe</id>
<phase>generate-test-resources</phase>
<goals>
<goal>exec</goal>
Expand All @@ -274,15 +306,15 @@
<argument>${project.basedir}/javajoe.pass</argument>
<argument>delete-file-user</argument>
<argument>javajoe</argument>
</arguments>
</arguments>
<successCodes>
<successCode>0</successCode>
<successCode>1</successCode>
</successCodes>
</configuration>
</execution>
<execution>
<id>Add User javajoe</id>
<id>add-user-javajoe</id>
<phase>generate-test-resources</phase>
<goals>
<goal>exec</goal>
Expand All @@ -300,7 +332,7 @@
</configuration>
</execution>
<execution>
<id>list users</id>
<id>list-users</id>
<phase>generate-test-resources</phase>
<goals>
<goal>exec</goal>
Expand All @@ -324,7 +356,7 @@
<argument>--passwordfile</argument>
<argument>${project.basedir}/javajoe.pass</argument>
<argument>create-jvm-options</argument>
<argument>-Djimage.dir=${project.build.directory}/jdk11-bundle</argument>
<argument>-Djimage.dir=${project.build.directory}/jdk-bundle</argument>
</arguments>
</configuration>
</execution>
Expand All @@ -340,28 +372,12 @@
<argument>--passwordfile</argument>
<argument>${project.basedir}/javajoe.pass</argument>
<argument>create-jvm-options</argument>
<argument>--add-exports java.base/jdk.internal.vm.annotation=ALL-UNNAMED</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>add-opens-annotation-jvm-option</id>
<phase>generate-test-resources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<arguments>
<argument>--passwordfile</argument>
<argument>${project.basedir}/javajoe.pass</argument>
<argument>create-jvm-options</argument>
<argument>--add-opens java.base/jdk.internal.vm.annotation=ALL-UNNAMED</argument>
<argument>--add-exports=java.base/jdk.internal.vm.annotation=ALL-UNNAMED</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>StopDomain</id>
<id>stop-domain2</id>
<phase>generate-test-resources</phase>
<goals>
<goal>exec</goal>
Expand Down Expand Up @@ -400,25 +416,10 @@
</property>
</systemProperties>
<!-- end::logging[] -->
<!-- tag::ignore[] -->
<systemPropertyVariables>
<!-- Properties shared with Arquillian -->
<domain>domain1</domain>
<adminHost>localhost</adminHost>
<adminPort>4848</adminPort>
<adminUser>admin</adminUser>
<adminPassword></adminPassword>
<tck_server>localhost</tck_server>
<tck_hostname>localhost</tck_hostname>
<tck_username>javajoe</tck_username>
<tck_password>javajoe</tck_password>
<tck_port>8080</tck_port>
<tck_port_secure>8181</tck_port_secure>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
<signature.sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.enterprise.concurrent-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</signature.sigTestClasspath>
<jimage.dir>${project.build.directory}/jdk-bundle</jimage.dir>
<signature.sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.enterprise.concurrent-api.jar:${project.build.directory}/jdk-bundle/java.base:${project.build.directory}/jdk-bundle/java.rmi:${project.build.directory}/jdk-bundle/java.sql:${project.build.directory}/jdk-bundle/java.naming</signature.sigTestClasspath>
</systemPropertyVariables>
<!-- end::ignore[] -->
<suiteXmlFiles>
<suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
</suiteXmlFiles>
Expand Down
19 changes: 6 additions & 13 deletions glassfish-runner/concurrency-tck/src/test/resources/arquillian.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,15 @@
<property name="deploymentExportPath">target/</property>
</engine>

<container qualifier="glassfish" default="true">
<container qualifier="glassfish-mgd" default="true">
<configuration>
<!-- Each variable used is set in surefire config in running pom.xml -->
<property name="domain">${domain}</property>
<property name="adminHost">${adminHost}</property>
<property name="adminPort">${adminPort}</property>
<property name="adminUser">${adminUser}</property>
<property name="adminPassword">${adminPassword}</property>
<property name="glassFishHome">${GLASSFISH_HOME}</property>
<property name="adminHost">localhost</property>
<property name="adminPort">4848</property>
<property name="adminUser">admin</property>
<property name="adminPassword"></property>
<property name="glassFishHome">./target/glassfish7</property>
<property name="allowConnectingToRunningServer">true</property>
<property name="serverName">${tck_server}</property>
<property name="hostName">${tck_hostname}</property>
<property name="username">${tck_username}</property>
<property name="password">${tck_password}</property>
<property name="httpPort">${tck_port}</property>
<property name="httpsPort">${tck_port_secure}</property>
<!-- Add additional properties for your container impl -->
</configuration>
</container>
Expand Down
6 changes: 3 additions & 3 deletions glassfish-runner/jaxrs-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<groupId>jakarta</groupId>
<artifactId>glassfish-rest-tck</artifactId>
<version>3.1.0</version>
<packaging>pom</packaging>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
<name>Jakarta REST TCK run on glassfish</name>
<description>This verifies the compliance of Eclipse Glassfish using Jakarta REST standalone TCK</description>
Expand Down Expand Up @@ -348,9 +348,9 @@
<authuser>javajoe</authuser>
<authpassword>javajoe</authpassword>
<porting.ts.url.class.1>ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
<jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
<jimage.dir>${project.build.directory}/jdk-bundle</jimage.dir>
<optional.tech.packages.to.ignore>jakarta.xml.bind</optional.tech.packages.to.ignore>
<signature.sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.ws.rs-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.xml.bind-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</signature.sigTestClasspath>
<signature.sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.ws.rs-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.xml.bind-api.jar:${project.build.directory}/jdk-bundle/java.base:${project.build.directory}/jdk-bundle/java.rmi:${project.build.directory}/jdk-bundle/java.sql:${project.build.directory}/jdk-bundle/java.naming</signature.sigTestClasspath>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
Expand Down
4 changes: 2 additions & 2 deletions glassfish-runner/jsonb-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
<failIfNoTests>true</failIfNoTests>
<dependenciesToScan>jakarta.json.bind:jakarta.json.bind-tck</dependenciesToScan>
<systemPropertyVariables>
<jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
<signature.sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.json.bind-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</signature.sigTestClasspath>
<jimage.dir>${project.build.directory}/jdk-bundle</jimage.dir>
<signature.sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.json.bind-api.jar:${project.build.directory}/jdk-bundle/java.base:${project.build.directory}/jdk-bundle/java.rmi:${project.build.directory}/jdk-bundle/java.sql:${project.build.directory}/jdk-bundle/java.naming</signature.sigTestClasspath>
</systemPropertyVariables>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.json.bind-api.jar</additionalClasspathElement>
Expand Down

0 comments on commit 09b415c

Please sign in to comment.