From 8a1d5eb0b80e39472ec97a5bf1f9bead0ba0cb16 Mon Sep 17 00:00:00 2001
From: Gang Li <ligangty@users.noreply.github.com>
Date: Tue, 12 Mar 2024 18:41:12 +0800
Subject: [PATCH 1/4] Update web-commons-bom to 29

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 314f62c..72a01d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,8 @@
   <version>1.5.2-SNAPSHOT</version>
 
   <name>http-testserver</name>
-  <inceptionYear>2015-2022</inceptionYear>
-  
+  <inceptionYear>2011-2024</inceptionYear>
+
   <scm>
     <connection>scm:git:https://github.com/Commonjava/http-testserver.git</connection>
     <developerConnection>scm:git:git@github.com:Commonjava/http-testserver.git</developerConnection>
@@ -51,7 +51,7 @@
       <dependency>
         <groupId>org.commonjava.boms</groupId>
         <artifactId>web-commons-bom</artifactId>
-        <version>26</version>
+        <version>29</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From 5ed53c59611e7e50e3b47288233348dce5842446 Mon Sep 17 00:00:00 2001
From: Gang Li <ligangty@users.noreply.github.com>
Date: Fri, 5 Jan 2024 21:28:32 +0800
Subject: [PATCH 2/4] Add github actions for CI

---
 .github/workflows/maven-build.yml | 51 +++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 .github/workflows/maven-build.yml

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
new file mode 100644
index 0000000..0ae04e4
--- /dev/null
+++ 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:
+      - master
+      - 1.x
+
+  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/maven-settings-action@v2.8.0
+      with:
+        sonatypeSnapshots: true
+
+    - name: Build the Maven verify phase
+      run: mvn -B -V clean verify -Prun-its -Pci
+
+
+    - uses: s4u/maven-settings-action@v2.8.0
+      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

From 84f0c54a881fe0e595e1ddddca6c5e51dc2ff787 Mon Sep 17 00:00:00 2001
From: Gang Li <ligangty@users.noreply.github.com>
Date: Tue, 12 Mar 2024 18:50:54 +0800
Subject: [PATCH 3/4] Update license header

---
 .github/workflows/maven-build.yml                | 16 ++++++++++++++++
 pom.xml                                          |  2 +-
 .../org/commonjava/test/http/TestHttpServer.java |  2 +-
 .../test/http/common/CommonMethod.java           |  2 +-
 .../test/http/common/HttpServerFixture.java      |  2 +-
 .../test/http/expect/ContentResponse.java        |  2 +-
 .../test/http/expect/ExpectationHandler.java     |  2 +-
 .../test/http/expect/ExpectationServer.java      |  2 +-
 .../test/http/expect/ExpectationServlet.java     |  2 +-
 .../test/http/stream/FileResolver.java           |  2 +-
 .../test/http/stream/JarFileResolver.java        |  2 +-
 .../test/http/stream/StreamResolver.java         |  2 +-
 .../test/http/stream/StreamServer.java           |  2 +-
 .../test/http/stream/StreamServlet.java          |  2 +-
 .../commonjava/test/http/util/PortFinder.java    |  2 +-
 .../commonjava/test/http/util/StreamUtils.java   |  2 +-
 .../org/commonjava/test/http/util/UrlUtils.java  |  2 +-
 .../commonjava/test/http/TestHttpServerTest.java |  2 +-
 .../test/http/expect/ExpectationServerTest.java  |  2 +-
 19 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 0ae04e4..fb0b8c3 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -1,3 +1,19 @@
+#
+# Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 name: build on maven
 
 on:
