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

changes to support Jakartaee10 jars and Glassfish 7 #11

Merged
merged 2 commits into from
Apr 20, 2022
Merged

changes to support Jakartaee10 jars and Glassfish 7 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e8293b
changes to support latest glassfish 6.X
gurunrao Jan 3, 2022
c5e97eb
make folders generic without glassfish version.
gurunrao Jan 4, 2022
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
8 changes: 3 additions & 5 deletions glassfish-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<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>
<artifactId>arquillian-parent-glassfish6</artifactId>
<artifactId>arquillian-container-glassfish-jakarta</artifactId>
<groupId>org.jboss.arquillian.container</groupId>
<version>1.0.0.Final-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>arquillian-glassfish6-common</artifactId>
<name>Arquillian Container GlassFish 6+ Common Services</name>
<artifactId>arquillian-glassfish-common</artifactId>
<name>Arquillian Container GlassFish 7+ Common Services</name>

<dependencies>

Expand All @@ -34,7 +34,5 @@
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
</dependency>


</dependencies>
</project>
1 change: 0 additions & 1 deletion ...ed-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
View file
Open in desktop

This file was deleted.

27 changes: 19 additions & 8 deletions glassfish-managed-6/pom.xml → glassfish-managed/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@

<parent>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-parent-glassfish6</artifactId>
<artifactId>arquillian-container-glassfish-jakarta</artifactId>
<version>1.0.0.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>arquillian-glassfish-managed-6</artifactId>
<name>Arquillian Container GlassFish Managed 6</name>
<description>GlassFish 6 Managed Container integration for the Arquillian Project</description>
<artifactId>arquillian-glassfish-managed</artifactId>
<name>Arquillian Container GlassFish Managed 7</name>
<description>GlassFish 7 Managed Container integration for the Arquillian Project</description>

<!-- Properties -->
<properties>
<version.arquillian_core>1.7.0.Alpha10</version.arquillian_core>
</properties>

<dependencies>

Expand All @@ -26,42 +31,49 @@

<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-glassfish6-common</artifactId>
<artifactId>arquillian-glassfish-common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-spi</artifactId>
<version>${version.arquillian_core}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
<version>${version.arquillian_core}</version>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
<version>${version.arquillian_core}</version>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
<artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
<version>${version.arquillian_core}</version>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
<artifactId>arquillian-testenricher-ejb-jakarta</artifactId>
<version>${version.arquillian_core}</version>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
<artifactId>arquillian-testenricher-resource-jakarta</artifactId>
<version>${version.arquillian_core}</version>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
<artifactId>arquillian-testenricher-initialcontext</artifactId>
<version>${version.arquillian_core}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -136,7 +148,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>[1.8,9)</version>
<version>[11,)</version>
</requireJavaVersion>
</rules>
</configuration>
Expand All @@ -148,8 +160,7 @@
<properties>
<groupId>org.glassfish.main.distributions</groupId>
<artifactId>glassfish</artifactId>
<version.glassfish>${version.glassfish6}</version.glassfish>
<glassfish.home>glassfish6</glassfish.home>
<glassfish.home>glassfish7</glassfish.home>
<enableDerby>false</enableDerby>
</properties>
</profile>
Expand Down
2 changes: 1 addition & 1 deletion ...assFishManagedContainerConfiguration.java → ...assFishManagedContainerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import org.jboss.arquillian.container.glassfish.CommonGlassFishConfiguration;
import org.jboss.arquillian.container.glassfish.clientutils.GlassFishClient;
Expand Down
2 changes: 1 addition & 1 deletion ...6/GlassFishManagedContainerExtension.java → ...d/GlassFishManagedContainerExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
import org.jboss.arquillian.core.spi.LoadableExtension;
Expand Down
2 changes: 1 addition & 1 deletion .../GlassFishManagedDeployableContainer.java → .../GlassFishManagedDeployableContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import org.jboss.arquillian.container.glassfish.CommonGlassFishManager;
import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
Expand Down
2 changes: 1 addition & 1 deletion ...ish/managed_6/GlassFishServerControl.java → ...sfish/managed/GlassFishServerControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import org.jboss.arquillian.container.spi.client.container.LifecycleException;

