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

Jump to bottom

Move jersey-tck module to a tests folder & make it run with -Pjersey-tck #5040

Merged
merged 1 commit into from
Apr 14, 2022
Merged

Move jersey-tck module to a tests folder & make it run with -Pjersey-tck #5040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 jersey-tck/README.md → tests/jersey-tck/README.md
View file
Open in desktop
File renamed without changes.
0 jersey-tck/j2ee.pass → tests/jersey-tck/j2ee.pass
View file
Open in desktop
File renamed without changes.
0 jersey-tck/javajoe.pass → tests/jersey-tck/javajoe.pass
View file
Open in desktop
File renamed without changes.
63 changes: 53 additions & 10 deletions jersey-tck/pom.xml → tests/jersey-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<jersey.version>3.1.0-M3</jersey.version>
<jersey.version>3.1.0-M3</jersey.version> <!-- the public version that pass the tck -->
<glassfish.container.version>6.2.5</glassfish.container.version>
<glassfish.home>${project.build.directory}/glassfish6</glassfish.home>
<jakarta.platform.version>10.0.0-RC1</jakarta.platform.version>
Expand Down Expand Up @@ -308,7 +308,8 @@
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/glassfish6/glassfish/bin/asadmin</executable>
<workingDirectory>${asadmin.home}</workingDirectory>
<executable>${asadmin}</executable>
<arguments>
<argument>stop-domain</argument>
</arguments>
Expand All @@ -321,7 +322,8 @@
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/glassfish6/glassfish/bin/asadmin</executable>
<workingDirectory>${asadmin.home}</workingDirectory>
<executable>${asadmin}</executable>
<arguments>
<argument>start-domain</argument>
</arguments>
Expand All @@ -334,7 +336,8 @@
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/glassfish6/glassfish/bin/asadmin</executable>
<workingDirectory>${asadmin.home}</workingDirectory>
<executable>${asadmin}</executable>
<arguments>
<argument>set</argument>
<argument>server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true</argument>
Expand All @@ -348,7 +351,8 @@
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/glassfish6/glassfish/bin/asadmin</executable>
<workingDirectory>${asadmin.home}</workingDirectory>
<executable>${asadmin}</executable>
<arguments>
<argument>--passwordfile</argument>
<argument>${project.basedir}/j2ee.pass</argument>
Expand All @@ -368,7 +372,8 @@
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/glassfish6/glassfish/bin/asadmin</executable>
<workingDirectory>${asadmin.home}</workingDirectory>
<executable>${asadmin}</executable>
<arguments>
<argument>--passwordfile</argument>
<argument>${project.basedir}/j2ee.pass</argument>
Expand All @@ -386,7 +391,8 @@
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/glassfish6/glassfish/bin/asadmin</executable>
<workingDirectory>${asadmin.home}</workingDirectory>
<executable>${asadmin}</executable>
<arguments>
<argument>--passwordfile</argument>
<argument>${project.basedir}/javajoe.pass</argument>
Expand All @@ -406,7 +412,8 @@
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/glassfish6/glassfish/bin/asadmin</executable>
<workingDirectory>${asadmin.home}</workingDirectory>
<executable>${asadmin}</executable>
<arguments>
<argument>--passwordfile</argument>
<argument>${project.basedir}/javajoe.pass</argument>
Expand All @@ -424,7 +431,8 @@
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/glassfish6/glassfish/bin/asadmin</executable>
<workingDirectory>${asadmin.home}</workingDirectory>
<executable>${asadmin}</executable>
<arguments>
<argument>list-file-users</argument>
</arguments>
Expand All @@ -437,7 +445,8 @@
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/glassfish6/glassfish/bin/asadmin</executable>
<workingDirectory>${asadmin.home}</workingDirectory>
<executable>${asadmin}</executable>
<arguments>
<argument>stop-domain</argument>
</arguments>
Expand All @@ -460,6 +469,7 @@
<excludes>
<exclude>**/SeBootstrapIT.java</exclude>
</excludes>
<skipTests>false</skipTests> <!-- Do not skip when the jersey-tck profile is on -->
<dependenciesToScan>jakarta.ws.rs:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${glassfish.home}</GLASSFISH_HOME>
Expand Down Expand Up @@ -488,6 +498,7 @@
<goal>verify</goal>
</goals>
<configuration>
<skipTests>false</skipTests> <!-- Do not skip when the jersey-tck profile is on -->
<includes>
<include>**/SeBootstrapIT.java</include>
</includes>
Expand All @@ -498,4 +509,36 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>onLinux</id>
<activation>
<os>
<family>unix</family>
</os>
</activation>
<properties>
<asadmin.home>${basedir}</asadmin.home>
<asadmin>${project.build.directory}/glassfish6/glassfish/bin/asadmin</asadmin>
</properties>
</profile>
<profile>
<id>onWindows</id>
<activation>
<os>
<family>Windows</family>
</os>
</activation>
<properties>
<asadmin.home>${glassfish.home}/glassfish/bin</asadmin.home>
<asadmin>asadmin</asadmin>
</properties>
</profile>
<profile>
<id>jersey-tck</id>
<properties>
<jersey.version>3.1.0-SNAPSHOT</jersey.version> <!-- When running the profile, use SNAPSHOT -->
</properties>
</profile>
</profiles>
</project>
0 ...ck/JerseyApplicationArchiveProcessor.java → ...ck/JerseyApplicationArchiveProcessor.java
View file
Open in desktop
File renamed without changes.
0 ...sey/core/tck/JerseyLoadableExtension.java → ...sey/core/tck/JerseyLoadableExtension.java
View file
Open in desktop
File renamed without changes.
0 ...oss.arquillian.core.spi.LoadableExtension → ...oss.arquillian.core.spi.LoadableExtension
View file
Open in desktop
File renamed without changes.
0 ...securitycontext_basic_web.war.sun-web.xml → ...securitycontext_basic_web.war.sun-web.xml
View file
Open in desktop
File renamed without changes.
0 ...questcontext_security_web.war.sun-web.xml → ...questcontext_security_web.war.sun-web.xml
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,13 @@
</plugins>
</build>
</profile>
<profile>
<id>jersey-tck</id>
<modules>
<module>jersey-tck</module>
</modules>
<build>
</build>
</profile>
</profiles>
</project>