diff --git a/pom.xml b/pom.xml
index 72a01d9..7c2e19c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+    Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/TestHttpServer.java b/src/main/java/org/commonjava/test/http/TestHttpServer.java
index 20acc36..86cfc61 100644
--- a/src/main/java/org/commonjava/test/http/TestHttpServer.java
+++ b/src/main/java/org/commonjava/test/http/TestHttpServer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/common/CommonMethod.java b/src/main/java/org/commonjava/test/http/common/CommonMethod.java
index 193d225..3e4d108 100644
--- a/src/main/java/org/commonjava/test/http/common/CommonMethod.java
+++ b/src/main/java/org/commonjava/test/http/common/CommonMethod.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/common/HttpServerFixture.java b/src/main/java/org/commonjava/test/http/common/HttpServerFixture.java
index 058ad44..3aae7c9 100644
--- a/src/main/java/org/commonjava/test/http/common/HttpServerFixture.java
+++ b/src/main/java/org/commonjava/test/http/common/HttpServerFixture.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/expect/ContentResponse.java b/src/main/java/org/commonjava/test/http/expect/ContentResponse.java
index b66627c..3329b20 100644
--- a/src/main/java/org/commonjava/test/http/expect/ContentResponse.java
+++ b/src/main/java/org/commonjava/test/http/expect/ContentResponse.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/expect/ExpectationHandler.java b/src/main/java/org/commonjava/test/http/expect/ExpectationHandler.java
index c184121..d48bf25 100644
--- a/src/main/java/org/commonjava/test/http/expect/ExpectationHandler.java
+++ b/src/main/java/org/commonjava/test/http/expect/ExpectationHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/expect/ExpectationServer.java b/src/main/java/org/commonjava/test/http/expect/ExpectationServer.java
index 7b8750a..e787e0c 100644
--- a/src/main/java/org/commonjava/test/http/expect/ExpectationServer.java
+++ b/src/main/java/org/commonjava/test/http/expect/ExpectationServer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/expect/ExpectationServlet.java b/src/main/java/org/commonjava/test/http/expect/ExpectationServlet.java
index 8e74136..eefb8ff 100644
--- a/src/main/java/org/commonjava/test/http/expect/ExpectationServlet.java
+++ b/src/main/java/org/commonjava/test/http/expect/ExpectationServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/stream/FileResolver.java b/src/main/java/org/commonjava/test/http/stream/FileResolver.java
index 12392da..dc70582 100644
--- a/src/main/java/org/commonjava/test/http/stream/FileResolver.java
+++ b/src/main/java/org/commonjava/test/http/stream/FileResolver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/stream/JarFileResolver.java b/src/main/java/org/commonjava/test/http/stream/JarFileResolver.java
index 3bd0c07..33a0b05 100644
--- a/src/main/java/org/commonjava/test/http/stream/JarFileResolver.java
+++ b/src/main/java/org/commonjava/test/http/stream/JarFileResolver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/stream/StreamResolver.java b/src/main/java/org/commonjava/test/http/stream/StreamResolver.java
index ec9cd74..355977c 100644
--- a/src/main/java/org/commonjava/test/http/stream/StreamResolver.java
+++ b/src/main/java/org/commonjava/test/http/stream/StreamResolver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/stream/StreamServer.java b/src/main/java/org/commonjava/test/http/stream/StreamServer.java
index 5218caa..a88523b 100644
--- a/src/main/java/org/commonjava/test/http/stream/StreamServer.java
+++ b/src/main/java/org/commonjava/test/http/stream/StreamServer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/stream/StreamServlet.java b/src/main/java/org/commonjava/test/http/stream/StreamServlet.java
index c26f53d..52f3716 100644
--- a/src/main/java/org/commonjava/test/http/stream/StreamServlet.java
+++ b/src/main/java/org/commonjava/test/http/stream/StreamServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/util/PortFinder.java b/src/main/java/org/commonjava/test/http/util/PortFinder.java
index c396e75..59a2fb3 100644
--- a/src/main/java/org/commonjava/test/http/util/PortFinder.java
+++ b/src/main/java/org/commonjava/test/http/util/PortFinder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/util/StreamUtils.java b/src/main/java/org/commonjava/test/http/util/StreamUtils.java
index 63952ce..bcf49fa 100644
--- a/src/main/java/org/commonjava/test/http/util/StreamUtils.java
+++ b/src/main/java/org/commonjava/test/http/util/StreamUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/commonjava/test/http/util/UrlUtils.java b/src/main/java/org/commonjava/test/http/util/UrlUtils.java
index 1a8ea62..341bbe3 100644
--- a/src/main/java/org/commonjava/test/http/util/UrlUtils.java
+++ b/src/main/java/org/commonjava/test/http/util/UrlUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/commonjava/test/http/TestHttpServerTest.java b/src/test/java/org/commonjava/test/http/TestHttpServerTest.java
index cc57c2d..90965fd 100644
--- a/src/test/java/org/commonjava/test/http/TestHttpServerTest.java
+++ b/src/test/java/org/commonjava/test/http/TestHttpServerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/commonjava/test/http/expect/ExpectationServerTest.java b/src/test/java/org/commonjava/test/http/expect/ExpectationServerTest.java
index 22fc5fb..5e82def 100644
--- a/src/test/java/org/commonjava/test/http/expect/ExpectationServerTest.java
+++ b/src/test/java/org/commonjava/test/http/expect/ExpectationServerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
+ * Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From a462a0fb1d76774601bf9d554ca8e0f95f7f7bd4 Mon Sep 17 00:00:00 2001
From: Gang Li <ligangty@users.noreply.github.com>
Date: Tue, 12 Mar 2024 18:45:37 +0800
Subject: [PATCH 4/4] Disable jenkins CI

---
 Jenkinsfile => Jenkinsfile.bak | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Jenkinsfile => Jenkinsfile.bak (100%)

diff --git a/Jenkinsfile b/Jenkinsfile.bak
similarity index 100%
rename from Jenkinsfile
rename to Jenkinsfile.bak