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

Fixes #3851 - Setup Jakarta RESTful WS 3.1.5 TCK for Piranha Core Profile #3852

Merged
merged 5 commits into from
Aug 29, 2024
Merged

Fixes #3851 - Setup Jakarta RESTful WS 3.1.5 TCK for Piranha Core Profile #3852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2741110
First pass for #3851
mnriem Aug 22, 2024
38ff5ec
Second pass for #3851
mnriem Aug 23, 2024
c3cc937
Merge branch 'current' into issue-3851
mnriem Aug 24, 2024
8e29856
Merge branch 'current' into issue-3851
mnriem Aug 28, 2024
93372f0
Merge branch 'current' into issue-3851
mnriem Aug 28, 2024
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
13 changes: 13 additions & 0 deletions ...jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,19 @@ public void undeploy(Archive<?> archive) throws DeploymentException {
}
}

/*
* Destroy the process forcibly if it is still running.
*/
try {
if (process.isAlive()) {
LOGGER.log(Level.WARNING,
"Process for {0} still alive, destroying forcibly",
archive.getName());
process.destroyForcibly().waitFor();
}
} catch (InterruptedException ie) {
}

/*
* Delete the WAR file.
*/
Expand Down
1 change: 1 addition & 0 deletions external/tck/coreprofile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
<module>coreprofile</module>
<module>jsonb</module>
<module>jsonp</module>
<module>rest</module>
</modules>
</project>
87 changes: 87 additions & 0 deletions external/tck/coreprofile/rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>

<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cloud.piranha.external.tck.coreprofile</groupId>
<artifactId>project</artifactId>
<version>24.9.0-SNAPSHOT</version>
</parent>
<artifactId>piranha-external-tck-coreprofile-jakarta-coreprofile-tck</artifactId>
<packaging>pom</packaging>
<name>Piranha - External - TCK - CoreProfile - Jakarta CoreProfile TCK</name>
<properties>
<ant.home>${project.build.directory}/ant</ant.home>
<signature.home>${project.build.directory}/signature</signature.home>
<tck.home>${project.build.directory}/tck</tck.home>
<test.home>${tck.home}/src/com/sun/ts/tests</test.home>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>cloud.piranha</groupId>
<artifactId>bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<profiles>
<profile>
<id>unix</id>
<activation>
<os>
<family>unix</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target xmlns:if="ant:if" xmlns:unless="ant:unless">
<echo>Executing UNIX profile</echo>

<!-- Download, unzip and rename TCK -->
<get src="https://download.eclipse.org/jakartaee/restful-ws/3.1/jakarta-restful-ws-tck-3.1.5.zip"
dest="${project.build.directory}/tck.zip"
skipexisting="true"/>
<unzip src="${project.build.directory}/tck.zip"
dest="${project.build.directory}/tck"/>

<!-- Install the TCK artifact into local repository -->
<exec dir="${project.build.directory}/tck"
executable="mvn">
<arg line="install:install-file -Dfile=jakarta-restful-ws-tck-3.1.5.jar -DgroupId=jakarta.ws.rs -DartifactId=jakarta-restful-ws-tck -Dversion=3.1.5 -Dpackaging=jar"/>
</exec>
</target>
</configuration>
</execution>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Run the tests -->
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
138 changes: 138 additions & 0 deletions external/tck/coreprofile/rest/rest-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="UTF-8"?>

<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>tck</groupId>
<artifactId>rest-runner</artifactId>
<version>1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Piranha - External - TCK - CoreProfile - Jakarta REST TCK - Runner</name>
<properties>
<piranha.version>24.9.0-SNAPSHOT</piranha.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.8.0.Final</version>
<scope>test</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
<profiles>
<profile>
<id>unix</id>
<activation>
<os>
<family>unix</family>
</os>
</activation>
<dependencies>
<dependency>
<groupId>cloud.piranha.arquillian</groupId>
<artifactId>piranha-arquillian-jarcontainer</artifactId>
<version>${piranha.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta-restful-ws-tck</artifactId>
<version>3.1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
<version>1.8.0.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<version>1.8.0.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
<!-- RESTEasy required dependencies -->
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-core</artifactId>
<version>6.1.0.Beta2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>6.1.0.Beta2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-json-binding-provider</artifactId>
<version>6.1.0.Beta2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
<version>6.1.0.Beta2</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>verify</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<configuration>
<dependenciesToScan>
<dependency>jakarta.ws.rs:jakarta-restful-ws-tck</dependency>
</dependenciesToScan>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<systemPropertyVariables>
<arquillian.launch>piranha</arquillian.launch>
<cts.harness.debug>true</cts.harness.debug>
<optional.tech.packages.to.ignore>jakarta.xml.bind</optional.tech.packages.to.ignore>
<porting.ts.url.class.1>ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
<servlet_adaptor>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet_adaptor>
<webServerHost>localhost</webServerHost>
<webServerPort>8080</webServerPort>
</systemPropertyVariables>
<testFailureIgnore>true</testFailureIgnore>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
13 changes: 13 additions & 0 deletions external/tck/coreprofile/rest/rest-tck/src/test/resources/arquillian.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>

<arquillian
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://jboss.org/schema/arquillian"
xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<defaultProtocol type="Servlet 5.0" />
<container qualifier="piranha" default="true">
<configuration>
<property name="httpPort">8080</property>
</configuration>
</container>
</arquillian>
Loading