Merge pull request #42 from ligangty/1.x

Update web-commons-bom to 29

Author: ligangty

.github/workflows/maven-build.yml

@@ -0,0 +1,67 @@
+#
+# 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:
+  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

Jenkinsfile Jenkinsfile.bakJenkinsfile renamed to Jenkinsfile.bak

@@ -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.
@@ -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>

pom.xml

@@ -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.

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.

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.

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.

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.

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.

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.