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

Adding jakarta servlet API 6 compatibility #247

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adding jakarta servlet API 6 compatibility #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
553495c
Adding jakarta servlet API 6
danigiri Apr 19, 2024
a07ace3
ensuring compatibility with jakarta 6 and 5
danigiri Apr 25, 2024
b02fca0
setting jakarta version list in matrix
danigiri Apr 26, 2024
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
32 changes: 17 additions & 15 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,26 @@ jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
include:
- HTTPCLIENT_VERSION: 4.5.13
HTTPCLIENT_TEST_VERSION: 4.3.6
JDOC: "site"

JAKARTA_VERSION: [5.0.0, 6.0.0]
include:
- HTTPCLIENT_VERSION: 4.5.13
HTTPCLIENT_TEST_VERSION: 4.3.6
JDOC: "site"

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Build with Maven
env:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Build with Maven
env:
HTTPCLIENT_VERSION: ${{ matrix.HTTPCLIENT_VERSION }}
HTTPCLIENT_TEST_VERSION: ${{ matrix.HTTPCLIENT_TEST_VERSION }}
JAKARTA_VERSION: ${{ matrix.JAKARTA_VERSION }}
JDOC: ${{ matrix.JDOC }}
run: mvn -B -Dhttpclient.version=$HTTPCLIENT_VERSION -Dhttpclient.test.version=$HTTPCLIENT_TEST_VERSION verify $JDOC
run: mvn -B -Dhttpclient.version=$HTTPCLIENT_VERSION -Dhttpclient.test.version=$HTTPCLIENT_TEST_VERSION -Djakarta.version=$JAKARTA_VERSION verify $JDOC

6 changes: 4 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>org.mitre.dsmiley.httpproxy</groupId>
<artifactId>smiley-http-proxy-servlet</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.2-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Smiley's HTTP Proxy Servlet</name>
Expand Down Expand Up @@ -41,6 +41,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- should work with the following versions of jakarta -->
<jakarta.version>[5.0.0, 6.0.0]</jakarta.version>
<!-- works with v4.3 and forward; see .github/workflows/maven.yml -->
<httpclient.version>[4.5.14,5.0)</httpclient.version>
<!-- the last version to provide LocalTestServer.java -->
Expand All @@ -57,7 +59,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>

Expand Down
Loading