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

Arquillian Jetty 12 support #166

Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

Arquillian Jetty 12 support #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c05193f
chore: add arquillian jetty 12 Github actions
hantsy Jan 15, 2023
a4b878c
chore: clean codes
hantsy Jan 15, 2023
78a0baf
Merge branch 'master' into arq-jetty-12
hantsy Aug 21, 2023
9870b0c
chore: clean codes
hantsy Aug 21, 2023
39593e2
chore: clean codes
hantsy Aug 21, 2023
85dce47
chore: clean codes
hantsy Aug 21, 2023
4ba3d97
chore: clean codes
hantsy Aug 21, 2023
4769380
chore: clean codes
hantsy Aug 21, 2023
39b9a0b
chore: clean codes
hantsy Aug 21, 2023
a3ac351
chore: clean codes
hantsy Aug 21, 2023
288708f
Merge branch 'master' into arq-jetty-12
hantsy Oct 21, 2023
2aaabed
chore: clean codes
hantsy Oct 21, 2023
5ab7888
Merge branch 'master' into arq-jetty-12
hantsy Nov 26, 2023
574b8e4
chore: clean codes
hantsy Nov 26, 2023
3c149ae
chore: clean codes
hantsy Nov 26, 2023
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
28 changes: 28 additions & 0 deletions .github/workflows/it-jetty-12.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: it-jetty-12

on:
push:
paths-ignore:
- "docs/**"
branches:
- master
pull_request:
types:
- opened
- synchronize
- reopened

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: "zulu"
java-version: 17
cache: "maven"

- name: Build with Maven
run: mvn -B -q clean verify -Parq-jetty-embedded-12
143 changes: 121 additions & 22 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?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">
<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>com.example</groupId>
Expand Down Expand Up @@ -112,6 +113,16 @@
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Mockito -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-bom</artifactId>
<version>${mockito.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest -->
<dependency>
<groupId>org.hamcrest</groupId>
Expand All @@ -127,22 +138,13 @@
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>

<!-- Mockito -->
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>

<!--<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<artifactId>jakarta.jakartaee-api</artifactId>
</dependency>-->

<!-- Jakarta Faces -->
Expand All @@ -155,20 +157,20 @@
<!--
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<scope>provided</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>4.0.0</version>
<version>4.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>${jakarta.servlet.jsp.jstl.version}</version>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>${jakarta.servlet.jsp.jstl.version}</version>
</dependency>
-->
<dependency>
Expand All @@ -185,7 +187,7 @@
<!-- Optional, only when <f:websocket> is used. -->
<!-- dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
<artifactId>jakarta.json</artifactId>
<version>${jakarta.json.version}</version>
</dependency -->

Expand Down Expand Up @@ -268,7 +270,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -480,10 +482,107 @@
<!-- see: https://github.com/arquillian/arquillian-container-jetty/pull/108 -->
<!--<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
<artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
<artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
</dependency>-->
</dependencies>
</profile>
<profile>
<id>arq-jetty-embedded-12</id>
<properties>
<skipTests>false</skipTests>
<jetty.version>12.0.3</jetty.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-bom</artifactId>
<version>${jetty.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-jetty-embedded-12-ee9</artifactId>
<version>${arquillian-jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-annotations</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-webapp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-plus</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9.websocket</groupId>
<artifactId>jetty-ee9-websocket-jakarta-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-apache-jsp</artifactId>
<scope>test</scope>
</dependency>

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

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

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

<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-hpack</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.6</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>arq-weld</id>
<properties>
Expand Down
Loading