Skip to content

Commit

Permalink
Add support of Jetty 12.1 ee11 (#200)
Browse files Browse the repository at this point in the history 
* add Jetty 12 ee11 support

---------

Signed-off-by: Olivier Lamy <[email protected]>
  • Loading branch information
@olamy
olamy authored Nov 13, 2024
1 parent 8594f8f commit 24a4597
Show file tree
Hide file tree
Showing 30 changed files with 1,663 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: Set up Maven
run: mvn --errors --batch-mode --show-version wrapper:wrapper "-Dmaven=3.9.5"
run: mvn --errors --batch-mode --show-version wrapper:wrapper "-Dmaven=3.9.9"

- name: Build with Maven
run: ./mvnw install -e -B -V javadoc:jar
5 changes: 1 addition & 4 deletions ...src/main/java/org/jboss/arquillian/container/jetty/embedded_10/ArquillianAppProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,7 @@ protected App createApp(final Archive<?> archive) {
final File exported;
try {
if (this.config.isUseArchiveNameAsContext()) {
Path tmpDirectory = Files.createTempDirectory("arquillian-jetty");
Path archivePath = tmpDirectory.resolveSibling(archive.getName());
Files.deleteIfExists(archivePath);
exported = Files.createFile(archivePath).toFile();
exported = Files.createFile(EXPORT_DIR.toPath().resolve(archive.getName())).toFile();
exported.deleteOnExit();
} else {
// If this method returns successfully then it is guaranteed that:
Expand Down
5 changes: 1 addition & 4 deletions ...src/main/java/org/jboss/arquillian/container/jetty/embedded_11/ArquillianAppProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,7 @@ protected App createApp(final Archive<?> archive) {
final File exported;
try {
if (this.config.isUseArchiveNameAsContext()) {
Path tmpDirectory = Files.createTempDirectory("arquillian-jetty");
Path archivePath = tmpDirectory.resolveSibling(archive.getName());
Files.deleteIfExists(archivePath);
exported = Files.createFile(archivePath).toFile();
exported = Files.createFile(EXPORT_DIR.toPath().resolve(archive.getName())).toFile();
exported.deleteOnExit();
} else {
// If this method returns successfully then it is guaranteed that:
Expand Down
12 changes: 5 additions & 7 deletions jetty-embedded-12-ee10/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.1</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -119,13 +124,6 @@
<artifactId>jetty-ee10-plus</artifactId>
</dependency>

<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-server</artifactId>
Expand Down
5 changes: 1 addition & 4 deletions ...ain/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/ArquillianAppProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,7 @@ protected App createApp(final Archive<?> archive) {
final File exported;
try {
if (this.config.isUseArchiveNameAsContext()) {
Path tmpDirectory = Files.createTempDirectory("arquillian-jetty");
Path archivePath = tmpDirectory.resolveSibling(archive.getName());
Files.deleteIfExists(archivePath);
exported = Files.createFile(archivePath).toFile();
exported = Files.createFile(EXPORT_DIR.toPath().resolve(archive.getName())).toFile();
exported.deleteOnExit();
} else {
// If this method returns successfully then it is guaranteed that:
Expand Down
302 changes: 302 additions & 0 deletions jetty-embedded-12-ee11/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,302 @@
<?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/maven-v4_0_0.xsd">

<parent>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-parent-jetty</artifactId>
<version>2.0.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>arquillian-jetty-embedded-12-ee11</artifactId>
<name>Arquillian Container Jetty Embedded 12.0.x ee11</name>
<description>Jetty Embedded 12.0.x container integration for the Arquillian project</description>

<properties>
<version.weld>5.1.2.Final</version.weld>
<jakarta.servlet.api.version>6.0.0</jakarta.servlet.api.version>

<!-- Jetty 12 need Java 17 -->
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.release>17</maven.compiler.release>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet-core</artifactId>
<version>${version.weld}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
<version>${jetty12.1.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-bom</artifactId>
<version>${jetty12.1.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

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

<!-- org.jboss.arquillian -->
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
<artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
<artifactId>arquillian-testenricher-resource-jakarta</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
<artifactId>arquillian-testenricher-initialcontext</artifactId>
</dependency>

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-deploy</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-webapp</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-annotations</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-plus</artifactId>
</dependency>

<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-hpack</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.alpn</groupId>
<artifactId>alpn-api</artifactId>
<version>1.1.3.v20160715</version>
</dependency>
<!-- Needed for Jetty be able to perform injection into servlets/filters etc -->
<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-cdi</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.1.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<version>2.1.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.smallrye</groupId>
<artifactId>jandex</artifactId>
<version>3.1.7</version>
<scope>provided</scope>
</dependency>

<!-- Weld servlet required for testing CDI injections -->

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
<artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
<scope>test</scope>
</dependency>

<!-- all the shrinkwrap -->
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-spi</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-spi-maven</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet-core</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>6.0.1</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>ban-javax-api</id>
<goals>
<goal>enforce</goal>
</goals>
<phase>validate</phase>
<configuration>
<rules>
<bannedDependencies>
<excludes>
<exclude>javax.*:*</exclude>
</excludes>
<searchTransitive>true</searchTransitive>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Loading

0 comments on commit 24a4597

Please sign in to comment.