Skip to content

Commit

Permalink
Merge pull request #1307 from alwin-joseph/jaxrs-platform-gf8
Browse files Browse the repository at this point in the history 
Jaxrs platform TCK: Remove ManagedBean tests, update apis & glassfish8 runner for EE11
  • Loading branch information
@alwin-joseph
alwin-joseph committed May 21, 2024
2 parents 0bdf20b + daa54ea commit b8d042f
Show file tree
Hide file tree
Showing 8 changed files with 360 additions and 1,107 deletions.
735 changes: 347 additions & 388 deletions glassfish-runner/jaxrs-platform-tck/pom.xml
View file

Large diffs are not rendered by default.

87 changes: 13 additions & 74 deletions jaxrs/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
Copyright (c) 2024 Contributors to the Eclipse Foundation
All rights reserved.
This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -33,7 +33,11 @@
<description>JAXRS Tests for Jakarta EE Platform</description>

<properties>
<junit.jupiter.version>[5.7.2, 5.8-A00)</junit.jupiter.version>
<jakarta.json-api.version>2.1.3</jakarta.json-api.version>
<jakarta.json.bind-api.version>3.0.1</jakarta.json.bind-api.version>
<jakarta.validation-api.version>3.1.0-M2</jakarta.validation-api.version>
<jakarta.ws.rs-api.version>4.0.0</jakarta.ws.rs-api.version>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
</properties>

<dependencies>
Expand All @@ -42,119 +46,54 @@
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>runtime</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>${jakarta.validation-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta.ws.rs-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-api</artifactId>
<version>${jakarta.json.bind-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>

<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>libutil</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${jakarta.json-api.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>compile</scope>
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-core</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
<artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
</dependency>

<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.7.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>2.2</version>
</dependency>

<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
</dependency>

<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.0</version>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
38 changes: 0 additions & 38 deletions ...src/main/java/com/sun/ts/tests/jaxrs/platform/managedbean/ApplicationHolderSingleton.java
View file

This file was deleted.

28 changes: 0 additions & 28 deletions jaxrs/src/main/java/com/sun/ts/tests/jaxrs/platform/managedbean/InterceptorSingleton.java
View file

This file was deleted.

Loading

0 comments on commit b8d042f

Please sign in to comment.