Expand Down
1 change: 1 addition & 0 deletions ...aged/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.jboss.arquillian.container.glassfish.managed.GlassFishManagedContainerExtension
2 changes: 1 addition & 1 deletion ...r/glassfish/managed_6/CDIJarTestCase.java → ...ner/glassfish/managed/CDIJarTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
Expand Down
2 changes: 1 addition & 1 deletion ...d_6/GlassFishDeployWithoutAppXmlTest.java → ...ged/GlassFishDeployWithoutAppXmlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
Expand Down
2 changes: 1 addition & 1 deletion ...aged_6/GlassFishManagedDeployEarTest.java → ...anaged/GlassFishManagedDeployEarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
Expand Down
2 changes: 1 addition & 1 deletion ...aged_6/GlassFishManagedDeployWarTest.java → ...anaged/GlassFishManagedDeployWarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
Expand Down
2 changes: 1 addition & 1 deletion ...assFishManagedDeploymentTestTemplate.java → ...assFishManagedDeploymentTestTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import org.jboss.arquillian.test.api.ArquillianResource;
import org.junit.Test;
Expand Down
2 changes: 1 addition & 1 deletion ...ontainer/glassfish/managed_6/Greeter.java → .../container/glassfish/managed/Greeter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import jakarta.ejb.Stateless;
import java.io.Serializable;
Expand Down
2 changes: 1 addition & 1 deletion ...r/glassfish/managed_6/GreeterServlet.java → ...ner/glassfish/managed/GreeterServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import jakarta.ejb.EJB;
import jakarta.servlet.ServletException;
Expand Down
2 changes: 1 addition & 1 deletion ...sh/managed_6/GreeterServletWithDerby.java → ...fish/managed/GreeterServletWithDerby.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import jakarta.annotation.Resource;
import jakarta.ejb.EJB;
Expand Down
2 changes: 1 addition & 1 deletion ...ainer/glassfish/managed_6/SimpleBean.java → ...ntainer/glassfish/managed/SimpleBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

public class SimpleBean {
}
2 changes: 1 addition & 1 deletion ...iner/glassfish/managed_6/StartGFTest.java → ...tainer/glassfish/managed/StartGFTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.arquillian.container.glassfish.managed_6;
package org.jboss.arquillian.container.glassfish.managed;

import java.io.BufferedReader;
import java.io.InputStreamReader;
Expand Down
0 ...aged-6/src/test/resources/application.xml → ...anaged/src/test/resources/application.xml
View file
Open in desktop
File renamed without changes.
0 ...naged-6/src/test/resources/arquillian.xml → ...managed/src/test/resources/arquillian.xml
View file
Open in desktop
File renamed without changes.
0 glassfish-remote-6/README.txt → glassfish-remote/README.txt
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions glassfish-remote-6/pom.xml → glassfish-remote/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@

<parent>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-parent-glassfish6</artifactId>
<artifactId>arquillian-container-glassfish-jakarta</artifactId>
<version>1.0.0.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>arquillian-glassfish-remote-6</artifactId>
<name>Arquillian Container GlassFish Remote 6.x</name>
<description>GlassFish 6.x Remote Container integration for the Arquillian Project</description>
<artifactId>arquillian-glassfish-remote</artifactId>
<name>Arquillian Container GlassFish Remote 7.x</name>
<description>GlassFish 7.x Remote Container integration for the Arquillian Project</description>

<dependencies>
<dependency>
Expand All @@ -26,7 +26,7 @@

<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-glassfish6-common</artifactId>
<artifactId>arquillian-glassfish-common</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion ...lassfish/remote_6/GlassFishExtension.java → .../glassfish/remote/GlassFishExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.arquillian.container.glassfish.remote_6;
package org.jboss.arquillian.container.glassfish.remote;

import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
import org.jboss.arquillian.core.spi.LoadableExtension;
Expand Down
2 changes: 1 addition & 1 deletion ...e_6/GlassFishRestDeployableContainer.java → ...ote/GlassFishRestDeployableContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/**
* @author <a href="http://community.jboss.org/people/LightGuard">Jason Porter</a>
*/
package org.jboss.arquillian.container.glassfish.remote_6;
package org.jboss.arquillian.container.glassfish.remote;

