Merge pull request #20 from ligangty/1.x

Bump versions

Author: ligangty

.gitignore

@@ -0,0 +1,22 @@
+# build
+*.tar.gz
+dependency-reduced-pom.xml
+scratch
+target
+
+# eclipse
+.classpath
+.project
+.settings
+
+# idea
+.idea
+*.iml
+*.iws
+*.ipr
+
+# mac
+*.DS_Store
+
+
+*.dat

Jenkinsfile

@@ -0,0 +1,26 @@
+pipeline {
+    agent { label 'maven-36-jdk11' }
+    stages {
+        stage('Prepare') {
+            steps {
+                sh 'printenv'
+            }
+        }
+        stage('Build') {
+            when {
+                expression { env.CHANGE_ID != null } // Pull request
+            }
+            steps {
+                sh '${M2_HOME}/bin/mvn -B -V clean verify'
+            }
+        }
+        stage('Deploy') {
+            when { branch 'master' }
+            steps {
+                echo "Deploy"
+                sh '${M2_HOME}/bin/mvn help:effective-settings -B -V clean deploy -e'
+            }
+        }
+    }
+}
+

pom.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015 Red Hat, Inc. (jdcasey@commonjava.org)
+    Copyright (C) 2015-2022 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.
@@ -21,15 +21,15 @@
   <parent>
     <groupId>org.commonjava</groupId>
     <artifactId>commonjava</artifactId>
-    <version>11</version>
+    <version>18</version>
   </parent>
 
   <groupId>org.commonjava.util</groupId>
   <artifactId>http-testserver</artifactId>
   <version>1.5-SNAPSHOT</version>
 
   <name>http-testserver</name>
-  <inceptionYear>2015</inceptionYear>
+  <inceptionYear>2015-2022</inceptionYear>
 
   <scm>
     <connection>scm:git:https://github.com/Commonjava/http-testserver.git</connection>
@@ -40,16 +40,18 @@
 
   <properties>
     <projectOwner>Red Hat, Inc.</projectOwner>
-    <javaVersion>1.8</javaVersion>
-    <undertowVersion>1.1.2.Final</undertowVersion>
+    <projectEmail>http://github.com/Commonjava/http-testserver</projectEmail>
+    <javaVersion>11</javaVersion>
+    <undertowVersion>2.2.26.Final</undertowVersion>
+    <slf4j.versoin>1.7.25</slf4j.versoin>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.commonjava.boms</groupId>
         <artifactId>web-commons-bom</artifactId>
-        <version>16</version>
+        <version>26</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -63,6 +65,11 @@
         <artifactId>undertow-servlet</artifactId>
         <version>${undertowVersion}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging</artifactId>
+        <version>3.4.0.Final</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

src/main/java/org/commonjava/test/http/TestHttpServer.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015 Red Hat, Inc. (jdcasey@commonjava.org)
+ * Copyright (C) 2015-2022 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 Red Hat, Inc. (jdcasey@commonjava.org)
+ * Copyright (C) 2015-2022 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 Red Hat, Inc. (jdcasey@commonjava.org)
+ * Copyright (C) 2015-2022 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 Red Hat, Inc. (jdcasey@commonjava.org)
+ * Copyright (C) 2015-2022 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 Red Hat, Inc. (jdcasey@commonjava.org)
+ * Copyright (C) 2015-2022 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 Red Hat, Inc. (jdcasey@commonjava.org)
+ * Copyright (C) 2015-2022 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/ExpectationServlet.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2015 Red Hat, Inc. (jdcasey@commonjava.org)
+ * Copyright (C) 2015-2022 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.