Merge pull request #41 from ligangty/master

Start to use undertow 2.3 with jakarta EE spec
Commonjava · Jan 5, 2024 · ff50fd6 · ff50fd6
2 parents d166a30 + b44af42
commit ff50fd6
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 35 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -0,0 +1,51 @@
+name: build on maven
+
+on:
+  watch:
+    types: [started]
+  pull_request:
+    types: [opened, reopened, edited, synchronize, ready_for_review]
+  push:
+    branches:
+      - main
+      - master
+
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build with maven
+    runs-on: ubuntu-latest
+    env:
+      MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m"
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up JDK 11 for x64
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        architecture: x64
+
+    - uses: s4u/[email protected]
+      with:
+        sonatypeSnapshots: true
+
+    - name: Build the Maven verify phase
+      run: mvn -B -V clean verify -Prun-its -Pci
+
+
+    - uses: s4u/[email protected]
+      if: ${{ github.event_name == 'push' }}
+      with:
+        servers: |
+          [{
+              "id": "sonatype-nexus-snapshots",
+              "username": "${{ secrets.SONATYPE_BOT_USERNAME }}",
+              "password": "${{ secrets.SONATYPE_BOT_TOKEN }}"
+          }]
+
+    - name: Deploy the artifact
+      if: ${{ github.event_name == 'push' }}
+      run: mvn help:effective-settings -B -V clean deploy -e
diff --git a/core/pom.xml b/core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.util</groupId>
     <artifactId>http-testserver-parent</artifactId>
-    <version>2.2.3-SNAPSHOT</version>
+    <version>2.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -42,10 +42,6 @@
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.spec.javax.servlet</groupId>
-      <artifactId>jboss-servlet-api_3.0_spec</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>

diff --git a/core/src/main/java/org/commonjava/test/http/expect/ExpectationHandler.java b/core/src/main/java/org/commonjava/test/http/expect/ExpectationHandler.java
@@ -15,9 +15,9 @@
  */
 package org.commonjava.test.http.expect;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

diff --git a/core/src/main/java/org/commonjava/test/http/expect/ExpectationServer.java b/core/src/main/java/org/commonjava/test/http/expect/ExpectationServer.java
@@ -28,8 +28,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.BindException;

diff --git a/core/src/main/java/org/commonjava/test/http/expect/ExpectationServlet.java b/core/src/main/java/org/commonjava/test/http/expect/ExpectationServlet.java
@@ -20,21 +20,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
 import org.commonjava.test.http.common.CommonMethod;

diff --git a/core/src/main/java/org/commonjava/test/http/stream/StreamServer.java b/core/src/main/java/org/commonjava/test/http/stream/StreamServer.java
@@ -28,8 +28,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;

diff --git a/core/src/main/java/org/commonjava/test/http/stream/StreamServlet.java b/core/src/main/java/org/commonjava/test/http/stream/StreamServlet.java
@@ -18,14 +18,13 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.commonjava.test.http.common.CommonMethod;
-import org.commonjava.test.http.expect.ContentResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

diff --git a/junit4/pom.xml b/junit4/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.util</groupId>
     <artifactId>http-testserver-parent</artifactId>
-    <version>2.2.3-SNAPSHOT</version>
+    <version>2.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/junit5/pom.xml b/junit5/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.util</groupId>
     <artifactId>http-testserver-parent</artifactId>
-    <version>2.2.3-SNAPSHOT</version>
+    <version>2.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.commonjava.util</groupId>
   <artifactId>http-testserver-parent</artifactId>
-  <version>2.2.3-SNAPSHOT</version>
+  <version>2.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>http-testserver</name>
@@ -42,9 +42,9 @@
     <projectOwner>Red Hat, Inc.</projectOwner>
     <projectEmail>https://github.com/Commonjava/http-testserver</projectEmail>
     <javaVersion>11</javaVersion>
-    <undertowVersion>2.2.28.Final</undertowVersion>
+    <undertowVersion>2.3.10.Final</undertowVersion>
     <slf4j.versoin>1.7.25</slf4j.versoin>
-    <quarkus.version>2.16.11.Final</quarkus.version>
+    <quarkus.version>3.6.4</quarkus.version>
   </properties>
 
   <dependencyManagement>
@@ -96,7 +96,7 @@
       <dependency>
         <groupId>org.commonjava.util</groupId>
         <artifactId>http-testserver-core</artifactId>
-        <version>2.2.3-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/quarkus/pom.xml b/quarkus/pom.xml
@@ -20,15 +20,12 @@
   <parent>
     <groupId>org.commonjava.util</groupId>
     <artifactId>http-testserver-parent</artifactId>
-    <version>2.2.3-SNAPSHOT</version>
+    <version>2.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>http-testserver-quarkus</artifactId>
-  <properties>
-    <quarkus.version>2.16.11.Final</quarkus.version>
-  </properties>
 
   <dependencies>
     <dependency>