import org.jboss.arquillian.container.glassfish.CommonGlassFishConfiguration;
import org.jboss.arquillian.container.glassfish.CommonGlassFishManager;
Expand Down
0 ...oss.arquillian.core.spi.LoadableExtension → ...oss.arquillian.core.spi.LoadableExtension
View file
Open in desktop
File renamed without changes.
0 ...er/glassfish/remote_6/CDIJarTestCase.java → ...iner/glassfish/remote/CDIJarTestCase.java
View file
Open in desktop
File renamed without changes.
0 ...e_6/GlassFishDeployWithoutAppXmlTest.java → ...ote/GlassFishDeployWithoutAppXmlTest.java
View file
Open in desktop
File renamed without changes.
0 .../remote_6/GlassFishRestDeployEarTest.java → ...sh/remote/GlassFishRestDeployEarTest.java
View file
Open in desktop
File renamed without changes.
0 .../remote_6/GlassFishRestDeployWarTest.java → ...sh/remote/GlassFishRestDeployWarTest.java
View file
Open in desktop
File renamed without changes.
0 ...container/glassfish/remote_6/Greeter.java → ...n/container/glassfish/remote/Greeter.java
View file
Open in desktop
File renamed without changes.
0 ...er/glassfish/remote_6/GreeterServlet.java → ...iner/glassfish/remote/GreeterServlet.java
View file
Open in desktop
File renamed without changes.
0 ...tainer/glassfish/remote_6/SimpleBean.java → ...ontainer/glassfish/remote/SimpleBean.java
View file
Open in desktop
File renamed without changes.
0 ...mote-6/src/test/resources/application.xml → ...remote/src/test/resources/application.xml
View file
Open in desktop
File renamed without changes.
0 ...emote-6/src/test/resources/arquillian.xml → ...-remote/src/test/resources/arquillian.xml
View file
Open in desktop
File renamed without changes.
39 changes: 19 additions & 20 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>36</version>
<version>39</version>
<relativePath />
</parent>

Expand All @@ -14,11 +14,11 @@

<!-- Artifact Configuration -->
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-parent-glassfish6</artifactId>
<artifactId>arquillian-container-glassfish-jakarta</artifactId>
<version>1.0.0.Final-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Arquillian Container Parent GlassFish 6+</name>
<description>GlassFish 6.x and Later Container integrations for the Arquillian Project</description>
<name>Arquillian Container Parent GlassFish 7+</name>
<description>GlassFish 7.x and Later Container integrations for the Arquillian Project</description>

<scm>
<connection>scm:git:git://git@github.com:arquillian/arquillian-container-glassfish6.git</connection>
Expand All @@ -29,17 +29,17 @@

<!-- Properties -->
<properties>
<version.arquillian_core>1.7.0.Alpha2</version.arquillian_core>
<version.glassfish6>6.0.0-M1</version.glassfish6>
<!-- The Jakarta EE 9 based release version -->
<version.jersey>3.0.0-M4</version.jersey>
<jakarta.cdi.version>3.0.0-M3</jakarta.cdi.version>
<jakarta.el.version>4.0.0.M1</jakarta.el.version>
<jakarta.interceptor.version>2.0.0-RC2</jakarta.interceptor.version>
<jakarta.ejb.version>4.0.0-RC1</jakarta.ejb.version>
<jakarta.annotation.version>2.0.0-RC1</jakarta.annotation.version>
<jakarta.servlet.version>5.0.0-M1</jakarta.servlet.version>
<jakarta.jaxb.version>3.0.0-RC3</jakarta.jaxb.version>
<version.arquillian_core>1.7.0.Alpha10</version.arquillian_core>
<version.glassfish>7.0.0-M4</version.glassfish>
<!-- The Jakarta EE 10 based release version -->
<version.jersey>3.1.0-M5</version.jersey>
<jakarta.cdi.version>4.0.0</jakarta.cdi.version>
<jakarta.el.version>5.0.0</jakarta.el.version>
<jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
<jakarta.ejb.version>4.0.0</jakarta.ejb.version>
<jakarta.annotation.version>2.1.0</jakarta.annotation.version>
<jakarta.servlet.version>6.0.0</jakarta.servlet.version>
<jakarta.jaxb.version>4.0.0</jakarta.jaxb.version>
</properties>

<dependencyManagement>
Expand All @@ -48,12 +48,12 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.0.0-RC1</version>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.0-RC4</version>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
Expand All @@ -71,7 +71,6 @@
<version>${jakarta.ejb.version}</version>
<scope>test</scope>
</dependency>

<!-- JAX-RS implementation -->
<dependency>
<groupId>org.glassfish.jersey</groupId>
Expand Down Expand Up @@ -129,8 +128,8 @@

<modules>
<module>glassfish-common</module>
<module>glassfish-managed-6</module>
<module>glassfish-remote-6</module>
<module>glassfish-managed</module>
<module>glassfish-remote</module>
<!--
TODO:
<module>glassfish-embedded-6</module>
Expand Down