Skip to content

Commit

Permalink
support jakarta EE full/web profile and GF M5
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 26, 2022
1 parent e9fc4fa commit 3927e36
Show file tree
Hide file tree
Showing 9 changed files with 191 additions and 113 deletions.
2 changes: 1 addition & 1 deletion glassfish-runner/batch-tck/pom.xml
View file
Expand Up @@ -34,7 +34,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<name>Jakarta Batch TCK Runner for Glassfish</name>

<properties>
<glassfish.container.version>7.0.0-M4</glassfish.container.version>
<glassfish.container.version>7.0.0-M5</glassfish.container.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
<jakarta.batch.version>2.1.0</jakarta.batch.version>
</properties>
Expand Down
5 changes: 2 additions & 3 deletions glassfish-runner/batch-tck/sigtests/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<version>2.1.0</version>

<properties>
<glassfish.container.version>7.0.0-M4</glassfish.container.version>
<glassfish.container.version>7.0.0-M5</glassfish.container.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
<jakarta.batch.version>2.1.0</jakarta.batch.version>
</properties>
Expand All @@ -33,15 +33,14 @@
<profile>
<id>jdk11</id>
<activation>
<activeByDefault>false</activeByDefault>
<activeByDefault>true</activeByDefault>
<jdk>11</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>

<configuration>
<sigfile>${project.build.directory}/sigtest-copy/sigtest/sigtest-1.6-batch.standalone.tck.sig-2.1-se11-OpenJDK-J9</sigfile>
</configuration>
Expand Down
24 changes: 21 additions & 3 deletions glassfish-runner/concurrency-tck/pom.xml
View file
Expand Up @@ -21,7 +21,6 @@
<arquillian.version>1.7.0.Alpha10</arquillian.version>
<testng.version>6.14.3</testng.version>
<sigtest.version>1.6</sigtest.version>
<derby.version>10.15.2.0</derby.version>
<maven.dep.plugin.version>3.3.0</maven.dep.plugin.version>
<maven.comp.plugin.version>3.10.1</maven.comp.plugin.version>
<maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
Expand All @@ -32,7 +31,7 @@
<!-- Output directory -->
<targetDirectory>${project.basedir}/target</targetDirectory>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
<glassfish.container.version>7.0.0-M4</glassfish.container.version>
<glassfish.container.version>7.0.0-M5</glassfish.container.version>
</properties>

<!-- TODO: Temporarily enable snapshot repository -->
Expand Down Expand Up @@ -157,6 +156,25 @@

</dependencies>
<!-- end::testClientDep[] -->

<profiles>
<profile>
<id>full</id>
<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>
</profile>
</profiles>

<build>
<directory>${targetDirectory}</directory>
<defaultGoal>clean test</defaultGoal>
Expand All @@ -176,7 +194,7 @@
<artifactItems>
<artifactItem>
<groupId>org.glassfish.main.distributions</groupId>
<artifactId>glassfish</artifactId>
<artifactId>${glassfish-artifact-id}</artifactId>
<version>${glassfish.container.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
Expand Down
57 changes: 33 additions & 24 deletions glassfish-runner/jaxrs-tck/pom.xml
View file
Expand Up @@ -24,16 +24,20 @@
<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>

<parent>
<groupId>org.glassfish</groupId>
<artifactId>standalone-tck</artifactId>
<version>10.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<jersey.version>3.1.0-M2</jersey.version>
<glassfish.container.version>7.0.0-M4</glassfish.container.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
<junit.jupiter.version>5.7.2</junit.jupiter.version>
<jakarta.rest.version>3.1.0</jakarta.rest.version>
<tck.artifactId>jakarta-restful-ws-tck</tck.artifactId>
<tck.artifactId>jakarta-restful-ws-tck</tck.artifactId>
</properties>



<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -46,21 +50,7 @@
</dependencies>
</dependencyManagement>

<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>


<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -128,6 +118,25 @@
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>full</id>
<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>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand All @@ -145,7 +154,7 @@
<artifactItems>
<artifactItem>
<groupId>org.glassfish.main.distributions</groupId>
<artifactId>glassfish</artifactId>
<artifactId>${glassfish-artifact-id}</artifactId>
<version>${glassfish.container.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
Expand Down
33 changes: 9 additions & 24 deletions glassfish-runner/jsonb-tck/pom.xml
View file
Expand Up @@ -9,28 +9,12 @@
<artifactId>glassfish.jsonb-tck</artifactId>
<version>3.0.0</version>

<properties>
<jsonb.tck.version>3.0.0</jsonb.tck.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<glassfish.container.version>7.0.0-M4</glassfish.container.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
</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>
<parent>
<groupId>org.glassfish</groupId>
<artifactId>standalone-tck</artifactId>
<version>10.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<dependencies>
<dependency>
Expand All @@ -55,7 +39,7 @@
<version>1.6</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand All @@ -73,7 +57,7 @@
<artifactItems>
<artifactItem>
<groupId>org.glassfish.main.distributions</groupId>
<artifactId>glassfish</artifactId>
<artifactId>${glassfish-artifact-id}</artifactId>
<version>${glassfish.container.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
Expand All @@ -88,6 +72,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
<argLine>-Djava.locale.providers=COMPAT</argLine>
<trimStackTrace>false</trimStackTrace>
<failIfNoTests>true</failIfNoTests>
<dependenciesToScan>jakarta.json.bind:jakarta.json.bind-tck</dependenciesToScan>
Expand Down
73 changes: 39 additions & 34 deletions glassfish-runner/jsonp-tck/json-tck-tests-pluggability/pom.xml
View file
Expand Up @@ -9,29 +9,14 @@
<artifactId>json-tck-tests-pluggablity</artifactId>
<version>2.1.0</version>

<properties>
<json.tck.version>2.1.0</json.tck.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<glassfish.container.version>7.0.0-M4</glassfish.container.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
</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>
<parent>
<groupId>org.glassfish</groupId>
<artifactId>json-tck</artifactId>
<version>2.1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>


<dependencies>
<dependency>
<groupId>jakarta.json</groupId>
Expand All @@ -58,6 +43,25 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>full</id>
<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>
</profile>
</profiles>


<build>
<plugins>
<plugin>
Expand All @@ -75,7 +79,7 @@
<artifactItems>
<artifactItem>
<groupId>org.glassfish.main.distributions</groupId>
<artifactId>glassfish</artifactId>
<artifactId>${glassfish-artifact-id}</artifactId>
<version>${glassfish.container.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
Expand All @@ -88,29 +92,30 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M4</version>
<executions>
<execution>
<id>tests-pluggability</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<trimStackTrace>false</trimStackTrace>
<failIfNoTests>true</failIfNoTests>
<testFailureIgnore>true</testFailureIgnore>
<dependenciesToScan>jakarta.json:jakarta.json-tck-tests-pluggability</dependenciesToScan>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.json-api.jar</additionalClasspathElement>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/parsson.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
<reuseForks>false</reuseForks>
<trimStackTrace>false</trimStackTrace>
<failIfNoTests>true</failIfNoTests>
<testFailureIgnore>true</testFailureIgnore>
<dependenciesToScan>jakarta.json:jakarta.json-tck-tests-pluggability</dependenciesToScan>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.json-api.jar</additionalClasspathElement>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/parsson.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M4</version>
<executions>
<execution>
<id>post-unit-test</id>
Expand Down

0 comments on commit 3927e36

Please sign in to comment.