-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support of jetty 12 ee10/ee9 (#128)
* Add support of Jetty 12 ee10 and ee9 * get rid of deprecated AccessController
- Loading branch information
Showing
47 changed files
with
3,099 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,7 +39,7 @@ | |
| import static org.hamcrest.Matchers.notNullValue; | ||
|
|
||
| /** | ||
| * Client test case for the Jetty Embedded 9 container | ||
| * Client test case for the Jetty Embedded 10 container | ||
| * | ||
| * @author <a href="mailto:[email protected]">Aslak Knutsen</a> | ||
| * @author Dan Allen | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,240 @@ | ||
| <?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.0.Final-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>arquillian-jetty-embedded-12-ee10</artifactId> | ||
| <name>Arquillian Container Jetty Embedded 12.0.x ee10</name> | ||
| <description>Jetty Embedded 12.0.x container integration for the Arquillian project</description> | ||
|
|
||
| <properties> | ||
| <version.jetty>12.0.0-SNAPSHOT</version.jetty> | ||
| <version.weld>4.0.3.Final</version.weld> | ||
| <version.guava>13.0.1</version.guava> | ||
| <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> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-bom</artifactId> | ||
| <version>${version.jetty}</version> | ||
| <type>pom</type> | ||
| <scope>import</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty.ee10</groupId> | ||
| <artifactId>jetty-ee10-bom</artifactId> | ||
| <version>${version.jetty}</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.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.ee10</groupId> | ||
| <artifactId>jetty-ee10-webapp</artifactId> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.eclipse.jetty.ee10</groupId> | ||
| <artifactId>jetty-ee10-annotations</artifactId> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.eclipse.jetty.ee10</groupId> | ||
| <artifactId>jetty-ee10-plus</artifactId> | ||
| <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> | ||
|
|
||
| <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>3.0.0</version> | ||
| </dependency> | ||
|
|
||
| <!-- Weld servlet required for testing CDI injections --> | ||
|
|
||
| <dependency> | ||
| <groupId>com.h2database</groupId> | ||
| <artifactId>h2</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.shrinkwrap.resolver</groupId> | ||
| <artifactId>shrinkwrap-resolver-depchain</artifactId> | ||
| <type>pom</type> | ||
| </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> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jboss.shrinkwrap.descriptors</groupId> | ||
| <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.weld.servlet</groupId> | ||
| <artifactId>weld-servlet-core</artifactId> | ||
| <scope>test</scope> | ||
| </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> | ||
|
|
||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-enforcer-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>ban-javax-servlet-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> |
Oops, something went wrong.